Commit 531021f2 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] dynamic page tables.
  [S390] Add four level page tables for CONFIG_64BIT=y.
  [S390] 1K/2K page table pages.
  [S390] Remove a.out header file.
  [S390] sclp_vt220: Fix vt220 initialization
  [S390] qdio: avoid hang when establishing qdio queues
  [S390] VMEM_MAX_PHYS overflow on 31 bit.
  [S390] zcrypt: Do not start ap poll thread per default
  [S390] Fix __ffs_word_loop/__ffz_word_loop inlnie assembly.
  [S390] Wire up new timerfd syscalls.
  [S390] Update default configuration.
parents 451688ba 6252d702

arch/s390/defconfig

+64 −23
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.23

# Mon Oct 22 12:10:44 2007

# Linux kernel version: 2.6.24

# Sat Feb  9 12:13:01 2008

#

CONFIG_MMU=y

CONFIG_ZONE_DMA=y

CONFIG_LOCKDEP_SUPPORT=y

CONFIG_STACKTRACE_SUPPORT=y

CONFIG_HAVE_LATENCYTOP_SUPPORT=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

# CONFIG_ARCH_HAS_ILOG2_U32 is not set

# CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -15,6 +16,7 @@ CONFIG_GENERIC_TIME=y 
CONFIG_GENERIC_BUG=y

CONFIG_NO_IOMEM=y

CONFIG_NO_DMA=y

CONFIG_GENERIC_LOCKBREAK=y

CONFIG_S390=y

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -32,7 +34,6 @@ CONFIG_SYSVIPC_SYSCTL=y 
CONFIG_POSIX_MQUEUE=y

# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_TASKSTATS is not set

# CONFIG_USER_NS is not set

CONFIG_AUDIT=y

# CONFIG_AUDITSYSCALL is not set

CONFIG_IKCONFIG=y
@@ -41,13 +42,19 @@ CONFIG_LOG_BUF_SHIFT=17 
CONFIG_CGROUPS=y

# CONFIG_CGROUP_DEBUG is not set

CONFIG_CGROUP_NS=y

CONFIG_CGROUP_CPUACCT=y

# CONFIG_CPUSETS is not set

CONFIG_FAIR_GROUP_SCHED=y

CONFIG_FAIR_USER_SCHED=y

# CONFIG_FAIR_CGROUP_SCHED is not set

# CONFIG_CGROUP_CPUACCT is not set

# CONFIG_RESOURCE_COUNTERS is not set

CONFIG_SYSFS_DEPRECATED=y

# CONFIG_RELAY is not set

CONFIG_NAMESPACES=y

CONFIG_UTS_NS=y

CONFIG_IPC_NS=y

# CONFIG_USER_NS is not set

# CONFIG_PID_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE=""

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -61,17 +68,26 @@ CONFIG_HOTPLUG=y 
CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_ELF_CORE=y

# CONFIG_COMPAT_BRK is not set

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_ANON_INODES=y

CONFIG_EPOLL=y

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y

CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_SLAB=y

# CONFIG_SLUB is not set

# CONFIG_SLOB is not set

# CONFIG_PROFILING is not set

# CONFIG_MARKERS is not set

CONFIG_HAVE_OPROFILE=y

CONFIG_KPROBES=y

CONFIG_HAVE_KPROBES=y

CONFIG_PROC_PAGE_MONITOR=y

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0
@@ -99,6 +115,8 @@ CONFIG_DEFAULT_DEADLINE=y 
# CONFIG_DEFAULT_CFQ is not set

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="deadline"

CONFIG_CLASSIC_RCU=y

# CONFIG_PREEMPT_RCU is not set



#

# Base setup
@@ -137,7 +155,7 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y 
# CONFIG_PREEMPT_NONE is not set

# CONFIG_PREEMPT_VOLUNTARY is not set

CONFIG_PREEMPT=y

CONFIG_PREEMPT_BKL=y

# CONFIG_RCU_TRACE is not set

CONFIG_SELECT_MEMORY_MODEL=y

CONFIG_FLATMEM_MANUAL=y

# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -151,7 +169,6 @@ CONFIG_RESOURCES_64BIT=y 
CONFIG_ZONE_DMA_FLAG=1

CONFIG_BOUNCE=y

CONFIG_VIRT_TO_BUS=y

CONFIG_HOLES_IN_ZONE=y



#

