diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2009-05-14 00:56:24 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@klappe2.(none)> | 2009-06-11 21:01:52 +0200 |
| commit | 63b852a6b67d0820d388b0ecd0da83ccb4048b8d (patch) | |
| tree | 4f73c46716669c3996280d3dfcee1a56c6cf0d07 /arch/s390/include | |
| parent | Linux 2.6.30 (diff) | |
| download | linux-63b852a6b67d0820d388b0ecd0da83ccb4048b8d.tar.xz linux-63b852a6b67d0820d388b0ecd0da83ccb4048b8d.zip | |
asm-generic: rename termios.h, signal.h and mman.h
The existing asm-generic versions are incomplete and included
by some architectures. New architectures should be able
to use a generic version, so rename the existing files and
change all users, which lets us add the new files.
Signed-off-by: Remis Lima Baima <remis.developer@googlemail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/s390/include')
| -rw-r--r-- | arch/s390/include/asm/mman.h | 2 | ||||
| -rw-r--r-- | arch/s390/include/asm/signal.h | 2 | ||||
| -rw-r--r-- | arch/s390/include/asm/termios.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/include/asm/mman.h b/arch/s390/include/asm/mman.h index da01432e8f44..f63fe7b431ed 100644 --- a/arch/s390/include/asm/mman.h +++ b/arch/s390/include/asm/mman.h @@ -9,7 +9,7 @@ #ifndef __S390_MMAN_H__ #define __S390_MMAN_H__ -#include <asm-generic/mman.h> +#include <asm-generic/mman-common.h> #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ diff --git a/arch/s390/include/asm/signal.h b/arch/s390/include/asm/signal.h index f6cfddb278cb..cdf5cb2fe03f 100644 --- a/arch/s390/include/asm/signal.h +++ b/arch/s390/include/asm/signal.h @@ -115,7 +115,7 @@ typedef unsigned long sigset_t; #define MINSIGSTKSZ 2048 #define SIGSTKSZ 8192 -#include <asm-generic/signal.h> +#include <asm-generic/signal-defs.h> #ifdef __KERNEL__ struct old_sigaction { diff --git a/arch/s390/include/asm/termios.h b/arch/s390/include/asm/termios.h index 67f66278f533..bc3a35cefc96 100644 --- a/arch/s390/include/asm/termios.h +++ b/arch/s390/include/asm/termios.h @@ -60,7 +60,7 @@ struct termio { #define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2)) #define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2)) -#include <asm-generic/termios.h> +#include <asm-generic/termios-base.h> #endif /* __KERNEL__ */ |