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

Commit 7d671f3e 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 documentation for hvc_iucv kernel parameter.
  [S390] hvc_iucv: Special handling of IUCV HVC devices
  [S390] hvc_iucv: Refactor console and device initialization
  [S390] hvc_iucv: Update function documentation
  [S390] hvc_iucv: Limit rate of outgoing IUCV messages
  [S390] hvc_iucv: Change IUCV term id and use one device as default
  [S390] Use unsigned long long for u64 on 64bit.
  [S390] qdio: fix broken pointer in case of CONFIG_DEBUG_FS is disabled
  [S390] vdso: compile fix
  [S390] remove code for oldselect system call
  [S390] types: add/fix types.h include in header files
  [S390] dasd: add device attribute to disable blocking on lost paths
  [S390] dasd: send change uevents for dasd block devices
  [S390] tape block: fix dependencies
  [S390] asm-s390/posix_types.h: drop __USE_ALL usage
  [S390] gettimeofday.S: removed duplicated #includes
  [S390] ptrace: no extern declarations for userspace
parents d7d717fa 555d61d6

Documentation/kernel-parameters.txt

+2 −2
Original line number Diff line number Diff line
@@ -834,8 +834,8 @@ and is between 256 and 4096 characters. It is defined in the file 


	hlt		[BUGS=ARM,SH]



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

			       back-ends. Valid parameters: 0..8

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

			       terminal devices. Valid values: 0..8



	i8042.debug	[HW] Toggle i8042 debug mode

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

arch/s390/include/asm/chpid.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#define _ASM_S390_CHPID_H _ASM_S390_CHPID_H



#include <linux/string.h>

#include <asm/types.h>

#include <linux/types.h>



#define __MAX_CHPID 255

arch/s390/include/asm/chsc.h

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#ifndef _ASM_CHSC_H

#define _ASM_CHSC_H



#include <linux/types.h>

#include <asm/chpid.h>

#include <asm/schid.h>

arch/s390/include/asm/cmb.h

+3 −0
Original line number Diff line number Diff line 
#ifndef S390_CMB_H

#define S390_CMB_H



#include <linux/types.h>



/**

 * struct cmbdata - channel measurement block data for user space

 * @size: size of the stored data

arch/s390/include/asm/dasd.h

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#ifndef DASD_H

#define DASD_H

#include <linux/types.h>

#include <linux/ioctl.h>



#define DASD_IOCTL_LETTER 'D'
@@ -78,6 +79,7 @@ typedef struct dasd_information2_t { 
#define DASD_FEATURE_USEDIAG	     0x02

#define DASD_FEATURE_INITIAL_ONLINE  0x04

#define DASD_FEATURE_ERPLOG	     0x08

#define DASD_FEATURE_FAILFAST	     0x10



#define DASD_PARTN_BITS 2