Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0444fa78 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: (56 commits)
  [S390] replace lock_cpu_hotplug with get_online_cpus
  [S390] usage of s390dbf: shrink number of debug areas to use.
  [S390] constify function pointer tables.
  [S390] do local_irq_restore while spinning in spin_lock_irqsave.
  [S390] add smp_call_function_mask
  [S390] dasd: fix loop in request expiration handling
  [S390] Unused field / extern declaration in processor.h
  [S390] Remove TOPDIR from Makefile
  [S390] dasd: add hyper PAV support to DASD device driver, part 1
  [S390] single-step cleanup
  [S390] Move NOTES and BUG_TABLE.
  [S390] drivers/s390/: Spelling fixes
  [S390] include/asm-s390/: Spelling fixes
  [S390] arch/s390/: Spelling fixes
  [S390] Use diag308 subcodes 3 and 6 for reboot and dump when possible.
  [S390] vmemmap: allocate struct pages before 1:1 mapping
  [S390] Initialize sclp_ipl_info
  [S390] Allocate and free cpu lowcores and stacks when needed/possible.
  [S390] use LIST_HEAD instead of LIST_HEAD_INIT
  [S390] Load disabled wait psw instead of stopping cpu on halt.
  ...
parents 69e4d4c3 9d40d2e3

Documentation/DocBook/s390-drivers.tmpl

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ 
!Iinclude/asm-s390/ccwdev.h

!Edrivers/s390/cio/device.c

!Edrivers/s390/cio/device_ops.c

!Edrivers/s390/cio/airq.c

    </sect1>

    <sect1 id="cmf">

     <title>The channel-measurement facility</title>

Documentation/cpu-hotplug.txt

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ additional_cpus=n (*) Use this to limit hotpluggable cpus. This option sets 
  			cpu_possible_map = cpu_present_map + additional_cpus



(*) Option valid only for following architectures

- x86_64, ia64, s390

- x86_64, ia64



ia64 and x86_64 use the number of disabled local apics in ACPI tables MADT

to determine the number of potentially hot-pluggable cpus. The implementation

Documentation/kernel-parameters.txt

+8 −1
Original line number Diff line number Diff line
@@ -370,7 +370,8 @@ and is between 256 and 4096 characters. It is defined in the file 
			configured.  Potentially dangerous and should only be

			used if you are entirely sure of the consequences.



	chandev=	[HW,NET] Generic channel device initialisation

	ccw_timeout_log [S390]

			See Documentation/s390/CommonIO for details.



	checkreqprot	[SELINUX] Set initial checkreqprot flag value.

			Format: { "0" | "1" }
@@ -382,6 +383,12 @@ and is between 256 and 4096 characters. It is defined in the file 
			Value can be changed at runtime via

				/selinux/checkreqprot.



	cio_ignore=	[S390]

			See Documentation/s390/CommonIO for details.



	cio_msg=	[S390]

			See Documentation/s390/CommonIO for details.



	clock=		[BUGS=X86-32, HW] gettimeofday clocksource override.

			[Deprecated]

			Forces specified clocksource (if available) to be used

Documentation/s390/CommonIO

+5 −0
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ S/390 common I/O-Layer - command line parameters, procfs and debugfs entries 
Command line parameters

-----------------------



* ccw_timeout_log



  Enable logging of debug information in case of ccw device timeouts.





* cio_msg = yes | no

  

  Determines whether information on found devices and sensed device

arch/s390/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -276,9 +276,6 @@ source "kernel/Kconfig.preempt" 


source "mm/Kconfig"



config HOLES_IN_ZONE

	def_bool y



comment "I/O subsystem configuration"



config MACHCHK_WARNING