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

Commit f1ba3bc7 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] Update default configuration.
  [S390] Fix alignment of initial kernel stack.
  [S390] pgtable.h: Fix oops in unmap_vmas for KVM processes
  [S390] fix/cleanup sched_clock
  [S390] fix system call parameter functions.
parents 95c5e1f1 abd94219

arch/s390/defconfig

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

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.27-rc4

# Thu Aug 21 19:43:29 2008

# Linux kernel version: 2.6.28-rc6

# Thu Nov 27 11:00:49 2008

#

CONFIG_SCHED_MC=y

CONFIG_MMU=y
@@ -45,6 +45,7 @@ CONFIG_LOG_BUF_SHIFT=17 
CONFIG_CGROUPS=y

# CONFIG_CGROUP_DEBUG is not set

CONFIG_CGROUP_NS=y

# CONFIG_CGROUP_FREEZER is not set

# CONFIG_CGROUP_DEVICE is not set

# CONFIG_CPUSETS is not set

CONFIG_GROUP_SCHED=y
@@ -84,6 +85,7 @@ CONFIG_SIGNALFD=y 
CONFIG_TIMERFD=y

CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_AIO=y

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_SLAB=y

# CONFIG_SLUB is not set
@@ -92,16 +94,10 @@ CONFIG_SLAB=y 
# CONFIG_MARKERS is not set

CONFIG_HAVE_OPROFILE=y

CONFIG_KPROBES=y

# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set

CONFIG_KRETPROBES=y

# CONFIG_HAVE_IOREMAP_PROT is not set

CONFIG_HAVE_KPROBES=y

CONFIG_HAVE_KRETPROBES=y

# CONFIG_HAVE_ARCH_TRACEHOOK is not set

# CONFIG_HAVE_DMA_ATTRS is not set

# CONFIG_USE_GENERIC_SMP_HELPERS is not set

# CONFIG_HAVE_CLK is not set

CONFIG_PROC_PAGE_MONITOR=y

CONFIG_HAVE_ARCH_TRACEHOOK=y

# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y
@@ -135,6 +131,7 @@ CONFIG_DEFAULT_DEADLINE=y 
CONFIG_DEFAULT_IOSCHED="deadline"

CONFIG_PREEMPT_NOTIFIERS=y

CONFIG_CLASSIC_RCU=y

# CONFIG_FREEZER is not set



#

# Base setup
@@ -189,7 +186,6 @@ CONFIG_SELECT_MEMORY_MODEL=y 
CONFIG_SPARSEMEM_MANUAL=y

CONFIG_SPARSEMEM=y

CONFIG_HAVE_MEMORY_PRESENT=y

# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_SPARSEMEM_EXTREME=y

CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y

CONFIG_SPARSEMEM_VMEMMAP=y
@@ -200,9 +196,11 @@ CONFIG_PAGEFLAGS_EXTENDED=y 
CONFIG_SPLIT_PTLOCK_CPUS=4

CONFIG_MIGRATION=y

CONFIG_RESOURCES_64BIT=y

CONFIG_PHYS_ADDR_T_64BIT=y

CONFIG_ZONE_DMA_FLAG=1

CONFIG_BOUNCE=y

CONFIG_VIRT_TO_BUS=y

CONFIG_UNEVICTABLE_LRU=y



#

# I/O subsystem configuration
@@ -220,6 +218,8 @@ CONFIG_IPL=y 
CONFIG_IPL_VM=y

CONFIG_BINFMT_ELF=y

CONFIG_COMPAT_BINFMT_ELF=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_HAVE_AOUT is not set

CONFIG_BINFMT_MISC=m

CONFIG_FORCE_MAX_ZONEORDER=9

# CONFIG_PROCESS_DEBUG is not set
@@ -255,7 +255,7 @@ CONFIG_XFRM=y 
# CONFIG_XFRM_STATISTICS is not set

CONFIG_NET_KEY=y

# CONFIG_NET_KEY_MIGRATE is not set

CONFIG_IUCV=m

CONFIG_IUCV=y

CONFIG_AFIUCV=m

CONFIG_INET=y

CONFIG_IP_MULTICAST=y
@@ -282,7 +282,6 @@ CONFIG_INET_TCP_DIAG=y 
CONFIG_TCP_CONG_CUBIC=y

CONFIG_DEFAULT_TCP_CONG="cubic"

# CONFIG_TCP_MD5SIG is not set

# CONFIG_IP_VS is not set

CONFIG_IPV6=y

# CONFIG_IPV6_PRIVACY is not set

# CONFIG_IPV6_ROUTER_PREF is not set
@@ -331,10 +330,12 @@ CONFIG_NF_CONNTRACK=m 
# CONFIG_NF_CONNTRACK_TFTP is not set

# CONFIG_NF_CT_NETLINK is not set

# CONFIG_NETFILTER_XTABLES is not set

# CONFIG_IP_VS is not set



#

# IP: Netfilter Configuration

#

# CONFIG_NF_DEFRAG_IPV4 is not set

# CONFIG_NF_CONNTRACK_IPV4 is not set

# CONFIG_IP_NF_QUEUE is not set

# CONFIG_IP_NF_IPTABLES is not set
@@ -374,6 +375,7 @@ CONFIG_NET_SCH_CBQ=m 
# CONFIG_NET_SCH_HTB is not set

# CONFIG_NET_SCH_HFSC is not set

CONFIG_NET_SCH_PRIO=m

CONFIG_NET_SCH_MULTIQ=y

CONFIG_NET_SCH_RED=m

CONFIG_NET_SCH_SFQ=m

CONFIG_NET_SCH_TEQL=m
@@ -406,6 +408,7 @@ 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_ACT_SKBEDIT is not set

# CONFIG_NET_CLS_IND is not set

CONFIG_NET_SCH_FIFO=y
@@ -424,6 +427,7 @@ CONFIG_CAN_BCM=m 
CONFIG_CAN_VCAN=m

# CONFIG_CAN_DEBUG_DEVICES is not set

# CONFIG_AF_RXRPC is not set

# CONFIG_PHONET is not set

# CONFIG_RFKILL is not set

# CONFIG_NET_9P is not set

# CONFIG_PCMCIA is not set
@@ -473,7 +477,7 @@ CONFIG_VIRTIO_BLK=m 
CONFIG_MISC_DEVICES=y

# CONFIG_EEPROM_93CX6 is not set

# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_HAVE_IDE is not set

# CONFIG_C2PORT is not set



#

# SCSI device support
@@ -525,6 +529,7 @@ CONFIG_SCSI_DH_EMC=m 
CONFIG_SCSI_DH_ALUA=m

CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

CONFIG_MD_AUTODETECT=y

CONFIG_MD_LINEAR=m

CONFIG_MD_RAID0=m

CONFIG_MD_RAID1=m
@@ -555,6 +560,9 @@ CONFIG_NET_ETHERNET=y 
# CONFIG_IBM_NEW_EMAC_RGMII is not set

# CONFIG_IBM_NEW_EMAC_TAH is not set

# CONFIG_IBM_NEW_EMAC_EMAC4 is not set

# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set

# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set

# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set

CONFIG_NETDEV_1000=y

CONFIG_NETDEV_10000=y

# CONFIG_TR is not set
@@ -632,13 +640,12 @@ CONFIG_S390_VMUR=m 
# CONFIG_THERMAL is not set

# CONFIG_THERMAL_HWMON is not set

# CONFIG_WATCHDOG is not set



#

# Sonics Silicon Backplane

#

# CONFIG_REGULATOR is not set

# CONFIG_MEMSTICK is not set

# CONFIG_NEW_LEDS is not set

CONFIG_ACCESSIBILITY=y

# CONFIG_STAGING is not set

CONFIG_STAGING_EXCLUDE_BUILD=y



#

# File systems
@@ -650,13 +657,14 @@ CONFIG_EXT3_FS=y 
CONFIG_EXT3_FS_XATTR=y

# CONFIG_EXT3_FS_POSIX_ACL is not set

# CONFIG_EXT3_FS_SECURITY is not set

# CONFIG_EXT4DEV_FS is not set

# CONFIG_EXT4_FS is not set

CONFIG_JBD=y

# CONFIG_JBD_DEBUG is not set

CONFIG_FS_MBCACHE=y

# CONFIG_REISERFS_FS is not set

# CONFIG_JFS_FS is not set

CONFIG_FS_POSIX_ACL=y

CONFIG_FILE_LOCKING=y

# CONFIG_XFS_FS is not set

# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set
@@ -688,6 +696,7 @@ CONFIG_GENERIC_ACL=y 
CONFIG_PROC_FS=y

CONFIG_PROC_KCORE=y

CONFIG_PROC_SYSCTL=y

CONFIG_PROC_PAGE_MONITOR=y

CONFIG_SYSFS=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y
@@ -728,6 +737,7 @@ CONFIG_LOCKD_V4=y 
CONFIG_EXPORTFS=y

CONFIG_NFS_COMMON=y

CONFIG_SUNRPC=y

# CONFIG_SUNRPC_REGISTER_V4 is not set

# CONFIG_RPCSEC_GSS_KRB5 is not set

# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set
@@ -800,12 +810,24 @@ CONFIG_DEBUG_MEMORY_INIT=y 
# CONFIG_DEBUG_SG is not set

# CONFIG_FRAME_POINTER is not set

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

# CONFIG_KPROBES_SANITY_TEST is not set

# CONFIG_BACKTRACE_SELF_TEST is not set

# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set

# CONFIG_LKDTM is not set

# CONFIG_FAULT_INJECTION is not set

# CONFIG_LATENCYTOP is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y



#

# Tracers

#

# CONFIG_IRQSOFF_TRACER is not set

# CONFIG_PREEMPT_TRACER is not set

# CONFIG_SCHED_TRACER is not set

# CONFIG_CONTEXT_SWITCH_TRACER is not set

# CONFIG_BOOT_TRACER is not set

# CONFIG_DYNAMIC_PRINTK_DEBUG is not set

CONFIG_SAMPLES=y

# CONFIG_SAMPLE_KOBJECT is not set

# CONFIG_SAMPLE_KPROBES is not set
@@ -816,16 +838,19 @@ CONFIG_SAMPLES=y 
#

# CONFIG_KEYS is not set

# CONFIG_SECURITY is not set

# CONFIG_SECURITYFS is not set

# CONFIG_SECURITY_FILE_CAPABILITIES is not set

CONFIG_CRYPTO=y



#

# Crypto core or helper

#

CONFIG_CRYPTO_FIPS=y

CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_AEAD=m

CONFIG_CRYPTO_AEAD=y

CONFIG_CRYPTO_BLKCIPHER=y

CONFIG_CRYPTO_HASH=m

CONFIG_CRYPTO_HASH=y

CONFIG_CRYPTO_RNG=y

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_GF128MUL=m

# CONFIG_CRYPTO_NULL is not set
@@ -877,7 +902,7 @@ CONFIG_CRYPTO_SHA1=m 
#

# Ciphers

#

# CONFIG_CRYPTO_AES is not set

CONFIG_CRYPTO_AES=m

# CONFIG_CRYPTO_ANUBIS is not set

# CONFIG_CRYPTO_ARC4 is not set

# CONFIG_CRYPTO_BLOWFISH is not set
@@ -898,6 +923,11 @@ CONFIG_CRYPTO_SEED=m 
#

# CONFIG_CRYPTO_DEFLATE is not set

CONFIG_CRYPTO_LZO=m



#

# Random Number Generation

#

CONFIG_CRYPTO_ANSI_CPRNG=m

CONFIG_CRYPTO_HW=y

CONFIG_ZCRYPT=m

# CONFIG_ZCRYPT_MONOLITHIC is not set
@@ -912,8 +942,6 @@ CONFIG_S390_PRNG=m 
# Library routines

#

