Commit e770d73c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 patches from Martin Schwidefsky:
 "A new binary interface to be able to query and modify the LPAR
  scheduler weight and cap settings.  Some improvements for the hvc
  terminal over iucv and a couple of bux fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/hypfs: add interface for diagnose 0x304
  s390: wire up sys_sched_setattr/sys_sched_getattr
  s390/uapi: fix struct statfs64 definition
  s390/uaccess: remove dead extern declarations, make functions static
  s390/uaccess: test if current->mm is set before walking page tables
  s390/zfcpdump: make zfcpdump depend on 64BIT
  s390/32bit: fix cmpxchg64
  s390/xpram: don't modify module parameters
  s390/zcrypt: remove zcrypt kmsg documentation again
  s390/hvc_iucv: Automatically assign free HVC terminal devices
  s390/hvc_iucv: Display connection details through device attributes
  s390/hvc_iucv: fix sparse warning
  s390/vmur: Link parent CCW device during UR device creation
parents be864971 07be0382

Documentation/ioctl/ioctl-number.txt

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ Code Seq#(hex) Include File Comments 
0x09	all	linux/raid/md_u.h

0x10	00-0F	drivers/char/s390/vmcp.h

0x10	10-1F	arch/s390/include/uapi/sclp_ctl.h

0x10	20-2F	arch/s390/include/uapi/asm/hypfs.h

0x12	all	linux/fs.h

		linux/blkpg.h

0x1b	all	InfiniBand Subsystem	<http://infiniband.sourceforge.net/>

Documentation/kmsg/s390/zcrypt

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
/*?

 * Text: "Cryptographic device %x failed and was set offline\n"

 * Severity: Error

 * Parameter:

 *   @1: device index

 * Description:

 * A cryptographic device failed to process a cryptographic request.

 * The cryptographic device driver could not correct the error and

 * set the device offline. The application that issued the

 * request received an indication that the request has failed.

 * User action:

 * Use the lszcrypt command to confirm that the cryptographic

 * hardware is still configured to your LPAR or z/VM guest virtual

 * machine. If the device is available to your Linux instance the

 * command output contains a line that begins with 'card<device index>',

 * where <device index> is the two-digit decimal number in the message text.

 * After ensuring that the device is available, use the chzcrypt command to

 * set it online again.

 * If the error persists, contact your support organization.

 */

arch/s390/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ config CRASH_DUMP 
config ZFCPDUMP

	def_bool n

	prompt "zfcpdump support"

	depends on SMP

	depends on 64BIT && SMP

	help

	  Select this option if you want to build an zfcpdump enabled kernel.

	  Refer to <file:Documentation/s390/zfcpdump.txt> for more details on this.

arch/s390/hypfs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,4 +4,4 @@ 


obj-$(CONFIG_S390_HYPFS_FS) += s390_hypfs.o



s390_hypfs-objs := inode.o hypfs_diag.o hypfs_vm.o hypfs_dbfs.o
 
s390_hypfs-objs := inode.o hypfs_diag.o hypfs_vm.o hypfs_dbfs.o hypfs_sprp.o

arch/s390/hypfs/hypfs.h

+7 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/debugfs.h>

#include <linux/workqueue.h>

#include <linux/kref.h>

#include <asm/hypfs.h>



#define REG_FILE_MODE    0440

#define UPDATE_FILE_MODE 0220
@@ -36,6 +37,10 @@ extern int hypfs_vm_init(void); 
extern void hypfs_vm_exit(void);

extern int hypfs_vm_create_files(struct dentry *root);



/* Set Partition-Resource Parameter */

int hypfs_sprp_init(void);

void hypfs_sprp_exit(void);



/* debugfs interface */

struct hypfs_dbfs_file;
@@ -52,6 +57,8 @@ struct hypfs_dbfs_file { 
	int		(*data_create)(void **data, void **data_free_ptr,

				       size_t *size);

	void		(*data_free)(const void *buf_free_ptr);

	long		(*unlocked_ioctl) (struct file *, unsigned int,

					   unsigned long);



	/* Private data for hypfs_dbfs.c */

	struct hypfs_dbfs_data	*data;

CRA Git | Maintained and supported by SUSTech CRA and CCSE