diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-31 10:51:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-31 10:51:10 -0700 |
| commit | 8ee78c6fb982b3a7343faf561e7937d4cfa955ff (patch) | |
| tree | 93d9327018e648174fb83b4144eed89de72693dd /arch/s390/include/asm/io.h | |
| parent | aac422afeffa9093544799c3257a96b55ba42044 (diff) | |
| parent | 491af9903b858ee7c36735dc31708fe4074ce56f (diff) | |
| download | kernel_goldelico_gta04-8ee78c6fb982b3a7343faf561e7937d4cfa955ff.zip kernel_goldelico_gta04-8ee78c6fb982b3a7343faf561e7937d4cfa955ff.tar.gz kernel_goldelico_gta04-8ee78c6fb982b3a7343faf561e7937d4cfa955ff.tar.bz2 | |
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
Diffstat (limited to 'arch/s390/include/asm/io.h')
| -rw-r--r-- | arch/s390/include/asm/io.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/s390/include/asm/io.h b/arch/s390/include/asm/io.h index 27216d3..f81a097 100644 --- a/arch/s390/include/asm/io.h +++ b/arch/s390/include/asm/io.h @@ -11,8 +11,6 @@ #ifndef _S390_IO_H #define _S390_IO_H -#ifdef __KERNEL__ - #include <asm/page.h> #define IO_SPACE_LIMIT 0xffffffff @@ -46,6 +44,4 @@ void unxlate_dev_mem_ptr(unsigned long phys, void *addr); */ #define xlate_dev_kmem_ptr(p) p -#endif /* __KERNEL__ */ - #endif |