diff options
| author |   David Howells <dhowells@redhat.com> | 2012-10-09 09:47:31 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2012-10-09 09:47:31 +0100 |
| commit | 9807f75955ea7f1877981056755284481873115c (patch) | |
| tree | 1e80f10ee622a1638d4b0835030d0d69b0492c55 /arch/s390/include/asm/mman.h | |
| parent | Merge branch 'akpm' (Andrew's patch-bomb) (diff) | |
| download | linux-dev-9807f75955ea7f1877981056755284481873115c.tar.xz linux-dev-9807f75955ea7f1877981056755284481873115c.zip | |
UAPI: (Scripted) Disintegrate arch/s390/include/asm
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'arch/s390/include/asm/mman.h')
| -rw-r--r-- | arch/s390/include/asm/mman.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/s390/include/asm/mman.h b/arch/s390/include/asm/mman.h index abc1932ac4e1..0e47a576d666 100644 --- a/arch/s390/include/asm/mman.h +++ b/arch/s390/include/asm/mman.h @@ -3,17 +3,13 @@ * * Derived from "include/asm-i386/mman.h" */ - #ifndef __S390_MMAN_H__ #define __S390_MMAN_H__ -#include <asm-generic/mman.h> +#include <uapi/asm/mman.h> -#if defined(__KERNEL__) #if !defined(__ASSEMBLY__) && defined(CONFIG_64BIT) int s390_mmap_check(unsigned long addr, unsigned long len); #define arch_mmap_check(addr,len,flags) s390_mmap_check(addr,len) #endif -#endif - #endif /* __S390_MMAN_H__ */ |