diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-14 21:03:30 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-14 21:03:30 -0500 |
commit | dca88ad6915b65f6e037f8c3e632fcd92a70bd88 (patch) | |
tree | a3dcbe53310997dcc37c7d49129c48febef53992 /arch/s390/include | |
parent | fed474857efbed79cd390d0aee224231ca718f63 (diff) | |
parent | 1632b9e2a14ce9f4e08faf6c4380431d63319bd3 (diff) |
Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers
* 'for-next' of git://git.infradead.org/users/dhowells/linux-headers:
UAPI: Split trivial #if defined(__KERNEL__) && X conditionals
UAPI: Don't have a #elif clause in a __KERNEL__ guard in linux/soundcard.h
UAPI: Fix AHZ multiple inclusion when __KERNEL__ is removed
UAPI: Make linux/patchkey.h easier to parse
UAPI: Fix nested __KERNEL__ guards in video/edid.h
UAPI: Alter the S390 asm include guards to be recognisable by the UAPI splitter
UAPI: Guard linux/cuda.h
UAPI: Guard linux/pmu.h
UAPI: Guard linux/isdn_divertif.h
UAPI: Guard linux/sound.h
UAPI: Rearrange definition of HZ in asm-generic/param.h
UAPI: Make FRV use asm-generic/param.h
UAPI: Make M32R use asm-generic/param.h
UAPI: Make MN10300 use asm-generic/param.h
UAPI: elf_read_implies_exec() is a kernel-only feature - so hide from userspace
UAPI: Don't include linux/compat.h in sparc's asm/siginfo.h
UAPI: Fix arch/mips/include/asm/Kbuild to have separate header-y lines
Diffstat (limited to 'arch/s390/include')
-rw-r--r-- | arch/s390/include/asm/chpid.h | 2 | ||||
-rw-r--r-- | arch/s390/include/asm/itcw.h | 2 | ||||
-rw-r--r-- | arch/s390/include/asm/mman.h | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/arch/s390/include/asm/chpid.h b/arch/s390/include/asm/chpid.h index fc71d8a6709b..8e88e2221771 100644 --- a/arch/s390/include/asm/chpid.h +++ b/arch/s390/include/asm/chpid.h | |||
@@ -6,7 +6,7 @@ | |||
6 | */ | 6 | */ |
7 | 7 | ||
8 | #ifndef _ASM_S390_CHPID_H | 8 | #ifndef _ASM_S390_CHPID_H |
9 | #define _ASM_S390_CHPID_H _ASM_S390_CHPID_H | 9 | #define _ASM_S390_CHPID_H |
10 | 10 | ||
11 | #include <linux/string.h> | 11 | #include <linux/string.h> |
12 | #include <linux/types.h> | 12 | #include <linux/types.h> |
diff --git a/arch/s390/include/asm/itcw.h b/arch/s390/include/asm/itcw.h index a9bc5c36b32a..fb1bedd3dc0d 100644 --- a/arch/s390/include/asm/itcw.h +++ b/arch/s390/include/asm/itcw.h | |||
@@ -6,7 +6,7 @@ | |||
6 | */ | 6 | */ |
7 | 7 | ||
8 | #ifndef _ASM_S390_ITCW_H | 8 | #ifndef _ASM_S390_ITCW_H |
9 | #define _ASM_S390_ITCW_H _ASM_S390_ITCW_H | 9 | #define _ASM_S390_ITCW_H |
10 | 10 | ||
11 | #include <linux/types.h> | 11 | #include <linux/types.h> |
12 | #include <asm/fcx.h> | 12 | #include <asm/fcx.h> |
diff --git a/arch/s390/include/asm/mman.h b/arch/s390/include/asm/mman.h index 4e9c8ae0a637..d49760e63506 100644 --- a/arch/s390/include/asm/mman.h +++ b/arch/s390/include/asm/mman.h | |||
@@ -11,9 +11,11 @@ | |||
11 | 11 | ||
12 | #include <asm-generic/mman.h> | 12 | #include <asm-generic/mman.h> |
13 | 13 | ||
14 | #if defined(__KERNEL__) && !defined(__ASSEMBLY__) && defined(CONFIG_64BIT) | 14 | #if defined(__KERNEL__) |
15 | #if !defined(__ASSEMBLY__) && defined(CONFIG_64BIT) | ||
15 | int s390_mmap_check(unsigned long addr, unsigned long len); | 16 | int s390_mmap_check(unsigned long addr, unsigned long len); |
16 | #define arch_mmap_check(addr,len,flags) s390_mmap_check(addr,len) | 17 | #define arch_mmap_check(addr,len,flags) s390_mmap_check(addr,len) |
17 | #endif | 18 | #endif |
19 | #endif | ||
18 | 20 | ||
19 | #endif /* __S390_MMAN_H__ */ | 21 | #endif /* __S390_MMAN_H__ */ |