# I/O subsystem configuration
@@ -180,6 +197,7 @@ CONFIG_HZ_100=y 
# CONFIG_HZ_300 is not set

# CONFIG_HZ_1000 is not set

CONFIG_HZ=100

# CONFIG_SCHED_HRTICK is not set

CONFIG_NO_IDLE_HZ=y

CONFIG_NO_IDLE_HZ_INIT=y

CONFIG_S390_HYPFS_FS=y
@@ -201,6 +219,7 @@ CONFIG_XFRM=y 
# CONFIG_XFRM_USER is not set

# CONFIG_XFRM_SUB_POLICY is not set

# CONFIG_XFRM_MIGRATE is not set

# CONFIG_XFRM_STATISTICS is not set

CONFIG_NET_KEY=y

# CONFIG_NET_KEY_MIGRATE is not set

CONFIG_IUCV=m
@@ -251,6 +270,7 @@ CONFIG_IPV6_SIT=y 
# CONFIG_NETWORK_SECMARK is not set

CONFIG_NETFILTER=y

# CONFIG_NETFILTER_DEBUG is not set

CONFIG_NETFILTER_ADVANCED=y



#

# Core Netfilter Configuration
@@ -258,7 +278,6 @@ CONFIG_NETFILTER=y 
CONFIG_NETFILTER_NETLINK=m

CONFIG_NETFILTER_NETLINK_QUEUE=m

CONFIG_NETFILTER_NETLINK_LOG=m

CONFIG_NF_CONNTRACK_ENABLED=m

CONFIG_NF_CONNTRACK=m

# CONFIG_NF_CT_ACCT is not set

# CONFIG_NF_CONNTRACK_MARK is not set
@@ -286,7 +305,7 @@ CONFIG_NF_CONNTRACK=m 
# CONFIG_IP_NF_ARPTABLES is not set



#

# IPv6: Netfilter Configuration (EXPERIMENTAL)

# IPv6: Netfilter Configuration

#

# CONFIG_NF_CONNTRACK_IPV6 is not set

# CONFIG_IP6_NF_QUEUE is not set
@@ -343,6 +362,7 @@ CONFIG_NET_CLS_U32=m 
CONFIG_CLS_U32_MARK=y

CONFIG_NET_CLS_RSVP=m

CONFIG_NET_CLS_RSVP6=m

CONFIG_NET_CLS_FLOW=m

# CONFIG_NET_EMATCH is not set

CONFIG_NET_CLS_ACT=y

CONFIG_NET_ACT_POLICE=y
@@ -351,7 +371,6 @@ CONFIG_NET_ACT_POLICE=y 
CONFIG_NET_ACT_NAT=m

# CONFIG_NET_ACT_PEDIT is not set

# CONFIG_NET_ACT_SIMP is not set

CONFIG_NET_CLS_POLICE=y

# CONFIG_NET_CLS_IND is not set

CONFIG_NET_SCH_FIFO=y
@@ -360,6 +379,15 @@ CONFIG_NET_SCH_FIFO=y 
#

# CONFIG_NET_PKTGEN is not set

# CONFIG_NET_TCPPROBE is not set

CONFIG_CAN=m

CONFIG_CAN_RAW=m

CONFIG_CAN_BCM=m



#

# CAN Device Drivers

#

CONFIG_CAN_VCAN=m

# CONFIG_CAN_DEBUG_DEVICES is not set

# CONFIG_AF_RXRPC is not set

# CONFIG_RFKILL is not set

# CONFIG_NET_9P is not set
@@ -389,7 +417,7 @@ CONFIG_BLK_DEV_NBD=m 
CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=16

CONFIG_BLK_DEV_RAM_SIZE=4096

CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024

CONFIG_BLK_DEV_XIP=y

# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_ATA_OVER_ETH is not set
@@ -406,6 +434,7 @@ CONFIG_DASD_DIAG=y 
CONFIG_DASD_EER=y

CONFIG_MISC_DEVICES=y

# CONFIG_EEPROM_93CX6 is not set

# CONFIG_ENCLOSURE_SERVICES is not set



#

# SCSI device support
@@ -487,6 +516,7 @@ CONFIG_NET_ETHERNET=y 
# CONFIG_IBM_NEW_EMAC_TAH is not set

# CONFIG_IBM_NEW_EMAC_EMAC4 is not set

CONFIG_NETDEV_1000=y

# CONFIG_E1000E_ENABLED is not set

CONFIG_NETDEV_10000=y

