Commit 67dd2f5a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (72 commits)
  [S390] 3215/3270 console: remove wrong comment
  [S390] dasd: remove BKL from extended error reporting code
  [S390] vmlogrdr: remove BKL
  [S390] vmur: remove BKL
  [S390] zcrypt: remove BKL
  [S390] 3270: remove BKL
  [S390] vmwatchdog: remove lock_kernel() from open() function
  [S390] monwriter: remove lock_kernel() from open() function
  [S390] monreader: remove lock_kernel() from open() function
  [S390] s390: remove unused nfsd #includes
  [S390] ftrace: build ftrace.o when CONFIG_FTRACE_SYSCALLS is set for s390
  [S390] etr/stp: put correct per cpu variable
  [S390] tty3270: move keyboard compat ioctls
  [S390] sclp: improve servicability setting
  [S390] s390: use change recording override for kernel mapping
  [S390] MAINTAINERS: Add s390 drivers block
  [S390] use generic sockios.h header file
  [S390] use generic termbits.h header file
  [S390] smp: remove unused typedef and defines
  [S390] cmm: free pages on hibernate.
  ...
parents 5327b9b8 42d61b9b

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -3139,6 +3139,7 @@ S: Supported 
F:	Documentation/s390/kvm.txt

F:	arch/s390/include/asm/kvm*

F:	arch/s390/kvm/

F:	drivers/s390/kvm/



KEXEC

M:	Eric Biederman <ebiederm@xmission.com>
@@ -4553,6 +4554,7 @@ L: linux-s390@vger.kernel.org 
W:	http://www.ibm.com/developerworks/linux/linux390/

S:	Supported

F:	arch/s390/

F:	drivers/s390/



S390 NETWORK DRIVERS

M:	Ursula Braun <ursula.braun@de.ibm.com>
@@ -4568,6 +4570,7 @@ M: Felix Beck <felix.beck@de.ibm.com> 
M:	Ralph Wuerthner <ralph.wuerthner@de.ibm.com>

M:	linux390@de.ibm.com

L:	linux-s390@vger.kernel.org

W:	http://www.ibm.com/developerworks/linux/linux390/

S:	Supported

F:	drivers/s390/crypto/

arch/s390/Kconfig

+0 −15
Original line number Diff line number Diff line
@@ -220,23 +220,8 @@ config AUDIT_ARCH 
	bool

	default y



config S390_SWITCH_AMODE

	bool "Switch kernel/user addressing modes"

	help

	  This option allows to switch the addressing modes of kernel and user

	  space. The kernel parameter switch_amode=on will enable this feature,

	  default is disabled. Enabling this (via kernel parameter) on machines

	  earlier than IBM System z9-109 EC/BC will reduce system performance.



	  Note that this option will also be selected by selecting the execute

	  protection option below. Enabling the execute protection via the

	  noexec kernel parameter will also switch the addressing modes,

	  independent of the switch_amode kernel parameter.





config S390_EXEC_PROTECT

	bool "Data execute protection"

	select S390_SWITCH_AMODE

	help

	  This option allows to enable a buffer overflow protection for user

	  space programs and it also selects the addressing mode option above.

arch/s390/defconfig

+0 −1
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ CONFIG_HOTPLUG_CPU=y 
CONFIG_COMPAT=y

CONFIG_SYSVIPC_COMPAT=y

CONFIG_AUDIT_ARCH=y

CONFIG_S390_SWITCH_AMODE=y

CONFIG_S390_EXEC_PROTECT=y



#

arch/s390/include/asm/atomic.h

+4 −4
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)



#define __CS_LOOP(ptr, op_val, op_string) ({				\

	typeof(ptr->counter) old_val, new_val;				\

	int old_val, new_val;						\

	asm volatile(							\

		"	l	%0,%2\n"				\

		"0:	lr	%1,%0\n"				\
@@ -38,7 +38,7 @@ 
#else /* __GNUC__ */



#define __CS_LOOP(ptr, op_val, op_string) ({				\

	typeof(ptr->counter) old_val, new_val;				\

	int old_val, new_val;						\

	asm volatile(							\

		"	l	%0,0(%3)\n"				\

		"0:	lr	%1,%0\n"				\
@@ -143,7 +143,7 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u) 
#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)



#define __CSG_LOOP(ptr, op_val, op_string) ({				\

	typeof(ptr->counter) old_val, new_val;				\

	long long old_val, new_val;					\

	asm volatile(							\

		"	lg	%0,%2\n"				\

		"0:	lgr	%1,%0\n"				\
@@ -160,7 +160,7 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u) 
#else /* __GNUC__ */



#define __CSG_LOOP(ptr, op_val, op_string) ({				\

	typeof(ptr->counter) old_val, new_val;				\

	long long old_val, new_val;					\

	asm volatile(							\

		"	lg	%0,0(%3)\n"				\

		"0:	lgr	%1,%0\n"				\

arch/s390/include/asm/ccwdev.h

+4 −0
Original line number Diff line number Diff line
@@ -142,6 +142,8 @@ struct ccw1; 
extern int ccw_device_set_options_mask(struct ccw_device *, unsigned long);

extern int ccw_device_set_options(struct ccw_device *, unsigned long);

extern void ccw_device_clear_options(struct ccw_device *, unsigned long);

int ccw_device_is_pathgroup(struct ccw_device *cdev);

int ccw_device_is_multipath(struct ccw_device *cdev);



/* Allow for i/o completion notification after primary interrupt status. */

#define CCWDEV_EARLY_NOTIFICATION	0x0001
@@ -151,6 +153,8 @@ extern void ccw_device_clear_options(struct ccw_device *, unsigned long); 
#define CCWDEV_DO_PATHGROUP             0x0004

/* Allow forced onlining of boxed devices. */

#define CCWDEV_ALLOW_FORCE              0x0008

/* Try to use multipath mode. */

#define CCWDEV_DO_MULTIPATH		0x0010



extern int ccw_device_start(struct ccw_device *, struct ccw1 *,

			    unsigned long, __u8, unsigned long);

CRA Git | Maintained and supported by SUSTech CRA and CCSE