1
0
Fork 0
alistair23-linux/drivers/s390/char
Linus Torvalds 8ee78c6fb9 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 patches from Heiko Carstens:
 "A couple of s390 patches for the 3.5 merge window.  Just a collection
  of bug fixes and cleanups."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/uaccess: fix access_ok compile warnings
  s390/cmpxchg: select HAVE_CMPXCHG_LOCAL option
  s390/cmpxchg: fix sign extension bugs
  s390/cmpxchg: fix 1 and 2 byte memory accesses
  s390/cmpxchg: fix compile warnings specific to s390
  s390/cmpxchg: add missing memory barrier to cmpxchg64
  s390/cpu: remove cpu "capabilities" sysfs attribute
  s390/kernel: Fix smp_call_ipl_cpu() for offline CPUs
  s390/kernel: Introduce memcpy_absolute() function
  s390/headers: replace __s390x__ with CONFIG_64BIT where possible
  s390/headers: remove #ifdef __KERNEL__ from not exported headers
  s390/irq: split irq stats for cpu-measurement alert facilities
  s390/kexec: Move early_pgm_check_handler() to text section
  s390/kdump: Use real mode for PSW restart and kexec
  s390/kdump: Account /sys/kernel/kexec_crash_size changes in OS info
  s390/kernel: Remove OS info init function call and diag 308 for kdump
2012-05-31 10:51:10 -07:00
..
Kconfig [S390] kconfig: remove tape interface support comment 2011-07-24 10:48:00 +02:00
Makefile [S390] get CPC image name 2011-05-23 10:24:32 +02:00
con3215.c tty: add missing tty_port_tty_get() call to raw3215_wakeup 2012-04-17 13:55:43 -07:00
con3270.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
ctrlchar.c Input: sysrq - drop tty argument form handle_sysrq() 2010-08-21 00:34:45 -07:00
ctrlchar.h
defkeymap.c Build fix for drivers/s390/char/defkeymap.c 2008-03-04 08:01:26 -08:00
defkeymap.map
fs3270.c compat: fix compile breakage on s390 2012-02-27 07:54:27 -08:00
keyboard.c TTY: tty3270, add tty_port 2012-04-09 11:28:17 -07:00
keyboard.h TTY: tty3270, add tty_port 2012-04-09 11:28:17 -07:00
monreader.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
monwriter.c [S390] monwriter: fix return code handling 2011-05-23 10:24:29 +02:00
raw3270.c module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
raw3270.h [S390] pm: con3270 power management callbacks. 2009-06-16 10:31:20 +02:00
sclp.c [S390] irq: external interrupt code passing 2012-03-11 11:59:29 -04:00
sclp.h [S390] get CPC image name 2011-05-23 10:24:32 +02:00
sclp_async.c [S390] sclp_async: Use kstrtoul_from_user 2011-08-03 16:44:20 +02:00
sclp_cmd.c Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm 2012-05-24 16:17:30 -07:00
sclp_con.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
sclp_config.c cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular subsystem 2011-12-21 14:29:42 -08:00
sclp_cpi.c [S390] sclp: sysfs interface for SCLP cpi 2008-01-26 14:11:08 +01:00
sclp_cpi_sys.c s390: add missing module.h/export.h includes 2011-10-31 19:30:58 -04:00
sclp_cpi_sys.h [S390] sclp: sysfs interface for SCLP cpi 2008-01-26 14:11:08 +01:00
sclp_ocf.c [S390] get CPC image name 2011-05-23 10:24:32 +02:00
sclp_quiesce.c [S390] rework smp code 2012-03-11 11:59:28 -04:00
sclp_rw.c [S390] pm: power management support for SCLP drivers. 2009-06-16 10:31:16 +02:00
sclp_rw.h [S390] sclp: fix compile error for !SCLP_CONSOLE 2009-07-07 16:37:50 +02:00
sclp_sdias.c s390/headers: replace __s390x__ with CONFIG_64BIT where possible 2012-05-24 10:10:10 +02:00
sclp_tty.c TTY: sclp_tty, add tty_port 2012-04-09 11:28:16 -07:00
sclp_tty.h [S390] sclp_tty: remove ioctl interface. 2008-07-14 10:02:25 +02:00
sclp_vt220.c TTY: sclp_vt220, remove unused allocation 2012-04-09 11:28:17 -07:00
tape.h s390/tape: remove tape block leftovers 2012-05-16 14:42:39 +02:00
tape_34xx.c s390/tape: remove tape block leftovers 2012-05-16 14:42:39 +02:00
tape_3590.c s390/tape: remove tape block leftovers 2012-05-16 14:42:39 +02:00
tape_3590.h
tape_char.c s390/tape: remove tape block leftovers 2012-05-16 14:42:39 +02:00
tape_class.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
tape_class.h s390: tape_class.h: remove kobj_map.h inclusion 2011-12-13 11:17:40 -08:00
tape_core.c s390/tape: remove tape block leftovers 2012-05-16 14:42:39 +02:00
tape_proc.c [S390] tape: Add pr_fmt() macro to all tape source files 2009-12-18 17:43:32 +01:00
tape_std.c [S390] tape: remove unused/not handled return codes 2011-05-23 10:24:29 +02:00
tape_std.h
tty3270.c TTY: tty3270, add tty_port 2012-04-09 11:28:17 -07:00
tty3270.h [S390] Get rid of a bunch of sparse warnings again. 2007-10-12 16:13:06 +02:00
vmcp.c compat: fix compile breakage on s390 2012-02-27 07:54:27 -08:00
vmcp.h
vmlogrdr.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
vmur.c [S390] s390/char/vmur.c: fix memory leak 2012-04-11 14:28:24 +02:00
vmur.h [S390] vmur: Use wait queue instead of mutex to serialize open 2008-04-17 07:46:59 +02:00
vmwatchdog.c module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
zcore.c [S390] rework smp code 2012-03-11 11:59:28 -04:00