diff options
author | David Howells <dhowells@redhat.com> | 2012-10-09 12:47:31 +0400 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2012-10-09 12:47:31 +0400 |
commit | 9807f75955ea7f1877981056755284481873115c (patch) | |
tree | 1e80f10ee622a1638d4b0835030d0d69b0492c55 /arch/s390/include/asm/types.h | |
parent | 9e2d8656f5e8aa214e66b462680cf86b210b74a8 (diff) | |
download | linux-9807f75955ea7f1877981056755284481873115c.tar.xz |
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/types.h')
-rw-r--r-- | arch/s390/include/asm/types.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/s390/include/asm/types.h b/arch/s390/include/asm/types.h index 6ba7c2c7217a..dccef3ca91fa 100644 --- a/arch/s390/include/asm/types.h +++ b/arch/s390/include/asm/types.h @@ -3,26 +3,14 @@ * * Derived from "include/asm-i386/types.h" */ - #ifndef _S390_TYPES_H #define _S390_TYPES_H -#include <asm-generic/int-ll64.h> - -#ifndef __ASSEMBLY__ - -/* A address type so that arithmetic can be done on it & it can be upgraded to - 64 bit when necessary -*/ -typedef unsigned long addr_t; -typedef __signed__ long saddr_t; - -#endif /* __ASSEMBLY__ */ +#include <uapi/asm/types.h> /* * These aren't exported outside the kernel to avoid name space clashes */ -#ifdef __KERNEL__ #ifndef __ASSEMBLY__ @@ -37,5 +25,4 @@ typedef union { #endif /* ! CONFIG_64BIT */ #endif /* __ASSEMBLY__ */ -#endif /* __KERNEL__ */ #endif /* _S390_TYPES_H */ |