diff options
Diffstat (limited to 'arch/s390')
-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 @@ | |||
9 | #ifndef __S390_MMAN_H__ | 9 | #ifndef __S390_MMAN_H__ |
10 | #define __S390_MMAN_H__ | 10 | #define __S390_MMAN_H__ |
11 | 11 | ||
12 | #include <asm-generic/mman.h> | 12 | #include <asm-generic/mman-common.h> |
13 | 13 | ||
14 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ | 14 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ |
15 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ | 15 | #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; | |||
115 | #define MINSIGSTKSZ 2048 | 115 | #define MINSIGSTKSZ 2048 |
116 | #define SIGSTKSZ 8192 | 116 | #define SIGSTKSZ 8192 |
117 | 117 | ||
118 | #include <asm-generic/signal.h> | 118 | #include <asm-generic/signal-defs.h> |
119 | 119 | ||
120 | #ifdef __KERNEL__ | 120 | #ifdef __KERNEL__ |
121 | struct old_sigaction { | 121 | 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 { | |||
60 | #define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2)) | 60 | #define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2)) |
61 | #define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2)) | 61 | #define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2)) |
62 | 62 | ||
63 | #include <asm-generic/termios.h> | 63 | #include <asm-generic/termios-base.h> |
64 | 64 | ||
65 | #endif /* __KERNEL__ */ | 65 | #endif /* __KERNEL__ */ |
66 | 66 | ||