Commit 02aedd69 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (37 commits)
  [S390] Avoid excessive inlining.
  [S390] Mark kernel text section read-only.
  [S390] Convert memory detection into C code.
  [S390] Calibrate delay and bogomips.
  [S390] Hypervisor filesystem (s390_hypfs) for z/VM
  [S390] Add crypto support for 3592 tape devices
  [S390] boot from NSS support
  [S390] Support for s390 Pseudo Random Number Generator
  [S390] ETR support.
  [S390] noexec protection
  [S390] move crypto options and some cleanup.
  [S390] cio: Don't spam debug feature.
  [S390] Cleanup of CHSC event handling.
  [S390] cio: declare hardware structures packed.
  [S390] Add set_fs(USER_DS) to start_thread().
  [S390] cio: Catch operand exceptions on stsch.
  [S390] Fix register usage description.
  [S390] kretprobe_trampoline_holder() in wrong section.
  [S390] Fix kprobes breakpoint handling.
  [S390] Update maintainers file.
  ...
parents 9ad0830f 4d284cac

Documentation/s390/Debugging390.txt

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ r2 argument 0 / return value 0 call-clobbered 
r3       argument 1 / return value 1 (if long long) call-clobbered

r4       argument 2                                 call-clobbered

r5       argument 3                                 call-clobbered

r6	 argument 5                                 saved

r6	 argument 4				    saved

r7       pointer-to arguments 5 to ...              saved      

r8       this & that                                saved

r9       this & that                                saved

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -2791,7 +2791,7 @@ M: schwidefsky@de.ibm.com 
P:	Heiko Carstens

M:	heiko.carstens@de.ibm.com

M:	linux390@de.ibm.com

L:	linux-390@vm.marist.edu

L:	linux-s390@vger.kernel.org

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

S:	Supported
@@ -2799,7 +2799,7 @@ S390 NETWORK DRIVERS 
P:	Frank Pavlic

M:	fpavlic@de.ibm.com

M:	linux390@de.ibm.com

L:	linux-390@vm.marist.edu

L:	linux-s390@vger.kernel.org

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

S:	Supported
@@ -2807,7 +2807,7 @@ S390 ZFCP DRIVER 
P:	Swen Schillig

M:	swen@vnet.ibm.com

M:	linux390@de.ibm.com

L:	linux-390@vm.marist.edu

L:	linux-s390@vger.kernel.org

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

S:	Supported

arch/s390/Kconfig

+25 −4
Original line number Diff line number Diff line
@@ -34,10 +34,6 @@ config GENERIC_HWEIGHT 
	bool

	default y



config GENERIC_CALIBRATE_DELAY

	bool

	default y



config GENERIC_TIME

	def_bool y
@@ -134,6 +130,31 @@ 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.

	  The kernel parameter noexec=on will enable this feature and also

	  switch the addressing modes, default is disabled. Enabling this (via

	  kernel parameter) on machines earlier than IBM System z9-109 EC/BC

	  will reduce system performance.



comment "Code generation options"



choice

arch/s390/appldata/appldata_base.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static struct ctl_table appldata_dir_table[] = { 
/*

 * Timer

 */

DEFINE_PER_CPU(struct vtimer_list, appldata_timer);

static DEFINE_PER_CPU(struct vtimer_list, appldata_timer);

static atomic_t appldata_expire_count = ATOMIC_INIT(0);



static DEFINE_SPINLOCK(appldata_timer_lock);

arch/s390/appldata/appldata_mem.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
 * book:

 * http://oss.software.ibm.com/developerworks/opensource/linux390/index.shtml

 */

struct appldata_mem_data {

static struct appldata_mem_data {

	u64 timestamp;

	u32 sync_count_1;       /* after VM collected the record data, */

	u32 sync_count_2;	/* sync_count_1 and sync_count_2 should be the

CRA Git | Maintained and supported by SUSTech CRA and CCSE