CONFIG_BITREVERSE=m

# CONFIG_GENERIC_FIND_FIRST_BIT is not set

# CONFIG_GENERIC_FIND_NEXT_BIT is not set

# CONFIG_CRC_CCITT is not set

# CONFIG_CRC16 is not set

CONFIG_CRC_T10DIF=y

arch/s390/include/asm/pgtable.h

+0 −2
Original line number Diff line number Diff line
@@ -679,8 +679,6 @@ static inline void pmd_clear(pmd_t *pmd) 


static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)

{

	if (mm->context.has_pgste)

		ptep_rcp_copy(ptep);

	pte_val(*ptep) = _PAGE_TYPE_EMPTY;

	if (mm->context.noexec)

		pte_val(ptep[PTRS_PER_PTE]) = _PAGE_TYPE_EMPTY;

arch/s390/include/asm/ptrace.h

+1 −1
Original line number Diff line number Diff line
@@ -321,8 +321,8 @@ struct pt_regs 
	psw_t psw;

	unsigned long gprs[NUM_GPRS];

	unsigned long orig_gpr2;

	unsigned short svcnr;

	unsigned short ilc;

	unsigned short trap;

};

#endif

arch/s390/include/asm/syscall.h

+16 −12
Original line number Diff line number Diff line
@@ -17,9 +17,7 @@ 
static inline long syscall_get_nr(struct task_struct *task,

				  struct pt_regs *regs)

{

	if (regs->trap != __LC_SVC_OLD_PSW)

		return -1;

	return regs->gprs[2];

	return regs->svcnr ? regs->svcnr : -1;

}



static inline void syscall_rollback(struct task_struct *task,
@@ -52,18 +50,20 @@ static inline void syscall_get_arguments(struct task_struct *task, 
					 unsigned int i, unsigned int n,

					 unsigned long *args)

{

	unsigned long mask = -1UL;



	BUG_ON(i + n > 6);

#ifdef CONFIG_COMPAT

	if (test_tsk_thread_flag(task, TIF_31BIT)) {

		if (i + n == 6)

			args[--n] = (u32) regs->args[0];

		while (n-- > 0)

			args[n] = (u32) regs->gprs[2 + i + n];

	}

	if (test_tsk_thread_flag(task, TIF_31BIT))

		mask = 0xffffffff;

#endif

	if (i + n == 6)

		args[--n] = regs->args[0];

	memcpy(args, &regs->gprs[2 + i], n * sizeof(args[0]));

		args[--n] = regs->args[0] & mask;

	while (n-- > 0)

		if (i + n > 0)

			args[n] = regs->gprs[2 + i + n] & mask;

	if (i == 0)

		args[0] = regs->orig_gpr2 & mask;

}



static inline void syscall_set_arguments(struct task_struct *task,
@@ -74,7 +74,11 @@ static inline void syscall_set_arguments(struct task_struct *task, 
	BUG_ON(i + n > 6);

	if (i + n == 6)

		regs->args[0] = args[--n];

	memcpy(&regs->gprs[2 + i], args, n * sizeof(args[0]));

	while (n-- > 0)

		if (i + n > 0)

			regs->gprs[2 + i + n] = args[n];

	if (i == 0)

		regs->orig_gpr2 = args[0];

}



#endif	/* _ASM_SYSCALL_H */

arch/s390/kernel/asm-offsets.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ int main(void) 
	DEFINE(__PT_GPRS, offsetof(struct pt_regs, gprs));

	DEFINE(__PT_ORIG_GPR2, offsetof(struct pt_regs, orig_gpr2));

	DEFINE(__PT_ILC, offsetof(struct pt_regs, ilc));

	DEFINE(__PT_TRAP, offsetof(struct pt_regs, trap));

	DEFINE(__PT_SVCNR, offsetof(struct pt_regs, svcnr));

	DEFINE(__PT_SIZE, sizeof(struct pt_regs));

	BLANK();

	DEFINE(__SF_BACKCHAIN, offsetof(struct stack_frame, back_chain));