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

Commit 8cce3e7c 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:
  [S390] incorrect reipl nss name.
  [S390] Load disabled wait psw if reipl fails.
  [S390] Fix IPL from NSS.
  [S390] zcrypt: fix ap_device_list handling
  [S390] sclp_vt220: speed up console output for interactive work
  [S390] dasd: fix reference counting in display method for proc/dasd/devices
  [S390] dasd: let dasd erp matching recognize alias recovery
  [S390] Get rid of memcpy gcc warning workaround.
  [S390] idle: Fix machine check handling in idle loop.
  [S390] Update default configuration.
parents a878539e 583b33bc

arch/s390/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -351,6 +351,10 @@ endchoice 


source "fs/Kconfig.binfmt"



config FORCE_MAX_ZONEORDER

	int

	default "9"



config PROCESS_DEBUG

	bool "Show crashed user process info"

	help

arch/s390/defconfig

+13 −5
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.24

# Sat Feb  9 12:13:01 2008

# Linux kernel version: 2.6.25-rc4

# Wed Mar  5 11:22:59 2008

#

CONFIG_MMU=y

CONFIG_ZONE_DMA=y
@@ -43,12 +43,15 @@ CONFIG_CGROUPS=y 
# CONFIG_CGROUP_DEBUG is not set

CONFIG_CGROUP_NS=y

# CONFIG_CPUSETS is not set

CONFIG_GROUP_SCHED=y

CONFIG_FAIR_GROUP_SCHED=y

CONFIG_FAIR_USER_SCHED=y

# CONFIG_FAIR_CGROUP_SCHED is not set

# CONFIG_RT_GROUP_SCHED is not set

CONFIG_USER_SCHED=y

# CONFIG_CGROUP_SCHED is not set

# CONFIG_CGROUP_CPUACCT is not set

# CONFIG_RESOURCE_COUNTERS is not set

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

# CONFIG_RELAY is not set

CONFIG_NAMESPACES=y

CONFIG_UTS_NS=y
@@ -85,7 +88,9 @@ CONFIG_SLAB=y 
# CONFIG_MARKERS is not set

CONFIG_HAVE_OPROFILE=y

CONFIG_KPROBES=y

CONFIG_KRETPROBES=y

CONFIG_HAVE_KPROBES=y

CONFIG_HAVE_KRETPROBES=y

CONFIG_PROC_PAGE_MONITOR=y

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y
@@ -185,6 +190,7 @@ CONFIG_IPL=y 
CONFIG_IPL_VM=y

CONFIG_BINFMT_ELF=y

CONFIG_BINFMT_MISC=m

CONFIG_FORCE_MAX_ZONEORDER=9

# CONFIG_PROCESS_DEBUG is not set

CONFIG_PFAULT=y

# CONFIG_SHARED_KERNEL is not set
@@ -435,6 +441,7 @@ CONFIG_DASD_EER=y 
CONFIG_MISC_DEVICES=y

# CONFIG_EEPROM_93CX6 is not set

# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_HAVE_IDE is not set



#

# SCSI device support
@@ -593,6 +600,7 @@ CONFIG_S390_VMUR=m 
#

# Sonics Silicon Backplane

#

# CONFIG_MEMSTICK is not set



#

# File systems
@@ -750,7 +758,6 @@ CONFIG_DEBUG_BUGVERBOSE=y 
# CONFIG_DEBUG_LIST is not set

# CONFIG_DEBUG_SG is not set

# CONFIG_FRAME_POINTER is not set

CONFIG_FORCED_INLINING=y

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_KPROBES_SANITY_TEST is not set

# CONFIG_BACKTRACE_SELF_TEST is not set
@@ -759,6 +766,7 @@ CONFIG_FORCED_INLINING=y 
# CONFIG_LATENCYTOP is not set

CONFIG_SAMPLES=y

# CONFIG_SAMPLE_KOBJECT is not set

# CONFIG_SAMPLE_KPROBES is not set

# CONFIG_DEBUG_PAGEALLOC is not set



#

arch/s390/kernel/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ 


EXTRA_AFLAGS	:= -traditional



#

# Passing null pointers is ok for smp code, since we access the lowcore here.

#

CFLAGS_smp.o	:= -Wno-nonnull



obj-y	:=  bitmap.o traps.o time.o process.o base.o early.o \

            setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \

	    semaphore.o s390_ext.o debug.o irq.o ipl.o dis.o diag.o

arch/s390/kernel/early.c

+6 −2
Original line number Diff line number Diff line
@@ -88,13 +88,17 @@ static noinline __init void create_kernel_nss(void) 


	__cpcmd(defsys_cmd, NULL, 0, &response);



	if (response != 0)

	if (response != 0) {

		kernel_nss_name[0] = '\0';

		return;

	}



	__cpcmd(savesys_cmd, NULL, 0, &response);



	if (response != strlen(savesys_cmd))

	if (response != strlen(savesys_cmd)) {

		kernel_nss_name[0] = '\0';

		return;

	}



	ipl_flags = IPL_NSS_VALID;

}

arch/s390/kernel/ipl.c

+1 −0
Original line number Diff line number Diff line
@@ -704,6 +704,7 @@ void reipl_run(struct shutdown_trigger *trigger) 
	default:

		break;

	}

	disabled_wait((unsigned long) __builtin_return_address(0));

}



static void __init reipl_probe(void)