diff options
Diffstat (limited to 'arch')
36 files changed, 36 insertions, 36 deletions
diff --git a/arch/alpha/include/asm/signal.h b/arch/alpha/include/asm/signal.h index 13c2305d35ef..a9388300abb1 100644 --- a/arch/alpha/include/asm/signal.h +++ b/arch/alpha/include/asm/signal.h | |||
@@ -111,7 +111,7 @@ typedef unsigned long sigset_t; | |||
111 | #define SIG_UNBLOCK 2 /* for unblocking signals */ | 111 | #define SIG_UNBLOCK 2 /* for unblocking signals */ |
112 | #define SIG_SETMASK 3 /* for setting the signal mask */ | 112 | #define SIG_SETMASK 3 /* for setting the signal mask */ |
113 | 113 | ||
114 | #include <asm-generic/signal.h> | 114 | #include <asm-generic/signal-defs.h> |
115 | 115 | ||
116 | #ifdef __KERNEL__ | 116 | #ifdef __KERNEL__ |
117 | struct osf_sigaction { | 117 | struct osf_sigaction { |
diff --git a/arch/arm/include/asm/mman.h b/arch/arm/include/asm/mman.h index 54570d2e95b7..fc26976d8e3a 100644 --- a/arch/arm/include/asm/mman.h +++ b/arch/arm/include/asm/mman.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef __ARM_MMAN_H__ | 1 | #ifndef __ARM_MMAN_H__ |
2 | #define __ARM_MMAN_H__ | 2 | #define __ARM_MMAN_H__ |
3 | 3 | ||
4 | #include <asm-generic/mman.h> | 4 | #include <asm-generic/mman-common.h> |
5 | 5 | ||
6 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ | 6 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ |
7 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ | 7 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ |
diff --git a/arch/arm/include/asm/signal.h b/arch/arm/include/asm/signal.h index d0fb487aba4f..43ba0fb1c8ad 100644 --- a/arch/arm/include/asm/signal.h +++ b/arch/arm/include/asm/signal.h | |||
@@ -111,7 +111,7 @@ typedef unsigned long sigset_t; | |||
111 | #define MINSIGSTKSZ 2048 | 111 | #define MINSIGSTKSZ 2048 |
112 | #define SIGSTKSZ 8192 | 112 | #define SIGSTKSZ 8192 |
113 | 113 | ||
114 | #include <asm-generic/signal.h> | 114 | #include <asm-generic/signal-defs.h> |
115 | 115 | ||
116 | #ifdef __KERNEL__ | 116 | #ifdef __KERNEL__ |
117 | struct old_sigaction { | 117 | struct old_sigaction { |
diff --git a/arch/avr32/include/asm/mman.h b/arch/avr32/include/asm/mman.h index 648f91e7187a..9a92b15f6a66 100644 --- a/arch/avr32/include/asm/mman.h +++ b/arch/avr32/include/asm/mman.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef __ASM_AVR32_MMAN_H__ | 1 | #ifndef __ASM_AVR32_MMAN_H__ |
2 | #define __ASM_AVR32_MMAN_H__ | 2 | #define __ASM_AVR32_MMAN_H__ |
3 | 3 | ||
4 | #include <asm-generic/mman.h> | 4 | #include <asm-generic/mman-common.h> |
5 | 5 | ||
6 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ | 6 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ |
7 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ | 7 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ |
diff --git a/arch/avr32/include/asm/signal.h b/arch/avr32/include/asm/signal.h index caffefeeba1f..8790dfc10d5b 100644 --- a/arch/avr32/include/asm/signal.h +++ b/arch/avr32/include/asm/signal.h | |||
@@ -112,7 +112,7 @@ typedef unsigned long sigset_t; | |||
112 | #define MINSIGSTKSZ 2048 | 112 | #define MINSIGSTKSZ 2048 |
113 | #define SIGSTKSZ 8192 | 113 | #define SIGSTKSZ 8192 |
114 | 114 | ||
115 | #include <asm-generic/signal.h> | 115 | #include <asm-generic/signal-defs.h> |
116 | 116 | ||
117 | #ifdef __KERNEL__ | 117 | #ifdef __KERNEL__ |
118 | struct old_sigaction { | 118 | struct old_sigaction { |
diff --git a/arch/avr32/include/asm/termios.h b/arch/avr32/include/asm/termios.h index 0152aba35154..dd7e9da25488 100644 --- a/arch/avr32/include/asm/termios.h +++ b/arch/avr32/include/asm/termios.h | |||
@@ -55,7 +55,7 @@ struct termio { | |||
55 | */ | 55 | */ |
56 | #define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0" | 56 | #define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0" |
57 | 57 | ||
58 | #include <asm-generic/termios.h> | 58 | #include <asm-generic/termios-base.h> |
59 | 59 | ||
60 | #endif /* __KERNEL__ */ | 60 | #endif /* __KERNEL__ */ |
61 | 61 | ||
diff --git a/arch/blackfin/include/asm/signal.h b/arch/blackfin/include/asm/signal.h index 87951d251458..2eea90794454 100644 --- a/arch/blackfin/include/asm/signal.h +++ b/arch/blackfin/include/asm/signal.h | |||
@@ -104,7 +104,7 @@ typedef unsigned long sigset_t; | |||
104 | #define MINSIGSTKSZ 2048 | 104 | #define MINSIGSTKSZ 2048 |
105 | #define SIGSTKSZ 8192 | 105 | #define SIGSTKSZ 8192 |
106 | 106 | ||
107 | #include <asm-generic/signal.h> | 107 | #include <asm-generic/signal-defs.h> |
108 | 108 | ||
109 | #ifdef __KERNEL__ | 109 | #ifdef __KERNEL__ |
110 | struct old_sigaction { | 110 | struct old_sigaction { |
diff --git a/arch/cris/include/asm/mman.h b/arch/cris/include/asm/mman.h index 1c35e1b66b46..b7f0afba3ce0 100644 --- a/arch/cris/include/asm/mman.h +++ b/arch/cris/include/asm/mman.h | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | /* verbatim copy of asm-i386/ version */ | 4 | /* verbatim copy of asm-i386/ version */ |
5 | 5 | ||
6 | #include <asm-generic/mman.h> | 6 | #include <asm-generic/mman-common.h> |
7 | 7 | ||
8 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ | 8 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ |
9 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ | 9 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ |
diff --git a/arch/cris/include/asm/signal.h b/arch/cris/include/asm/signal.h index 349ae682b568..ea6af9aad76c 100644 --- a/arch/cris/include/asm/signal.h +++ b/arch/cris/include/asm/signal.h | |||
@@ -106,7 +106,7 @@ typedef unsigned long sigset_t; | |||
106 | #define MINSIGSTKSZ 2048 | 106 | #define MINSIGSTKSZ 2048 |
107 | #define SIGSTKSZ 8192 | 107 | #define SIGSTKSZ 8192 |
108 | 108 | ||
109 | #include <asm-generic/signal.h> | 109 | #include <asm-generic/signal-defs.h> |
110 | 110 | ||
111 | #ifdef __KERNEL__ | 111 | #ifdef __KERNEL__ |
112 | struct old_sigaction { | 112 | struct old_sigaction { |
diff --git a/arch/frv/include/asm/mman.h b/arch/frv/include/asm/mman.h index b4371e928683..58c1d11e2ac7 100644 --- a/arch/frv/include/asm/mman.h +++ b/arch/frv/include/asm/mman.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef __ASM_MMAN_H__ | 1 | #ifndef __ASM_MMAN_H__ |
2 | #define __ASM_MMAN_H__ | 2 | #define __ASM_MMAN_H__ |
3 | 3 | ||
4 | #include <asm-generic/mman.h> | 4 | #include <asm-generic/mman-common.h> |
5 | 5 | ||
6 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ | 6 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ |
7 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ | 7 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ |
diff --git a/arch/frv/include/asm/termios.h b/arch/frv/include/asm/termios.h index a62fb5872375..b4868aafe79c 100644 --- a/arch/frv/include/asm/termios.h +++ b/arch/frv/include/asm/termios.h | |||
@@ -52,7 +52,7 @@ struct termio { | |||
52 | /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ | 52 | /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ |
53 | 53 | ||
54 | #ifdef __KERNEL__ | 54 | #ifdef __KERNEL__ |
55 | #include <asm-generic/termios.h> | 55 | #include <asm-generic/termios-base.h> |
56 | #endif | 56 | #endif |
57 | 57 | ||
58 | #endif /* _ASM_TERMIOS_H */ | 58 | #endif /* _ASM_TERMIOS_H */ |
diff --git a/arch/h8300/include/asm/mman.h b/arch/h8300/include/asm/mman.h index b9f104f22a36..cf35f0a6f12e 100644 --- a/arch/h8300/include/asm/mman.h +++ b/arch/h8300/include/asm/mman.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef __H8300_MMAN_H__ | 1 | #ifndef __H8300_MMAN_H__ |
2 | #define __H8300_MMAN_H__ | 2 | #define __H8300_MMAN_H__ |
3 | 3 | ||
4 | #include <asm-generic/mman.h> | 4 | #include <asm-generic/mman-common.h> |
5 | 5 | ||
6 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ | 6 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ |
7 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ | 7 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ |
diff --git a/arch/h8300/include/asm/signal.h b/arch/h8300/include/asm/signal.h index 7bc15048a64f..fd8b66e40dca 100644 --- a/arch/h8300/include/asm/signal.h +++ b/arch/h8300/include/asm/signal.h | |||
@@ -105,7 +105,7 @@ typedef unsigned long sigset_t; | |||
105 | #define MINSIGSTKSZ 2048 | 105 | #define MINSIGSTKSZ 2048 |
106 | #define SIGSTKSZ 8192 | 106 | #define SIGSTKSZ 8192 |
107 | 107 | ||
108 | #include <asm-generic/signal.h> | 108 | #include <asm-generic/signal-defs.h> |
109 | 109 | ||
110 | #ifdef __KERNEL__ | 110 | #ifdef __KERNEL__ |
111 | struct old_sigaction { | 111 | struct old_sigaction { |
diff --git a/arch/ia64/include/asm/mman.h b/arch/ia64/include/asm/mman.h index c73b87832a1e..48cf8b98a0b4 100644 --- a/arch/ia64/include/asm/mman.h +++ b/arch/ia64/include/asm/mman.h | |||
@@ -8,7 +8,7 @@ | |||
8 | * David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co | 8 | * David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <asm-generic/mman.h> | 11 | #include <asm-generic/mman-common.h> |
12 | 12 | ||
13 | #define MAP_GROWSDOWN 0x00100 /* stack-like segment */ | 13 | #define MAP_GROWSDOWN 0x00100 /* stack-like segment */ |
14 | #define MAP_GROWSUP 0x00200 /* register stack-like segment */ | 14 | #define MAP_GROWSUP 0x00200 /* register stack-like segment */ |
diff --git a/arch/ia64/include/asm/signal.h b/arch/ia64/include/asm/signal.h index 4f5ca5643cb1..b166248d49a4 100644 --- a/arch/ia64/include/asm/signal.h +++ b/arch/ia64/include/asm/signal.h | |||
@@ -114,7 +114,7 @@ | |||
114 | 114 | ||
115 | #endif /* __KERNEL__ */ | 115 | #endif /* __KERNEL__ */ |
116 | 116 | ||
117 | #include <asm-generic/signal.h> | 117 | #include <asm-generic/signal-defs.h> |
118 | 118 | ||
119 | # ifndef __ASSEMBLY__ | 119 | # ifndef __ASSEMBLY__ |
120 | 120 | ||
diff --git a/arch/m32r/include/asm/mman.h b/arch/m32r/include/asm/mman.h index 516a8973b130..04a5f40aa401 100644 --- a/arch/m32r/include/asm/mman.h +++ b/arch/m32r/include/asm/mman.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef __M32R_MMAN_H__ | 1 | #ifndef __M32R_MMAN_H__ |
2 | #define __M32R_MMAN_H__ | 2 | #define __M32R_MMAN_H__ |
3 | 3 | ||
4 | #include <asm-generic/mman.h> | 4 | #include <asm-generic/mman-common.h> |
5 | 5 | ||
6 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ | 6 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ |
7 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ | 7 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ |
diff --git a/arch/m32r/include/asm/signal.h b/arch/m32r/include/asm/signal.h index 1a607066bc64..9c1acb2b1a92 100644 --- a/arch/m32r/include/asm/signal.h +++ b/arch/m32r/include/asm/signal.h | |||
@@ -107,7 +107,7 @@ typedef unsigned long sigset_t; | |||
107 | #define MINSIGSTKSZ 2048 | 107 | #define MINSIGSTKSZ 2048 |
108 | #define SIGSTKSZ 8192 | 108 | #define SIGSTKSZ 8192 |
109 | 109 | ||
110 | #include <asm-generic/signal.h> | 110 | #include <asm-generic/signal-defs.h> |
111 | 111 | ||
112 | #ifdef __KERNEL__ | 112 | #ifdef __KERNEL__ |
113 | struct old_sigaction { | 113 | struct old_sigaction { |
diff --git a/arch/m68k/include/asm/mman.h b/arch/m68k/include/asm/mman.h index 1626d37f4898..9f5c4c4b3c7b 100644 --- a/arch/m68k/include/asm/mman.h +++ b/arch/m68k/include/asm/mman.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef __M68K_MMAN_H__ | 1 | #ifndef __M68K_MMAN_H__ |
2 | #define __M68K_MMAN_H__ | 2 | #define __M68K_MMAN_H__ |
3 | 3 | ||
4 | #include <asm-generic/mman.h> | 4 | #include <asm-generic/mman-common.h> |
5 | 5 | ||
6 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ | 6 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ |
7 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ | 7 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ |
diff --git a/arch/m68k/include/asm/signal.h b/arch/m68k/include/asm/signal.h index 08788fdefde0..5bc09c787a11 100644 --- a/arch/m68k/include/asm/signal.h +++ b/arch/m68k/include/asm/signal.h | |||
@@ -103,7 +103,7 @@ typedef unsigned long sigset_t; | |||
103 | #define MINSIGSTKSZ 2048 | 103 | #define MINSIGSTKSZ 2048 |
104 | #define SIGSTKSZ 8192 | 104 | #define SIGSTKSZ 8192 |
105 | 105 | ||
106 | #include <asm-generic/signal.h> | 106 | #include <asm-generic/signal-defs.h> |
107 | 107 | ||
108 | #ifdef __KERNEL__ | 108 | #ifdef __KERNEL__ |
109 | struct old_sigaction { | 109 | struct old_sigaction { |
diff --git a/arch/microblaze/include/asm/signal.h b/arch/microblaze/include/asm/signal.h index 9676fad3486c..46bc2267d949 100644 --- a/arch/microblaze/include/asm/signal.h +++ b/arch/microblaze/include/asm/signal.h | |||
@@ -90,7 +90,7 @@ | |||
90 | 90 | ||
91 | # ifndef __ASSEMBLY__ | 91 | # ifndef __ASSEMBLY__ |
92 | # include <linux/types.h> | 92 | # include <linux/types.h> |
93 | # include <asm-generic/signal.h> | 93 | # include <asm-generic/signal-defs.h> |
94 | 94 | ||
95 | /* Avoid too many header ordering problems. */ | 95 | /* Avoid too many header ordering problems. */ |
96 | struct siginfo; | 96 | struct siginfo; |
diff --git a/arch/microblaze/include/asm/termios.h b/arch/microblaze/include/asm/termios.h index 102d77258668..47a46d1fbe26 100644 --- a/arch/microblaze/include/asm/termios.h +++ b/arch/microblaze/include/asm/termios.h | |||
@@ -81,7 +81,7 @@ struct termio { | |||
81 | 81 | ||
82 | #ifdef __KERNEL__ | 82 | #ifdef __KERNEL__ |
83 | 83 | ||
84 | #include <asm-generic/termios.h> | 84 | #include <asm-generic/termios-base.h> |
85 | 85 | ||
86 | #endif /* __KERNEL__ */ | 86 | #endif /* __KERNEL__ */ |
87 | 87 | ||
diff --git a/arch/mips/include/asm/signal.h b/arch/mips/include/asm/signal.h index bee5153aca48..c783f364938c 100644 --- a/arch/mips/include/asm/signal.h +++ b/arch/mips/include/asm/signal.h | |||
@@ -109,7 +109,7 @@ typedef unsigned long old_sigset_t; /* at least 32 bits */ | |||
109 | #define SIG_UNBLOCK 2 /* for unblocking signals */ | 109 | #define SIG_UNBLOCK 2 /* for unblocking signals */ |
110 | #define SIG_SETMASK 3 /* for setting the signal mask */ | 110 | #define SIG_SETMASK 3 /* for setting the signal mask */ |
111 | 111 | ||
112 | #include <asm-generic/signal.h> | 112 | #include <asm-generic/signal-defs.h> |
113 | 113 | ||
114 | struct sigaction { | 114 | struct sigaction { |
115 | unsigned int sa_flags; | 115 | unsigned int sa_flags; |
diff --git a/arch/mn10300/include/asm/mman.h b/arch/mn10300/include/asm/mman.h index b7986b65addf..d04fac1da5aa 100644 --- a/arch/mn10300/include/asm/mman.h +++ b/arch/mn10300/include/asm/mman.h | |||
@@ -12,7 +12,7 @@ | |||
12 | #ifndef _ASM_MMAN_H | 12 | #ifndef _ASM_MMAN_H |
13 | #define _ASM_MMAN_H | 13 | #define _ASM_MMAN_H |
14 | 14 | ||
15 | #include <asm-generic/mman.h> | 15 | #include <asm-generic/mman-common.h> |
16 | 16 | ||
17 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ | 17 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ |
18 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ | 18 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ |
diff --git a/arch/mn10300/include/asm/signal.h b/arch/mn10300/include/asm/signal.h index e98817cec5f7..7e891fce2370 100644 --- a/arch/mn10300/include/asm/signal.h +++ b/arch/mn10300/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/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h index e7b99bac9f48..7b1c49811a24 100644 --- a/arch/powerpc/include/asm/mman.h +++ b/arch/powerpc/include/asm/mman.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef _ASM_POWERPC_MMAN_H | 1 | #ifndef _ASM_POWERPC_MMAN_H |
2 | #define _ASM_POWERPC_MMAN_H | 2 | #define _ASM_POWERPC_MMAN_H |
3 | 3 | ||
4 | #include <asm-generic/mman.h> | 4 | #include <asm-generic/mman-common.h> |
5 | 5 | ||
6 | /* | 6 | /* |
7 | * This program is free software; you can redistribute it and/or | 7 | * This program is free software; you can redistribute it and/or |
diff --git a/arch/powerpc/include/asm/signal.h b/arch/powerpc/include/asm/signal.h index 69f709d8e8e7..3eb13be11d8f 100644 --- a/arch/powerpc/include/asm/signal.h +++ b/arch/powerpc/include/asm/signal.h | |||
@@ -94,7 +94,7 @@ typedef struct { | |||
94 | #define MINSIGSTKSZ 2048 | 94 | #define MINSIGSTKSZ 2048 |
95 | #define SIGSTKSZ 8192 | 95 | #define SIGSTKSZ 8192 |
96 | 96 | ||
97 | #include <asm-generic/signal.h> | 97 | #include <asm-generic/signal-defs.h> |
98 | 98 | ||
99 | struct old_sigaction { | 99 | struct old_sigaction { |
100 | __sighandler_t sa_handler; | 100 | __sighandler_t sa_handler; |
diff --git a/arch/powerpc/include/asm/termios.h b/arch/powerpc/include/asm/termios.h index 2c14fea07c8a..a24f48704a34 100644 --- a/arch/powerpc/include/asm/termios.h +++ b/arch/powerpc/include/asm/termios.h | |||
@@ -78,7 +78,7 @@ struct termio { | |||
78 | 78 | ||
79 | #ifdef __KERNEL__ | 79 | #ifdef __KERNEL__ |
80 | 80 | ||
81 | #include <asm-generic/termios.h> | 81 | #include <asm-generic/termios-base.h> |
82 | 82 | ||
83 | #endif /* __KERNEL__ */ | 83 | #endif /* __KERNEL__ */ |
84 | 84 | ||
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 | ||
diff --git a/arch/sh/include/asm/mman.h b/arch/sh/include/asm/mman.h index 156eb0225cf6..7d8b72c91a5f 100644 --- a/arch/sh/include/asm/mman.h +++ b/arch/sh/include/asm/mman.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef __ASM_SH_MMAN_H | 1 | #ifndef __ASM_SH_MMAN_H |
2 | #define __ASM_SH_MMAN_H | 2 | #define __ASM_SH_MMAN_H |
3 | 3 | ||
4 | #include <asm-generic/mman.h> | 4 | #include <asm-generic/mman-common.h> |
5 | 5 | ||
6 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ | 6 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ |
7 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ | 7 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ |
diff --git a/arch/sh/include/asm/signal.h b/arch/sh/include/asm/signal.h index 5c5c1e852089..9cc5f0144689 100644 --- a/arch/sh/include/asm/signal.h +++ b/arch/sh/include/asm/signal.h | |||
@@ -106,7 +106,7 @@ typedef unsigned long sigset_t; | |||
106 | #define MINSIGSTKSZ 2048 | 106 | #define MINSIGSTKSZ 2048 |
107 | #define SIGSTKSZ 8192 | 107 | #define SIGSTKSZ 8192 |
108 | 108 | ||
109 | #include <asm-generic/signal.h> | 109 | #include <asm-generic/signal-defs.h> |
110 | 110 | ||
111 | #ifdef __KERNEL__ | 111 | #ifdef __KERNEL__ |
112 | struct old_sigaction { | 112 | struct old_sigaction { |
diff --git a/arch/sparc/include/asm/mman.h b/arch/sparc/include/asm/mman.h index fdfbbf0a4736..988192e8e956 100644 --- a/arch/sparc/include/asm/mman.h +++ b/arch/sparc/include/asm/mman.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef __SPARC_MMAN_H__ | 1 | #ifndef __SPARC_MMAN_H__ |
2 | #define __SPARC_MMAN_H__ | 2 | #define __SPARC_MMAN_H__ |
3 | 3 | ||
4 | #include <asm-generic/mman.h> | 4 | #include <asm-generic/mman-common.h> |
5 | 5 | ||
6 | /* SunOS'ified... */ | 6 | /* SunOS'ified... */ |
7 | 7 | ||
diff --git a/arch/sparc/include/asm/signal.h b/arch/sparc/include/asm/signal.h index cba45206b7f2..e49b828a2471 100644 --- a/arch/sparc/include/asm/signal.h +++ b/arch/sparc/include/asm/signal.h | |||
@@ -176,7 +176,7 @@ struct sigstack { | |||
176 | #define SA_STATIC_ALLOC 0x8000 | 176 | #define SA_STATIC_ALLOC 0x8000 |
177 | #endif | 177 | #endif |
178 | 178 | ||
179 | #include <asm-generic/signal.h> | 179 | #include <asm-generic/signal-defs.h> |
180 | 180 | ||
181 | struct __new_sigaction { | 181 | struct __new_sigaction { |
182 | __sighandler_t sa_handler; | 182 | __sighandler_t sa_handler; |
diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h index 90bc4108a4fd..751af2550ed9 100644 --- a/arch/x86/include/asm/mman.h +++ b/arch/x86/include/asm/mman.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef _ASM_X86_MMAN_H | 1 | #ifndef _ASM_X86_MMAN_H |
2 | #define _ASM_X86_MMAN_H | 2 | #define _ASM_X86_MMAN_H |
3 | 3 | ||
4 | #include <asm-generic/mman.h> | 4 | #include <asm-generic/mman-common.h> |
5 | 5 | ||
6 | #define MAP_32BIT 0x40 /* only give out 32bit addresses */ | 6 | #define MAP_32BIT 0x40 /* only give out 32bit addresses */ |
7 | 7 | ||
diff --git a/arch/x86/include/asm/signal.h b/arch/x86/include/asm/signal.h index 7761a5d554bb..598457cbd0f8 100644 --- a/arch/x86/include/asm/signal.h +++ b/arch/x86/include/asm/signal.h | |||
@@ -117,7 +117,7 @@ typedef unsigned long sigset_t; | |||
117 | #define MINSIGSTKSZ 2048 | 117 | #define MINSIGSTKSZ 2048 |
118 | #define SIGSTKSZ 8192 | 118 | #define SIGSTKSZ 8192 |
119 | 119 | ||
120 | #include <asm-generic/signal.h> | 120 | #include <asm-generic/signal-defs.h> |
121 | 121 | ||
122 | #ifndef __ASSEMBLY__ | 122 | #ifndef __ASSEMBLY__ |
123 | 123 | ||