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

Commit f1639377 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:
  [S390] Update default configuration.
  [S390] nss: add missing .previous statement to asm function
  [S390] increase default size of vmalloc area
  [S390] s390: disable change bit override
  [S390] fix io_return critical section cleanup
  [S390] sclp_async: potential buffer overflow
  [S390] arch/s390/kernel: Add missing unlock
parents 2f408420 8e7fccce

arch/s390/defconfig

+30 −10
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.33-rc2

# Mon Jan  4 09:03:07 2010

# Linux kernel version: 2.6.34-rc3

# Fri Apr  9 09:57:10 2010

#

CONFIG_SCHED_MC=y

CONFIG_MMU=y
@@ -17,6 +17,7 @@ CONFIG_GENERIC_TIME=y 
CONFIG_GENERIC_TIME_VSYSCALL=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_GENERIC_BUG=y

CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y

CONFIG_NO_IOMEM=y

CONFIG_NO_DMA=y

CONFIG_GENERIC_LOCKBREAK=y
@@ -62,15 +63,11 @@ CONFIG_TREE_RCU=y 
# CONFIG_RCU_TRACE is not set

CONFIG_RCU_FANOUT=64

# CONFIG_RCU_FANOUT_EXACT is not set

# CONFIG_RCU_FAST_NO_HZ is not set

# CONFIG_TREE_RCU_TRACE is not set

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=17

CONFIG_GROUP_SCHED=y

CONFIG_FAIR_GROUP_SCHED=y

# CONFIG_RT_GROUP_SCHED is not set

CONFIG_USER_SCHED=y

# CONFIG_CGROUP_SCHED is not set

CONFIG_CGROUPS=y

# CONFIG_CGROUP_DEBUG is not set

CONFIG_CGROUP_NS=y
@@ -79,6 +76,7 @@ CONFIG_CGROUP_NS=y 
# CONFIG_CPUSETS is not set

# CONFIG_CGROUP_CPUACCT is not set

# CONFIG_RESOURCE_COUNTERS is not set

# CONFIG_CGROUP_SCHED is not set

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

# CONFIG_RELAY is not set
@@ -93,6 +91,7 @@ CONFIG_INITRAMFS_SOURCE="" 
CONFIG_RD_GZIP=y

CONFIG_RD_BZIP2=y

CONFIG_RD_LZMA=y

CONFIG_RD_LZO=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_SYSCTL=y

CONFIG_ANON_INODES=y
@@ -126,6 +125,7 @@ CONFIG_SLAB=y 
# CONFIG_SLUB is not set

# CONFIG_SLOB is not set

# CONFIG_PROFILING is not set

CONFIG_TRACEPOINTS=y

CONFIG_HAVE_OPROFILE=y

CONFIG_KPROBES=y

CONFIG_HAVE_SYSCALL_WRAPPERS=y
@@ -134,6 +134,7 @@ CONFIG_HAVE_KPROBES=y 
CONFIG_HAVE_KRETPROBES=y

CONFIG_HAVE_ARCH_TRACEHOOK=y

CONFIG_USE_GENERIC_SMP_HELPERS=y

CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y

CONFIG_HAVE_DEFAULT_NO_SPIN_MUTEXES=y



#
@@ -246,6 +247,7 @@ CONFIG_64BIT=y 
CONFIG_SMP=y

CONFIG_NR_CPUS=32

CONFIG_HOTPLUG_CPU=y

# CONFIG_SCHED_BOOK is not set

CONFIG_COMPAT=y

CONFIG_SYSVIPC_COMPAT=y

CONFIG_AUDIT_ARCH=y
@@ -345,13 +347,13 @@ CONFIG_PM_SLEEP=y 
CONFIG_HIBERNATION=y

CONFIG_PM_STD_PARTITION=""

# CONFIG_PM_RUNTIME is not set

CONFIG_PM_OPS=y

CONFIG_NET=y



#

# Networking options

#

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

CONFIG_UNIX=y

CONFIG_XFRM=y

# CONFIG_XFRM_USER is not set
@@ -529,6 +531,7 @@ CONFIG_NET_SCH_FIFO=y 
#

# CONFIG_NET_PKTGEN is not set

# CONFIG_NET_TCPPROBE is not set