# CONFIG_TR is not set

# CONFIG_WAN is not set
@@ -508,7 +538,6 @@ CONFIG_QETH=y 
CONFIG_CCWGROUP=y

# CONFIG_PPP is not set

# CONFIG_SLIP is not set

# CONFIG_SHAPER is not set

# CONFIG_NETCONSOLE is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set
@@ -558,6 +587,7 @@ CONFIG_S390_TAPE_34XX=m 
CONFIG_MONWRITER=m

CONFIG_S390_VMUR=m

# CONFIG_POWER_SUPPLY is not set

# CONFIG_THERMAL is not set

# CONFIG_WATCHDOG is not set



#
@@ -584,12 +614,10 @@ CONFIG_FS_POSIX_ACL=y 
# CONFIG_XFS_FS is not set

# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_ROMFS_FS is not set

CONFIG_DNOTIFY=y

CONFIG_INOTIFY=y

CONFIG_INOTIFY_USER=y

# CONFIG_QUOTA is not set

CONFIG_DNOTIFY=y

# CONFIG_AUTOFS_FS is not set

# CONFIG_AUTOFS4_FS is not set

# CONFIG_FUSE_FS is not set
@@ -632,8 +660,10 @@ CONFIG_CONFIGFS_FS=m 
# CONFIG_EFS_FS is not set

# CONFIG_CRAMFS is not set

# CONFIG_VXFS_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_HPFS_FS is not set

# CONFIG_QNX4FS_FS is not set

# CONFIG_ROMFS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set

CONFIG_NETWORK_FILESYSTEMS=y
@@ -686,16 +716,13 @@ CONFIG_MSDOS_PARTITION=y 
# CONFIG_NLS is not set

CONFIG_DLM=m

# CONFIG_DLM_DEBUG is not set

CONFIG_INSTRUMENTATION=y

# CONFIG_PROFILING is not set

CONFIG_KPROBES=y

# CONFIG_MARKERS is not set



#

# Kernel hacking

#

CONFIG_TRACE_IRQFLAGS_SUPPORT=y

# CONFIG_PRINTK_TIME is not set

CONFIG_ENABLE_WARN_DEPRECATED=y

CONFIG_ENABLE_MUST_CHECK=y

CONFIG_MAGIC_SYSRQ=y

# CONFIG_UNUSED_SYMBOLS is not set
@@ -721,12 +748,18 @@ CONFIG_DEBUG_BUGVERBOSE=y 
# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_VM is not set

# 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

# CONFIG_LKDTM is not set

# CONFIG_FAULT_INJECTION is not set

# CONFIG_LATENCYTOP is not set

CONFIG_SAMPLES=y

# CONFIG_SAMPLE_KOBJECT is not set

# CONFIG_DEBUG_PAGEALLOC is not set



#

# Security options
@@ -738,6 +771,7 @@ CONFIG_CRYPTO=y 
CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_AEAD=m

CONFIG_CRYPTO_BLKCIPHER=y

CONFIG_CRYPTO_SEQIV=m

CONFIG_CRYPTO_HASH=m

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_HMAC=m
@@ -745,17 +779,20 @@ CONFIG_CRYPTO_HMAC=m 
# CONFIG_CRYPTO_NULL is not set

# CONFIG_CRYPTO_MD4 is not set

CONFIG_CRYPTO_MD5=m

# CONFIG_CRYPTO_SHA1 is not set

CONFIG_CRYPTO_SHA1=m

# CONFIG_CRYPTO_SHA256 is not set

# CONFIG_CRYPTO_SHA512 is not set

# CONFIG_CRYPTO_WP512 is not set

# CONFIG_CRYPTO_TGR192 is not set

# CONFIG_CRYPTO_GF128MUL is not set

CONFIG_CRYPTO_GF128MUL=m

CONFIG_CRYPTO_ECB=m

CONFIG_CRYPTO_CBC=y

CONFIG_CRYPTO_PCBC=m

# CONFIG_CRYPTO_LRW is not set

# CONFIG_CRYPTO_XTS is not set

CONFIG_CRYPTO_CTR=m

CONFIG_CRYPTO_GCM=m

CONFIG_CRYPTO_CCM=m

# CONFIG_CRYPTO_CRYPTD is not set

# CONFIG_CRYPTO_DES is not set

