Commit 32087d4e 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: (54 commits)
  [S390] Remove error checking from copy_oldmem_page()
  [S390] qdio: prevent dsci access without adapter interrupts
  [S390] irqstats: split IPI interrupt accounting
  [S390] add missing __tlb_flush_global() for !CONFIG_SMP
  [S390] sparse: fix sparse symbol shadow warning
  [S390] sparse: fix sparse NULL pointer warnings
  [S390] sparse: fix sparse warnings with __user pointers
  [S390] sparse: fix sparse warnings in math-emu
  [S390] sparse: fix sparse warnings about missing prototypes
  [S390] sparse: fix sparse ANSI-C warnings
  [S390] sparse: fix sparse static warnings
  [S390] sparse: fix access past end of array warnings
  [S390] dasd: prevent path verification before resume
  [S390] qdio: remove multicast polling
  [S390] qdio: reset outbound SBAL error states
  [S390] qdio: EQBS retry after CCQ 96
  [S390] qdio: add timestamp for last queue scan time
  [S390] Introduce get_clock_fast()
  [S390] kvm: Handle diagnose 0x10 (release pages)
  [S390] take mmap_sem when walking guest page table
  ...
parents b1c907f3 07ea815b

Documentation/kernel-parameters.txt

+3 −3
Original line number Diff line number Diff line
@@ -741,10 +741,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			See Documentation/block/cfq-iosched.txt and

			Documentation/block/deadline-iosched.txt for details.



	elfcorehdr=	[IA-64,PPC,SH,X86]

	elfcorehdr=[size[KMG]@]offset[KMG] [IA64,PPC,SH,X86,S390]

			Specifies physical address of start of kernel core

			image elf header. Generally kexec loader will

			pass this option to capture kernel.

			image elf header and optionally the size. Generally

			kexec loader will pass this option to capture kernel.

			See Documentation/kdump/kdump.txt for details.



	enable_mtrr_cleanup [X86]

arch/s390/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -569,6 +569,16 @@ config KEXEC 
	  current kernel, and to start another kernel.  It is like a reboot

	  but is independent of hardware/microcode support.



config CRASH_DUMP

	bool "kernel crash dumps"

	depends on 64BIT

	help

	  Generate crash dump after being started by kexec.

	  Crash dump kernels are loaded in the main kernel with kexec-tools

	  into a specially reserved region and then later executed after

	  a crash by kdump/kexec.

	  For more details see Documentation/kdump/kdump.txt



config ZFCPDUMP

	def_bool n

	prompt "zfcpdump support"

arch/s390/boot/compressed/misc.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static unsigned long free_mem_end_ptr; 


extern _sclp_print_early(const char *);



int puts(const char *s)

static int puts(const char *s)

{

	_sclp_print_early(s);

	return 0;

arch/s390/defconfig

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ CONFIG_NET_CLS_RSVP6=m 
CONFIG_NET_CLS_ACT=y

CONFIG_NET_ACT_POLICE=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_FIRMWARE_IN_KERNEL is not set

CONFIG_DEVTMPFS=y

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

arch/s390/include/asm/ccwdev.h

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

#include <linux/mod_devicetable.h>

#include <asm/fcx.h>

#include <asm/irq.h>



/* structs from asm/cio.h */

struct irb;
@@ -127,6 +128,7 @@ enum uc_todo { 
 * @restore: callback for restoring after hibernation

 * @uc_handler: callback for unit check handler

 * @driver: embedded device driver structure

 * @int_class: interruption class to use for accounting interrupts

 */

struct ccw_driver {

	struct ccw_device_id *ids;
@@ -144,6 +146,7 @@ struct ccw_driver { 
	int (*restore)(struct ccw_device *);

	enum uc_todo (*uc_handler) (struct ccw_device *, struct irb *);

	struct device_driver driver;

	enum interruption_class int_class;

};



extern struct ccw_device *get_ccwdev_by_busid(struct ccw_driver *cdrv,

CRA Git | Maintained and supported by SUSTech CRA and CCSE