# CONFIG_NET_DROP_MONITOR is not set

CONFIG_CAN=m

CONFIG_CAN_RAW=m

CONFIG_CAN_BCM=m
@@ -605,6 +608,7 @@ CONFIG_MISC_DEVICES=y 
#

# SCSI device support

#

CONFIG_SCSI_MOD=y

# CONFIG_RAID_ATTRS is not set

CONFIG_SCSI=y

# CONFIG_SCSI_DMA is not set
@@ -863,6 +867,7 @@ CONFIG_MISC_FILESYSTEMS=y 
# CONFIG_BEFS_FS is not set

# CONFIG_BFS_FS is not set

# CONFIG_EFS_FS is not set

# CONFIG_LOGFS is not set

# CONFIG_CRAMFS is not set

# CONFIG_SQUASHFS is not set

# CONFIG_VXFS_FS is not set
@@ -891,6 +896,7 @@ CONFIG_SUNRPC=y 
# CONFIG_RPCSEC_GSS_KRB5 is not set

# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set

# CONFIG_CEPH_FS is not set

# CONFIG_CIFS is not set

# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set
@@ -952,6 +958,7 @@ CONFIG_DEBUG_MUTEXES=y 
# CONFIG_LOCK_STAT is not set

CONFIG_DEBUG_SPINLOCK_SLEEP=y

# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set

CONFIG_STACKTRACE=y

# CONFIG_DEBUG_KOBJECT is not set

CONFIG_DEBUG_BUGVERBOSE=y

# CONFIG_DEBUG_INFO is not set
@@ -973,12 +980,17 @@ CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y 
# CONFIG_LATENCYTOP is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

# CONFIG_DEBUG_PAGEALLOC is not set

CONFIG_NOP_TRACER=y

CONFIG_HAVE_FUNCTION_TRACER=y

CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y

CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y

CONFIG_HAVE_DYNAMIC_FTRACE=y

CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y

CONFIG_HAVE_SYSCALL_TRACEPOINTS=y

CONFIG_RING_BUFFER=y

CONFIG_EVENT_TRACING=y

CONFIG_CONTEXT_SWITCH_TRACER=y

CONFIG_TRACING=y

CONFIG_TRACING_SUPPORT=y

CONFIG_FTRACE=y

# CONFIG_FUNCTION_TRACER is not set
@@ -995,10 +1007,15 @@ CONFIG_BRANCH_PROFILE_NONE=y 
# CONFIG_KMEMTRACE is not set

# CONFIG_WORKQUEUE_TRACER is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

CONFIG_KPROBE_EVENT=y

# CONFIG_RING_BUFFER_BENCHMARK is not set

# CONFIG_DYNAMIC_DEBUG is not set

CONFIG_SAMPLES=y

# CONFIG_SAMPLE_TRACEPOINTS is not set

# CONFIG_SAMPLE_TRACE_EVENTS is not set

# CONFIG_SAMPLE_KOBJECT is not set

# CONFIG_SAMPLE_KPROBES is not set

# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set



#

# Security options
@@ -1032,6 +1049,7 @@ CONFIG_CRYPTO_MANAGER=y 
CONFIG_CRYPTO_MANAGER2=y

CONFIG_CRYPTO_GF128MUL=m

# CONFIG_CRYPTO_NULL is not set

# CONFIG_CRYPTO_PCRYPT is not set

CONFIG_CRYPTO_WORKQUEUE=y

# CONFIG_CRYPTO_CRYPTD is not set

CONFIG_CRYPTO_AUTHENC=m
@@ -1119,7 +1137,7 @@ CONFIG_CRYPTO_SHA512_S390=m 
# CONFIG_CRYPTO_DES_S390 is not set

# CONFIG_CRYPTO_AES_S390 is not set

CONFIG_S390_PRNG=m

# CONFIG_BINARY_PRINTF is not set

CONFIG_BINARY_PRINTF=y



#

# Library routines
@@ -1136,14 +1154,16 @@ CONFIG_LIBCRC32C=m 
CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=m

CONFIG_LZO_COMPRESS=m

CONFIG_LZO_DECOMPRESS=m

CONFIG_LZO_DECOMPRESS=y

CONFIG_DECOMPRESS_GZIP=y

CONFIG_DECOMPRESS_BZIP2=y

CONFIG_DECOMPRESS_LZMA=y

CONFIG_DECOMPRESS_LZO=y

CONFIG_NLATTR=y

CONFIG_HAVE_KVM=y

CONFIG_VIRTUALIZATION=y

CONFIG_KVM=m

# CONFIG_VHOST_NET is not set

CONFIG_VIRTIO=y

CONFIG_VIRTIO_RING=y

CONFIG_VIRTIO_BALLOON=m

arch/s390/include/asm/pgtable.h

+3 −3
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ extern char empty_zero_page[PAGE_SIZE]; 
#ifndef __ASSEMBLY__

/*

 * The vmalloc area will always be on the topmost area of the kernel

 * mapping. We reserve 96MB (31bit) / 1GB (64bit) for vmalloc,

 * mapping. We reserve 96MB (31bit) / 128GB (64bit) for vmalloc,

 * which should be enough for any sane case.

 * By putting vmalloc at the top, we maximise the gap between physical

 * memory and vmalloc to catch misplaced memory accesses. As a side
@@ -120,8 +120,8 @@ extern unsigned long VMALLOC_START; 
#define VMALLOC_END	0x7e000000UL

#define VMEM_MAP_END	0x80000000UL

#else /* __s390x__ */

#define VMALLOC_SIZE	(1UL << 30)

#define VMALLOC_END	0x3e040000000UL

#define VMALLOC_SIZE	(128UL << 30)

#define VMALLOC_END	0x3e000000000UL

#define VMEM_MAP_END	0x40000000000UL

#endif /* __s390x__ */

arch/s390/kernel/early.c

+2 −1
Original line number Diff line number Diff line
@@ -82,7 +82,8 @@ asm( 
	"	lm	6,15,24(15)\n"

#endif

	"	br	14\n"

	"	.size	savesys_ipl_nss, .-savesys_ipl_nss\n");

	"	.size	savesys_ipl_nss, .-savesys_ipl_nss\n"

	"	.previous\n");



static __initdata char upper_command_line[COMMAND_LINE_SIZE];

arch/s390/kernel/entry.S

+7 −1
Original line number Diff line number Diff line
@@ -964,7 +964,7 @@ cleanup_critical: 
	clc	4(4,%r12),BASED(cleanup_table_io_work_loop)

	bl	BASED(0f)

	clc	4(4,%r12),BASED(cleanup_table_io_work_loop+4)

	bl	BASED(cleanup_io_return)

	bl	BASED(cleanup_io_work_loop)

0:

	br	%r14
@@ -1038,6 +1038,12 @@ cleanup_sysc_leave_insn: 
	.long	sysc_done - 8 + 0x80000000



cleanup_io_return:

	mvc	__LC_RETURN_PSW(4),0(%r12)

	mvc	__LC_RETURN_PSW+4(4),BASED(cleanup_table_io_return)

	la	%r12,__LC_RETURN_PSW

	br	%r14



cleanup_io_work_loop:

	mvc	__LC_RETURN_PSW(4),0(%r12)

	mvc	__LC_RETURN_PSW+4(4),BASED(cleanup_table_io_work_loop)

	la	%r12,__LC_RETURN_PSW

arch/s390/kernel/entry64.S

+7 −1
Original line number Diff line number Diff line
@@ -946,7 +946,7 @@ cleanup_critical: 
	clc	8(8,%r12),BASED(cleanup_table_io_work_loop)

	jl	0f

	clc	8(8,%r12),BASED(cleanup_table_io_work_loop+8)

	jl	cleanup_io_return

	jl	cleanup_io_work_loop

0:

	br	%r14
@@ -1020,6 +1020,12 @@ cleanup_sysc_leave_insn: 
	.quad	sysc_done - 16



cleanup_io_return:

	mvc	__LC_RETURN_PSW(8),0(%r12)

	mvc	__LC_RETURN_PSW+8(8),BASED(cleanup_table_io_return)

	la	%r12,__LC_RETURN_PSW

	br	%r14



cleanup_io_work_loop:

	mvc	__LC_RETURN_PSW(8),0(%r12)

	mvc	__LC_RETURN_PSW+8(8),BASED(cleanup_table_io_work_loop)

	la	%r12,__LC_RETURN_PSW