Commit 9fd815b5 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: (22 commits)
  [S390] Update default configuration.
  [S390] hibernate: Do real CPU swap at resume time
  [S390] dasd: tolerate devices that have no feature codes
  [S390] zcrypt: Do not add/remove devices in s/r callbacks
  [S390] hibernate: make sure pfn_is_nosave handles lowcore pages
  [S390] smp: introduce LC_ORDER and simplify lowcore handling
  [S390] ptrace: use common code for simple peek/poke operations
  [S390] fix disabled_wait inline assembly clobber list
  [S390] Change kernel_page_present coding style.
  [S390] hibernation: reset system after resume
  [S390] hibernation: fix guest page hinting related crash
  [S390] Get rid of init_module/delete_module compat functions.
  [S390] Convert sys_execve to function with parameters.
  [S390] Convert sys_clone to function with parameters.
  [S390] qdio: change state of all primed input buffers
  [S390] qdio: reduce per device debug messages
  [S390] cio: introduce consistent subchannel scanning
  [S390] cio: idset use actual number of ssids
  [S390] cio: dont kfree vmalloced memory
  [S390] cio: introduce css_settle
  ...
parents 31bbb9b5 ed87b27e

arch/s390/defconfig

+25 −12
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.30

# Mon Jun 22 11:08:16 2009

# Linux kernel version: 2.6.31

# Tue Sep 22 17:43:13 2009

#

CONFIG_SCHED_MC=y

CONFIG_MMU=y
@@ -24,6 +24,7 @@ CONFIG_PGSTE=y 
CONFIG_VIRT_CPU_ACCOUNTING=y

CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y

CONFIG_S390=y

CONFIG_SCHED_OMIT_FRAME_POINTER=y

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"

CONFIG_CONSTRUCTORS=y
@@ -48,11 +49,12 @@ CONFIG_AUDIT=y 
#

# RCU Subsystem

#

CONFIG_CLASSIC_RCU=y

# CONFIG_TREE_RCU is not set

# CONFIG_PREEMPT_RCU is not set

CONFIG_TREE_RCU=y

# CONFIG_TREE_PREEMPT_RCU is not set

# CONFIG_RCU_TRACE is not set

CONFIG_RCU_FANOUT=64

# CONFIG_RCU_FANOUT_EXACT is not set

# CONFIG_TREE_RCU_TRACE is not set

# CONFIG_PREEMPT_RCU_TRACE is not set

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=17
@@ -103,11 +105,12 @@ CONFIG_TIMERFD=y 
CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_AIO=y

CONFIG_HAVE_PERF_COUNTERS=y

CONFIG_HAVE_PERF_EVENTS=y



#

# Performance Counters

# Kernel Performance Events And Counters

#

# CONFIG_PERF_EVENTS is not set

# CONFIG_PERF_COUNTERS is not set

CONFIG_VM_EVENT_COUNTERS=y

# CONFIG_STRIP_ASM_SYMS is not set
@@ -116,7 +119,6 @@ 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_SYSCALL_WRAPPERS=y
@@ -176,6 +178,7 @@ CONFIG_NO_HZ=y 
CONFIG_HIGH_RES_TIMERS=y

CONFIG_GENERIC_CLOCKEVENTS_BUILD=y

CONFIG_64BIT=y

# CONFIG_KTIME_SCALAR is not set

CONFIG_SMP=y

CONFIG_NR_CPUS=32

CONFIG_HOTPLUG_CPU=y
@@ -257,7 +260,6 @@ CONFIG_FORCE_MAX_ZONEORDER=9 
CONFIG_PFAULT=y

# CONFIG_SHARED_KERNEL is not set

# CONFIG_CMM is not set

# CONFIG_PAGE_STATES is not set

# CONFIG_APPLDATA_BASE is not set

CONFIG_HZ_100=y

# CONFIG_HZ_250 is not set
@@ -280,6 +282,7 @@ CONFIG_PM_SLEEP_SMP=y 
CONFIG_PM_SLEEP=y

CONFIG_HIBERNATION=y

CONFIG_PM_STD_PARTITION=""

# CONFIG_PM_RUNTIME is not set

CONFIG_NET=y



#
@@ -394,6 +397,7 @@ CONFIG_IP_SCTP=m 
# CONFIG_SCTP_HMAC_NONE is not set

# CONFIG_SCTP_HMAC_SHA1 is not set

CONFIG_SCTP_HMAC_MD5=y

# CONFIG_RDS is not set

# CONFIG_TIPC is not set

# CONFIG_ATM is not set

# CONFIG_BRIDGE is not set
@@ -487,6 +491,7 @@ CONFIG_CCW=y 
# Generic Driver Options

#

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_DEVTMPFS is not set

CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

CONFIG_FW_LOADER=y
@@ -501,6 +506,7 @@ CONFIG_BLK_DEV=y 
CONFIG_BLK_DEV_LOOP=m

# CONFIG_BLK_DEV_CRYPTOLOOP is not set

CONFIG_BLK_DEV_NBD=m

# CONFIG_BLK_DEV_OSD is not set

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=16

CONFIG_BLK_DEV_RAM_SIZE=4096
@@ -594,8 +600,11 @@ CONFIG_BLK_DEV_DM=y 
CONFIG_DM_CRYPT=y

CONFIG_DM_SNAPSHOT=y

CONFIG_DM_MIRROR=y

# CONFIG_DM_LOG_USERSPACE is not set

CONFIG_DM_ZERO=y

CONFIG_DM_MULTIPATH=m

# CONFIG_DM_MULTIPATH_QL is not set

# CONFIG_DM_MULTIPATH_ST is not set

# CONFIG_DM_DELAY is not set

# CONFIG_DM_UEVENT is not set

CONFIG_NETDEVICES=y
@@ -615,7 +624,6 @@ CONFIG_NET_ETHERNET=y 
# 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_KS8842 is not set

CONFIG_NETDEV_1000=y

CONFIG_NETDEV_10000=y

# CONFIG_TR is not set
@@ -678,6 +686,7 @@ CONFIG_SCLP_CONSOLE=y 
CONFIG_SCLP_VT220_TTY=y

CONFIG_SCLP_VT220_CONSOLE=y

CONFIG_SCLP_CPI=m

CONFIG_SCLP_ASYNC=m

CONFIG_S390_TAPE=m



#
@@ -737,6 +746,7 @@ CONFIG_FS_POSIX_ACL=y 
# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_BTRFS_FS is not set

# CONFIG_NILFS2_FS is not set

CONFIG_FILE_LOCKING=y

CONFIG_FSNOTIFY=y

CONFIG_DNOTIFY=y
@@ -798,7 +808,6 @@ CONFIG_MISC_FILESYSTEMS=y 
# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set

# CONFIG_EXOFS_FS is not set

# CONFIG_NILFS2_FS is not set

CONFIG_NETWORK_FILESYSTEMS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y
@@ -885,11 +894,13 @@ CONFIG_DEBUG_MEMORY_INIT=y 
# CONFIG_DEBUG_LIST is not set

# CONFIG_DEBUG_SG is not set

# CONFIG_DEBUG_NOTIFIERS is not set

# CONFIG_DEBUG_CREDENTIALS 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_DEBUG_FORCE_WEAK_PER_CPU=y

# CONFIG_LKDTM is not set

# CONFIG_FAULT_INJECTION is not set

# CONFIG_LATENCYTOP is not set
@@ -979,11 +990,13 @@ CONFIG_CRYPTO_PCBC=m 
#

CONFIG_CRYPTO_HMAC=m

# CONFIG_CRYPTO_XCBC is not set

CONFIG_CRYPTO_VMAC=m



#

# Digest

#

CONFIG_CRYPTO_CRC32C=m

CONFIG_CRYPTO_GHASH=m

# CONFIG_CRYPTO_MD4 is not set

CONFIG_CRYPTO_MD5=m

# CONFIG_CRYPTO_MICHAEL_MIC is not set

arch/s390/include/asm/lowcore.h

+9 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ 
#define __LC_PGM_OLD_PSW		0x0150

#define __LC_MCK_OLD_PSW		0x0160

#define __LC_IO_OLD_PSW			0x0170

#define __LC_RESTART_PSW		0x01a0

#define __LC_EXT_NEW_PSW		0x01b0

#define __LC_SVC_NEW_PSW		0x01c0

#define __LC_PGM_NEW_PSW		0x01d0
@@ -189,6 +190,14 @@ union save_area { 
#define SAVE_AREA_BASE SAVE_AREA_BASE_S390X

#endif



#ifndef __s390x__

#define LC_ORDER 0

#else

#define LC_ORDER 1

#endif



#define LC_PAGES (1UL << LC_ORDER)



struct _lowcore

{

#ifndef __s390x__

arch/s390/include/asm/processor.h

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ static inline void ATTRIB_NORET disabled_wait(unsigned long code) 
		"	oi	0x384(1),0x10\n"/* fake protection bit */

		"	lpswe	0(%1)"

		: "=m" (ctl_buf)

		: "a" (&dw_psw), "a" (&ctl_buf), "m" (dw_psw) : "cc", "0");

		: "a" (&dw_psw), "a" (&ctl_buf), "m" (dw_psw) : "cc", "0", "1");

#endif /* __s390x__ */

	while (1);

}

arch/s390/kernel/asm-offsets.c

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

#include <linux/kbuild.h>

#include <asm/vdso.h>

#include <asm/sigp.h>



int main(void)

{
@@ -59,6 +60,10 @@ int main(void) 
	DEFINE(CLOCK_REALTIME, CLOCK_REALTIME);

	DEFINE(CLOCK_MONOTONIC, CLOCK_MONOTONIC);

	DEFINE(CLOCK_REALTIME_RES, MONOTONIC_RES_NSEC);



	/* constants for SIGP */

	DEFINE(__SIGP_STOP, sigp_stop);

	DEFINE(__SIGP_RESTART, sigp_restart);

	DEFINE(__SIGP_SENSE, sigp_sense);

	DEFINE(__SIGP_INITIAL_CPU_RESET, sigp_initial_cpu_reset);

	return 0;

}

arch/s390/kernel/compat_linux.c

+14 −69
Original line number Diff line number Diff line
@@ -443,66 +443,28 @@ sys32_rt_sigqueueinfo(int pid, int sig, compat_siginfo_t __user *uinfo) 
 * sys32_execve() executes a new program after the asm stub has set

 * things up for us.  This should basically do what I want it to.

 */

asmlinkage long sys32_execve(void)

asmlinkage long sys32_execve(char __user *name, compat_uptr_t __user *argv,

			     compat_uptr_t __user *envp)

{

	struct pt_regs *regs = task_pt_regs(current);

	char *filename;

	unsigned long result;

	int rc;



	filename = getname(compat_ptr(regs->orig_gpr2));

	if (IS_ERR(filename)) {

		result = PTR_ERR(filename);

	long rc;



	filename = getname(name);

	rc = PTR_ERR(filename);

	if (IS_ERR(filename))

		return rc;

	rc = compat_do_execve(filename, argv, envp, regs);

	if (rc)

		goto out;

	}

	rc = compat_do_execve(filename, compat_ptr(regs->gprs[3]),

			      compat_ptr(regs->gprs[4]), regs);

	if (rc) {

		result = rc;

		goto out_putname;

	}

	current->thread.fp_regs.fpc=0;

	asm volatile("sfpc %0,0" : : "d" (0));

	result = regs->gprs[2];

out_putname:

        putname(filename);

	rc = regs->gprs[2];

out:

	return result;

}





#ifdef CONFIG_MODULES



asmlinkage long

sys32_init_module(void __user *umod, unsigned long len,

		const char __user *uargs)

{

	return sys_init_module(umod, len, uargs);

}



asmlinkage long

sys32_delete_module(const char __user *name_user, unsigned int flags)

{

	return sys_delete_module(name_user, flags);

}



#else /* CONFIG_MODULES */



asmlinkage long

sys32_init_module(void __user *umod, unsigned long len,

		const char __user *uargs)

{

	return -ENOSYS;

}



asmlinkage long

sys32_delete_module(const char __user *name_user, unsigned int flags)

{

	return -ENOSYS;

	putname(filename);

	return rc;

}



#endif  /* CONFIG_MODULES */



asmlinkage long sys32_pread64(unsigned int fd, char __user *ubuf,

				size_t count, u32 poshi, u32 poslo)

{
@@ -801,23 +763,6 @@ asmlinkage long sys32_write(unsigned int fd, char __user * buf, size_t count) 
	return sys_write(fd, buf, count);

}



asmlinkage long sys32_clone(void)

{

	struct pt_regs *regs = task_pt_regs(current);

	unsigned long clone_flags;

	unsigned long newsp;

	int __user *parent_tidptr, *child_tidptr;



	clone_flags = regs->gprs[3] & 0xffffffffUL;

	newsp = regs->orig_gpr2 & 0x7fffffffUL;

	parent_tidptr = compat_ptr(regs->gprs[4]);

	child_tidptr = compat_ptr(regs->gprs[5]);

	if (!newsp)

		newsp = regs->gprs[15];

	return do_fork(clone_flags, newsp, regs, 0,

		       parent_tidptr, child_tidptr);

}



/*

 * 31 bit emulation wrapper functions for sys_fadvise64/fadvise64_64.

 * These need to rewrite the advise values for POSIX_FADV_{DONTNEED,NOREUSE}

CRA Git | Maintained and supported by SUSTech CRA and CCSE