CONFIG_CRYPTO_FCRYPT=m
@@ -770,20 +807,22 @@ CONFIG_CRYPTO_FCRYPT=m 
# CONFIG_CRYPTO_KHAZAD is not set

# CONFIG_CRYPTO_ANUBIS is not set

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_SALSA20=m

# CONFIG_CRYPTO_DEFLATE is not set

# CONFIG_CRYPTO_MICHAEL_MIC is not set

# CONFIG_CRYPTO_CRC32C is not set

CONFIG_CRYPTO_CAMELLIA=m

# CONFIG_CRYPTO_TEST is not set

CONFIG_CRYPTO_AUTHENC=m

CONFIG_CRYPTO_LZO=m

CONFIG_CRYPTO_HW=y

CONFIG_ZCRYPT=m

# CONFIG_ZCRYPT_MONOLITHIC is not set

# CONFIG_CRYPTO_SHA1_S390 is not set

# CONFIG_CRYPTO_SHA256_S390 is not set

# CONFIG_CRYPTO_DES_S390 is not set

# CONFIG_CRYPTO_AES_S390 is not set

CONFIG_S390_PRNG=m

CONFIG_ZCRYPT=m

# CONFIG_ZCRYPT_MONOLITHIC is not set



#

# Library routines
@@ -794,5 +833,7 @@ CONFIG_BITREVERSE=m 
# CONFIG_CRC_ITU_T is not set

CONFIG_CRC32=m

CONFIG_CRC7=m

# CONFIG_LIBCRC32C is not set

CONFIG_LIBCRC32C=m

CONFIG_LZO_COMPRESS=m

CONFIG_LZO_DECOMPRESS=m

CONFIG_PLIST=y

arch/s390/kernel/binfmt_elf32.c

+11 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ static inline int dump_task_fpu(struct task_struct *tsk, elf_fpregset_t *fpregs) 
}



#include <asm/processor.h>

#include <asm/pgalloc.h>

#include <linux/module.h>

#include <linux/elfcore.h>

#include <linux/binfmts.h>
@@ -183,6 +184,16 @@ struct elf_prpsinfo32 
#undef start_thread

#define start_thread                    start_thread31 



static inline void start_thread31(struct pt_regs *regs, unsigned long new_psw,

				  unsigned long new_stackp)

{

	set_fs(USER_DS);

	regs->psw.mask	= psw_user32_bits;

	regs->psw.addr	= new_psw;

	regs->gprs[15]	= new_stackp;

	crst_table_downgrade(current->mm, 1UL << 31);

}



MODULE_DESCRIPTION("Binary format loader for compatibility with 32bit Linux for S390 binaries,"

                   " Copyright 2000 IBM Corporation"); 

MODULE_AUTHOR("Gerhard Tonn <ton@de.ibm.com>");

arch/s390/kernel/compat_wrapper.S

+20 −0
Original line number Diff line number Diff line
@@ -1712,3 +1712,23 @@ sys_fallocate_wrapper: 
	sllg	%r5,%r6,32		# get high word of 64bit loff_t

	l	%r5,164(%r15)		# get low word of 64bit loff_t

	jg	sys_fallocate



	.globl	sys_timerfd_create_wrapper

sys_timerfd_create_wrapper:

	lgfr	%r2,%r2			# int

	lgfr	%r3,%r3			# int

	jg	sys_timerfd_create



	.globl	compat_sys_timerfd_settime_wrapper

compat_sys_timerfd_settime_wrapper:

	lgfr	%r2,%r2			# int

	lgfr	%r3,%r3			# int

	llgtr	%r4,%r4			# struct compat_itimerspec *

	llgtr	%r5,%r5			# struct compat_itimerspec *

	jg	compat_sys_timerfd_settime



	.globl	compat_sys_timerfd_gettime_wrapper

compat_sys_timerfd_gettime_wrapper:

	lgfr	%r2,%r2			# int

	llgtr	%r3,%r3			# struct compat_itimerspec *

	jg	compat_sys_timerfd_gettime

arch/s390/kernel/process.c

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <linux/slab.h>

#include <linux/vmalloc.h>

#include <linux/user.h>

#include <linux/a.out.h>

#include <linux/interrupt.h>

#include <linux/delay.h>

#include <linux/reboot.h>

arch/s390/kernel/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <linux/ptrace.h>

#include <linux/slab.h>

#include <linux/user.h>

#include <linux/a.out.h>

#include <linux/tty.h>

#include <linux/ioport.h>

#include <linux/delay.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE