Commit 21cdbc13 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: (81 commits)
  [S390] remove duplicated #includes
  [S390] cpumask: use mm_cpumask() wrapper
  [S390] cpumask: Use accessors code.
  [S390] cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits.
  [S390] cpumask: remove cpu_coregroup_map
  [S390] fix clock comparator save area usage
  [S390] Add hwcap flag for the etf3 enhancement facility
  [S390] Ensure that ipl panic notifier is called late.
  [S390] fix dfp elf hwcap/facility bit detection
  [S390] smp: perform initial cpu reset before starting a cpu
  [S390] smp: fix memory leak on __cpu_up
  [S390] ipl: Improve checking logic and remove switch defaults.
  [S390] s390dbf: Remove needless check for NULL pointer.
  [S390] s390dbf: Remove redundant initilizations.
  [S390] use kzfree()
  [S390] BUG to BUG_ON changes
  [S390] zfcpdump: Prevent zcore from beeing built as a kernel module.
  [S390] Use csum_partial in checksum.h
  [S390] cleanup lowcore.h
  [S390] eliminate ipl_device from lowcore
  ...
parents 86d9c070 ef3500b2

Documentation/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -830,6 +830,9 @@ and is between 256 and 4096 characters. It is defined in the file 


	hvc_iucv=	[S390] Number of z/VM IUCV hypervisor console (HVC)

			       terminal devices. Valid values: 0..8

	hvc_iucv_allow=	[S390] Comma-separated list of z/VM user IDs.

			       If specified, z/VM IUCV HVC accepts connections

			       from listed z/VM user IDs only.



	i8042.debug	[HW] Toggle i8042 debug mode

	i8042.direct	[HW] Put keyboard port into non-translated mode

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -3745,6 +3745,15 @@ L: linux-s390@vger.kernel.org 
W:	http://www.ibm.com/developerworks/linux/linux390/

S:	Supported



S390 ZCRYPT DRIVER

P:	Felix Beck

M:	felix.beck@de.ibm.com

P:	Ralph Wuerthner

M:	ralph.wuerthner@de.ibm.com

M:	linux390@de.ibm.com

L:	linux-s390@vger.kernel.org

S:	Supported



S390 ZFCP DRIVER

P:	Christof Schmitt

M:	christof.schmitt@de.ibm.com

arch/s390/Kconfig

+2 −9
Original line number Diff line number Diff line
@@ -343,13 +343,6 @@ source "mm/Kconfig" 


comment "I/O subsystem configuration"



config MACHCHK_WARNING

	bool "Process warning machine checks"

	help

	  Select this option if you want the machine check handler on IBM S/390 or

	  zSeries to process warning machine checks (e.g. on power failures).

	  If unsure, say "Y".



config QDIO

	tristate "QDIO support"

	---help---
@@ -521,7 +514,7 @@ config APPLDATA_OS 


config APPLDATA_NET_SUM

	tristate "Monitor overall network statistics"

	depends on APPLDATA_BASE

	depends on APPLDATA_BASE && NET

	help

	  This provides network related data to the Linux - VM Monitor Stream,

	  currently there is only a total sum of network I/O statistics, no
@@ -552,7 +545,7 @@ config KEXEC 
	  but is independent of hardware/microcode support.



config ZFCPDUMP

	tristate "zfcpdump support"

	bool "zfcpdump support"

	select SMP

	default n

	help

arch/s390/crypto/prng.c

+1 −2
Original line number Diff line number Diff line
@@ -201,8 +201,7 @@ out_free: 
static void __exit prng_exit(void)

{

	/* wipe me */

	memset(p->buf, 0, prng_chunk_size);

	kfree(p->buf);

	kzfree(p->buf);

	kfree(p);



	misc_deregister(&prng_dev);

arch/s390/include/asm/bitops.h

+7 −7
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
 * with operation of the form "set_bit(bitnr, flags)".

 */



/* bitmap tables from arch/S390/kernel/bitmap.S */

/* bitmap tables from arch/s390/kernel/bitmap.c */

extern const char _oi_bitmap[];

extern const char _ni_bitmap[];

extern const char _zb_findmap[];
@@ -525,16 +525,16 @@ static inline unsigned long __ffs_word_loop(const unsigned long *addr, 
static inline unsigned long __ffz_word(unsigned long nr, unsigned long word)

{

#ifdef __s390x__

	if (likely((word & 0xffffffff) == 0xffffffff)) {

	if ((word & 0xffffffff) == 0xffffffff) {

		word >>= 32;

		nr += 32;

	}

#endif

	if (likely((word & 0xffff) == 0xffff)) {

	if ((word & 0xffff) == 0xffff) {

		word >>= 16;

		nr += 16;

	}

	if (likely((word & 0xff) == 0xff)) {

	if ((word & 0xff) == 0xff) {

		word >>= 8;

		nr += 8;

	}
@@ -549,16 +549,16 @@ static inline unsigned long __ffz_word(unsigned long nr, unsigned long word) 
static inline unsigned long __ffs_word(unsigned long nr, unsigned long word)

{

#ifdef __s390x__

	if (likely((word & 0xffffffff) == 0)) {

	if ((word & 0xffffffff) == 0) {

		word >>= 32;

		nr += 32;

	}

#endif

	if (likely((word & 0xffff) == 0)) {

	if ((word & 0xffff) == 0) {

		word >>= 16;

		nr += 16;

	}

	if (likely((word & 0xff) == 0)) {

	if ((word & 0xff) == 0) {

		word >>= 8;

		nr += 8;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE