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>

diff --git a/arch/alpha/include/asm/signal.h b/arch/alpha/include/asm/signal.h
index 13c2305d35ef781b2f784ea553856c53c3ee28fc..a9388300abb13b75c2d9cdbbfc0f682ba2465e00 100644 (file)
--- a/arch/alpha/include/asm/signal.h
+++ b/arch/alpha/include/asm/signal.h
@@ -111,7 +111,7 @@ typedef unsigned long sigset_t;
 #define SIG_UNBLOCK        2   /* for unblocking signals */
 #define SIG_SETMASK        3   /* for setting the signal mask */
 
 #define SIG_UNBLOCK        2   /* for unblocking signals */
 #define SIG_SETMASK        3   /* for setting the signal mask */
 

-#include <asm-generic/signal.h>
+#include <asm-generic/signal-defs.h>

 
 #ifdef __KERNEL__
 struct osf_sigaction {
 
 #ifdef __KERNEL__
 struct osf_sigaction {

diff --git a/arch/arm/include/asm/mman.h b/arch/arm/include/asm/mman.h
index 54570d2e95b7b4856430550f75022853a966434a..fc26976d8e3a7090716e8f5624bee962ebcb283a 100644 (file)
--- a/arch/arm/include/asm/mman.h
+++ b/arch/arm/include/asm/mman.h
@@ -1,7 +1,7 @@
 #ifndef __ARM_MMAN_H__
 #define __ARM_MMAN_H__
 
 #ifndef __ARM_MMAN_H__
 #define __ARM_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 */
 
 #define MAP_GROWSDOWN  0x0100          /* stack-like segment */
 #define MAP_DENYWRITE  0x0800          /* ETXTBSY */

diff --git a/arch/arm/include/asm/signal.h b/arch/arm/include/asm/signal.h
index d0fb487aba4f268811d96abc1a37cec2d3bbfdfd..43ba0fb1c8ad2b774e42041715c1276b226ba7bf 100644 (file)
--- a/arch/arm/include/asm/signal.h
+++ b/arch/arm/include/asm/signal.h
@@ -111,7 +111,7 @@ typedef unsigned long sigset_t;
 #define MINSIGSTKSZ    2048
 #define SIGSTKSZ       8192
 
 #define MINSIGSTKSZ    2048
 #define SIGSTKSZ       8192
 

-#include <asm-generic/signal.h>
+#include <asm-generic/signal-defs.h>

 
 #ifdef __KERNEL__
 struct old_sigaction {
 
 #ifdef __KERNEL__
 struct old_sigaction {

diff --git a/arch/avr32/include/asm/mman.h b/arch/avr32/include/asm/mman.h
index 648f91e7187a089a670ed5ba057524ff2439a334..9a92b15f6a66c19eeae0c9c42ecc964447608268 100644 (file)
--- a/arch/avr32/include/asm/mman.h
+++ b/arch/avr32/include/asm/mman.h
@@ -1,7 +1,7 @@
 #ifndef __ASM_AVR32_MMAN_H__
 #define __ASM_AVR32_MMAN_H__
 
 #ifndef __ASM_AVR32_MMAN_H__
 #define __ASM_AVR32_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 */
 
 #define MAP_GROWSDOWN  0x0100          /* stack-like segment */
 #define MAP_DENYWRITE  0x0800          /* ETXTBSY */

diff --git a/arch/avr32/include/asm/signal.h b/arch/avr32/include/asm/signal.h
index caffefeeba1fed9deccd9e7c51685e4bb69a8068..8790dfc10d5ba25353398a94cd93916ea1fe50a0 100644 (file)
--- a/arch/avr32/include/asm/signal.h
+++ b/arch/avr32/include/asm/signal.h
@@ -112,7 +112,7 @@ typedef unsigned long sigset_t;
 #define MINSIGSTKSZ    2048
 #define SIGSTKSZ       8192
 
 #define MINSIGSTKSZ    2048
 #define SIGSTKSZ       8192
 

-#include <asm-generic/signal.h>
+#include <asm-generic/signal-defs.h>

 
 #ifdef __KERNEL__
 struct old_sigaction {
 
 #ifdef __KERNEL__
 struct old_sigaction {

diff --git a/arch/avr32/include/asm/termios.h b/arch/avr32/include/asm/termios.h
index 0152aba35154b5a8b53644e1466f30cd3748296e..dd7e9da2548894e8a749bb05196898efd629fe6a 100644 (file)
--- a/arch/avr32/include/asm/termios.h
+++ b/arch/avr32/include/asm/termios.h
@@ -55,7 +55,7 @@ struct termio {
 */
 #define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0"
 
 */
 #define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0"
 

-#include <asm-generic/termios.h>
+#include <asm-generic/termios-base.h>

 
 #endif /* __KERNEL__ */
 
 
 #endif /* __KERNEL__ */
 

diff --git a/arch/blackfin/include/asm/signal.h b/arch/blackfin/include/asm/signal.h
index 87951d25145813e183459d03a15bf7000da69408..2eea907944545aad94b54cba586d2eec1c36ac32 100644 (file)
--- a/arch/blackfin/include/asm/signal.h
+++ b/arch/blackfin/include/asm/signal.h
@@ -104,7 +104,7 @@ typedef unsigned long sigset_t;
 #define MINSIGSTKSZ    2048
 #define SIGSTKSZ       8192
 
 #define MINSIGSTKSZ    2048
 #define SIGSTKSZ       8192
 

-#include <asm-generic/signal.h>
+#include <asm-generic/signal-defs.h>

 
 #ifdef __KERNEL__
 struct old_sigaction {
 
 #ifdef __KERNEL__
 struct old_sigaction {

diff --git a/arch/cris/include/asm/mman.h b/arch/cris/include/asm/mman.h
index 1c35e1b66b46e206a24d5b99a65a13eedcf44ad3..b7f0afba3ce052c515972d9c28d17ec264057243 100644 (file)
--- a/arch/cris/include/asm/mman.h
+++ b/arch/cris/include/asm/mman.h
@@ -3,7 +3,7 @@
 
 /* verbatim copy of asm-i386/ version */
 
 
 /* verbatim copy of asm-i386/ version */
 

-#include <asm-generic/mman.h>
+#include <asm-generic/mman-common.h>

 
 #define MAP_GROWSDOWN  0x0100          /* stack-like segment */
 #define MAP_DENYWRITE  0x0800          /* ETXTBSY */
 
 #define MAP_GROWSDOWN  0x0100          /* stack-like segment */
 #define MAP_DENYWRITE  0x0800          /* ETXTBSY */

diff --git a/arch/cris/include/asm/signal.h b/arch/cris/include/asm/signal.h
index 349ae682b568625083fd2dcbf3f8e157a4251ab6..ea6af9aad76c25c92d255c842ea95f0aeba27fbe 100644 (file)
--- a/arch/cris/include/asm/signal.h
+++ b/arch/cris/include/asm/signal.h
@@ -106,7 +106,7 @@ typedef unsigned long sigset_t;
 #define MINSIGSTKSZ    2048
 #define SIGSTKSZ       8192
 
 #define MINSIGSTKSZ    2048
 #define SIGSTKSZ       8192
 

-#include <asm-generic/signal.h>
+#include <asm-generic/signal-defs.h>

 
 #ifdef __KERNEL__
 struct old_sigaction {
 
 #ifdef __KERNEL__
 struct old_sigaction {

diff --git a/arch/frv/include/asm/mman.h b/arch/frv/include/asm/mman.h
index b4371e9286836ff5f3d84da2c6ddf4becc6ce049..58c1d11e2ac71fe225f7e2a05137d80e53dbc32a 100644 (file)
--- a/arch/frv/include/asm/mman.h
+++ b/arch/frv/include/asm/mman.h
@@ -1,7 +1,7 @@
 #ifndef __ASM_MMAN_H__
 #define __ASM_MMAN_H__
 
 #ifndef __ASM_MMAN_H__
 #define __ASM_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 */
 
 #define MAP_GROWSDOWN  0x0100          /* stack-like segment */
 #define MAP_DENYWRITE  0x0800          /* ETXTBSY */

diff --git a/arch/frv/include/asm/termios.h b/arch/frv/include/asm/termios.h
index a62fb58723758faeef174533a1e867356f0da697..b4868aafe79c3c99e58254ef21f673e822fcd345 100644 (file)
--- a/arch/frv/include/asm/termios.h
+++ b/arch/frv/include/asm/termios.h
@@ -52,7 +52,7 @@ struct termio {
 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
 
 #ifdef __KERNEL__
 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
 
 #ifdef __KERNEL__

-#include <asm-generic/termios.h>
+#include <asm-generic/termios-base.h>

 #endif
 
 #endif /* _ASM_TERMIOS_H */
 #endif
 
 #endif /* _ASM_TERMIOS_H */

diff --git a/arch/h8300/include/asm/mman.h b/arch/h8300/include/asm/mman.h
index b9f104f22a36a96b976758baca4215e47955b9df..cf35f0a6f12eee77729b51551f7a87bb3aeba477 100644 (file)
--- a/arch/h8300/include/asm/mman.h
+++ b/arch/h8300/include/asm/mman.h
@@ -1,7 +1,7 @@
 #ifndef __H8300_MMAN_H__
 #define __H8300_MMAN_H__
 
 #ifndef __H8300_MMAN_H__
 #define __H8300_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 */
 
 #define MAP_GROWSDOWN  0x0100          /* stack-like segment */
 #define MAP_DENYWRITE  0x0800          /* ETXTBSY */

diff --git a/arch/h8300/include/asm/signal.h b/arch/h8300/include/asm/signal.h
index 7bc15048a64f810ad4a0fee4475cd31c1ba4c975..fd8b66e40dcaa41c726500c66237e2b4b87cc92a 100644 (file)
--- a/arch/h8300/include/asm/signal.h
+++ b/arch/h8300/include/asm/signal.h
@@ -105,7 +105,7 @@ typedef unsigned long sigset_t;
 #define MINSIGSTKSZ    2048
 #define SIGSTKSZ       8192
 
 #define MINSIGSTKSZ    2048
 #define SIGSTKSZ       8192
 

-#include <asm-generic/signal.h>
+#include <asm-generic/signal-defs.h>

 
 #ifdef __KERNEL__
 struct old_sigaction {
 
 #ifdef __KERNEL__
 struct old_sigaction {

diff --git a/arch/ia64/include/asm/mman.h b/arch/ia64/include/asm/mman.h
index c73b87832a1e56a3b9cae408ed0d6f2f504e8195..48cf8b98a0b47bbb5eb4ff2c58ea837c6e56e623 100644 (file)
--- a/arch/ia64/include/asm/mman.h
+++ b/arch/ia64/include/asm/mman.h
@@ -8,7 +8,7 @@
  *     David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
  */
 
  *     David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
  */
 

-#include <asm-generic/mman.h>
+#include <asm-generic/mman-common.h>

 
 #define MAP_GROWSDOWN  0x00100         /* stack-like segment */
 #define MAP_GROWSUP    0x00200         /* register stack-like segment */
 
 #define MAP_GROWSDOWN  0x00100         /* stack-like segment */
 #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 4f5ca5643cb12553430f9b013e0096695567582e..b166248d49a46b884b425dd530b4dd5fd0d96ad9 100644 (file)
--- a/arch/ia64/include/asm/signal.h
+++ b/arch/ia64/include/asm/signal.h
@@ -114,7 +114,7 @@
 
 #endif /* __KERNEL__ */
 
 
 #endif /* __KERNEL__ */
 

-#include <asm-generic/signal.h>
+#include <asm-generic/signal-defs.h>

 
 # ifndef __ASSEMBLY__
 
 
 # ifndef __ASSEMBLY__
 

diff --git a/arch/m32r/include/asm/mman.h b/arch/m32r/include/asm/mman.h
index 516a8973b1302c177643915c35ee248f5631e987..04a5f40aa401c988b9799e7362c99db07f2189e5 100644 (file)
--- a/arch/m32r/include/asm/mman.h
+++ b/arch/m32r/include/asm/mman.h
@@ -1,7 +1,7 @@
 #ifndef __M32R_MMAN_H__
 #define __M32R_MMAN_H__
 
 #ifndef __M32R_MMAN_H__
 #define __M32R_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 */
 
 #define MAP_GROWSDOWN  0x0100          /* stack-like segment */
 #define MAP_DENYWRITE  0x0800          /* ETXTBSY */

diff --git a/arch/m32r/include/asm/signal.h b/arch/m32r/include/asm/signal.h
index 1a607066bc645ce0a6767702640438930402ebd3..9c1acb2b1a928984c8f62ce4a5cd91a25329dc21 100644 (file)
--- a/arch/m32r/include/asm/signal.h
+++ b/arch/m32r/include/asm/signal.h
@@ -107,7 +107,7 @@ typedef unsigned long sigset_t;
 #define MINSIGSTKSZ    2048
 #define SIGSTKSZ       8192
 
 #define MINSIGSTKSZ    2048
 #define SIGSTKSZ       8192
 

-#include <asm-generic/signal.h>
+#include <asm-generic/signal-defs.h>

 
 #ifdef __KERNEL__
 struct old_sigaction {
 
 #ifdef __KERNEL__
 struct old_sigaction {

diff --git a/arch/m68k/include/asm/mman.h b/arch/m68k/include/asm/mman.h
index 1626d37f48980c1fce8179051790323b557c5a70..9f5c4c4b3c7b20d37a4184e6d76a6888358d4510 100644 (file)
--- a/arch/m68k/include/asm/mman.h
+++ b/arch/m68k/include/asm/mman.h
@@ -1,7 +1,7 @@
 #ifndef __M68K_MMAN_H__
 #define __M68K_MMAN_H__
 
 #ifndef __M68K_MMAN_H__
 #define __M68K_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 */
 
 #define MAP_GROWSDOWN  0x0100          /* stack-like segment */
 #define MAP_DENYWRITE  0x0800          /* ETXTBSY */

diff --git a/arch/m68k/include/asm/signal.h b/arch/m68k/include/asm/signal.h
index 08788fdefde0c66cb330145fd95b319131330c4b..5bc09c787a1175a05850bac9fec1d739e192bb3e 100644 (file)
--- a/arch/m68k/include/asm/signal.h
+++ b/arch/m68k/include/asm/signal.h
@@ -103,7 +103,7 @@ typedef unsigned long sigset_t;
 #define MINSIGSTKSZ    2048
 #define SIGSTKSZ       8192
 
 #define MINSIGSTKSZ    2048
 #define SIGSTKSZ       8192
 

-#include <asm-generic/signal.h>
+#include <asm-generic/signal-defs.h>

 
 #ifdef __KERNEL__
 struct old_sigaction {
 
 #ifdef __KERNEL__
 struct old_sigaction {

diff --git a/arch/microblaze/include/asm/signal.h b/arch/microblaze/include/asm/signal.h
index 9676fad3486cfcf7c1853217a1c8f17a40948fc9..46bc2267d9497a751de01b75324120b384f4ce5f 100644 (file)
--- a/arch/microblaze/include/asm/signal.h
+++ b/arch/microblaze/include/asm/signal.h
@@ -90,7 +90,7 @@
 
 # ifndef __ASSEMBLY__
 # include <linux/types.h>
 
 # ifndef __ASSEMBLY__
 # include <linux/types.h>

-# include <asm-generic/signal.h>
+# include <asm-generic/signal-defs.h>

 
 /* Avoid too many header ordering problems. */
 struct siginfo;
 
 /* Avoid too many header ordering problems. */
 struct siginfo;

diff --git a/arch/microblaze/include/asm/termios.h b/arch/microblaze/include/asm/termios.h
index 102d772586689ff209f342ac3e91d8f9bfb986a6..47a46d1fbe26fa4e1ddd1bf7b66f3290ea1facc8 100644 (file)
--- a/arch/microblaze/include/asm/termios.h
+++ b/arch/microblaze/include/asm/termios.h
@@ -81,7 +81,7 @@ struct termio {
 
 #ifdef __KERNEL__
 
 
 #ifdef __KERNEL__
 

-#include <asm-generic/termios.h>
+#include <asm-generic/termios-base.h>

 
 #endif /* __KERNEL__ */
 
 
 #endif /* __KERNEL__ */
 

diff --git a/arch/mips/include/asm/signal.h b/arch/mips/include/asm/signal.h
index bee5153aca483b44e03ece34a54a7a51d6795141..c783f364938ccd82ec1c99bc28bac0dfcbce54ef 100644 (file)
--- 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 */
 #define SIG_UNBLOCK    2       /* for unblocking signals */
 #define SIG_SETMASK    3       /* for setting the signal mask */
 
 #define SIG_UNBLOCK    2       /* for unblocking signals */
 #define SIG_SETMASK    3       /* for setting the signal mask */
 

-#include <asm-generic/signal.h>
+#include <asm-generic/signal-defs.h>

 
 struct sigaction {
        unsigned int    sa_flags;
 
 struct sigaction {
        unsigned int    sa_flags;

diff --git a/arch/mn10300/include/asm/mman.h b/arch/mn10300/include/asm/mman.h
index b7986b65addf81da83bebc77446966373bd155eb..d04fac1da5aa80513f350afc18dd603fc0c0b4dd 100644 (file)
--- a/arch/mn10300/include/asm/mman.h
+++ b/arch/mn10300/include/asm/mman.h
@@ -12,7 +12,7 @@
 #ifndef _ASM_MMAN_H
 #define _ASM_MMAN_H
 
 #ifndef _ASM_MMAN_H
 #define _ASM_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 */
 
 #define MAP_GROWSDOWN  0x0100          /* stack-like segment */
 #define MAP_DENYWRITE  0x0800          /* ETXTBSY */

diff --git a/arch/mn10300/include/asm/signal.h b/arch/mn10300/include/asm/signal.h
index e98817cec5f7833873ffc24f23515f227da5a594..7e891fce2370028acea4a56497aafa74c443c0be 100644 (file)
--- a/arch/mn10300/include/asm/signal.h
+++ b/arch/mn10300/include/asm/signal.h
@@ -115,7 +115,7 @@ typedef unsigned long sigset_t;
 #define MINSIGSTKSZ    2048
 #define SIGSTKSZ       8192
 
 #define MINSIGSTKSZ    2048
 #define SIGSTKSZ       8192
 

-#include <asm-generic/signal.h>
+#include <asm-generic/signal-defs.h>

 
 #ifdef __KERNEL__
 struct old_sigaction {
 
 #ifdef __KERNEL__
 struct old_sigaction {

diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
index e7b99bac9f4875312655e1f3b44799b6734f6a16..7b1c49811a2439cb195aa3d311da2e2493b612f9 100644 (file)
--- a/arch/powerpc/include/asm/mman.h
+++ b/arch/powerpc/include/asm/mman.h
@@ -1,7 +1,7 @@
 #ifndef _ASM_POWERPC_MMAN_H
 #define _ASM_POWERPC_MMAN_H
 
 #ifndef _ASM_POWERPC_MMAN_H
 #define _ASM_POWERPC_MMAN_H
 

-#include <asm-generic/mman.h>
+#include <asm-generic/mman-common.h>

 
 /*
  * This program is free software; you can redistribute it and/or
 
 /*
  * 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 69f709d8e8e750f781c3b7f2a507dd4043ef49d5..3eb13be11d8f6eff81fa251b8ab1c589ed35edce 100644 (file)
--- a/arch/powerpc/include/asm/signal.h
+++ b/arch/powerpc/include/asm/signal.h
@@ -94,7 +94,7 @@ typedef struct {
 #define MINSIGSTKSZ    2048
 #define SIGSTKSZ       8192
 
 #define MINSIGSTKSZ    2048
 #define SIGSTKSZ       8192
 

-#include <asm-generic/signal.h>
+#include <asm-generic/signal-defs.h>

 
 struct old_sigaction {
        __sighandler_t sa_handler;
 
 struct old_sigaction {
        __sighandler_t sa_handler;

diff --git a/arch/powerpc/include/asm/termios.h b/arch/powerpc/include/asm/termios.h
index 2c14fea07c8aa92ae9bc320553103dac8d255e67..a24f48704a3405ca468473aafacd961765d5d48d 100644 (file)
--- a/arch/powerpc/include/asm/termios.h
+++ b/arch/powerpc/include/asm/termios.h
@@ -78,7 +78,7 @@ struct termio {
 
 #ifdef __KERNEL__
 
 
 #ifdef __KERNEL__
 

-#include <asm-generic/termios.h>
+#include <asm-generic/termios-base.h>

 
 #endif /* __KERNEL__ */
 
 
 #endif /* __KERNEL__ */
 

diff --git a/arch/s390/include/asm/mman.h b/arch/s390/include/asm/mman.h
index da01432e8f447b057e0989980dbdfd4efb15cd04..f63fe7b431ed4ee8a967305cb129b6b0ad8b0314 100644 (file)
--- 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__
 
 #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 */
 
 #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 f6cfddb278cb95bafc4189a50216915530a74360..cdf5cb2fe03f5aa0c2c45765a54536b78d88dde5 100644 (file)
--- 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
 
 #define MINSIGSTKSZ     2048
 #define SIGSTKSZ        8192
 

-#include <asm-generic/signal.h>
+#include <asm-generic/signal-defs.h>

 
 #ifdef __KERNEL__
 struct old_sigaction {
 
 #ifdef __KERNEL__
 struct old_sigaction {

diff --git a/arch/s390/include/asm/termios.h b/arch/s390/include/asm/termios.h
index 67f66278f533f8706d5467560530a164c63121cf..bc3a35cefc9629e4ebae31ee601d6a2432b14c5c 100644 (file)
--- 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))
 
 #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__ */
 
 
 #endif /* __KERNEL__ */
 

diff --git a/arch/sh/include/asm/mman.h b/arch/sh/include/asm/mman.h
index 156eb0225cf64d0a49cd4e7ec14e1602467cabb7..7d8b72c91a5f45d25db9dca3d5d88c6cd5454836 100644 (file)
--- a/arch/sh/include/asm/mman.h
+++ b/arch/sh/include/asm/mman.h
@@ -1,7 +1,7 @@
 #ifndef __ASM_SH_MMAN_H
 #define __ASM_SH_MMAN_H
 
 #ifndef __ASM_SH_MMAN_H
 #define __ASM_SH_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 */
 
 #define MAP_GROWSDOWN  0x0100          /* stack-like segment */
 #define MAP_DENYWRITE  0x0800          /* ETXTBSY */

diff --git a/arch/sh/include/asm/signal.h b/arch/sh/include/asm/signal.h
index 5c5c1e852089f2b4e81f8f07f96a660dbb81afe6..9cc5f014468905a3bef54d80a399391aa2e98c8f 100644 (file)
--- a/arch/sh/include/asm/signal.h
+++ b/arch/sh/include/asm/signal.h
@@ -106,7 +106,7 @@ typedef unsigned long sigset_t;
 #define MINSIGSTKSZ    2048
 #define SIGSTKSZ       8192
 
 #define MINSIGSTKSZ    2048
 #define SIGSTKSZ       8192
 

-#include <asm-generic/signal.h>
+#include <asm-generic/signal-defs.h>

 
 #ifdef __KERNEL__
 struct old_sigaction {
 
 #ifdef __KERNEL__
 struct old_sigaction {

diff --git a/arch/sparc/include/asm/mman.h b/arch/sparc/include/asm/mman.h
index fdfbbf0a4736ef454287ce2d6c6a9b2da6801fc5..988192e8e95657d366e558a97954dda6cfba027f 100644 (file)
--- a/arch/sparc/include/asm/mman.h
+++ b/arch/sparc/include/asm/mman.h
@@ -1,7 +1,7 @@
 #ifndef __SPARC_MMAN_H__
 #define __SPARC_MMAN_H__
 
 #ifndef __SPARC_MMAN_H__
 #define __SPARC_MMAN_H__
 

-#include <asm-generic/mman.h>
+#include <asm-generic/mman-common.h>

 
 /* SunOS'ified... */
 
 
 /* SunOS'ified... */
 

diff --git a/arch/sparc/include/asm/signal.h b/arch/sparc/include/asm/signal.h
index cba45206b7f2e6eb975da848a4bbcbe4f190eb4e..e49b828a2471d57cca8e5aa723acc3a011a9d390 100644 (file)
--- a/arch/sparc/include/asm/signal.h
+++ b/arch/sparc/include/asm/signal.h
@@ -176,7 +176,7 @@ struct sigstack {
 #define SA_STATIC_ALLOC         0x8000
 #endif
 
 #define SA_STATIC_ALLOC         0x8000
 #endif
 

-#include <asm-generic/signal.h>
+#include <asm-generic/signal-defs.h>

 
 struct __new_sigaction {
        __sighandler_t          sa_handler;
 
 struct __new_sigaction {
        __sighandler_t          sa_handler;

diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
index 90bc4108a4fdf917fc243502bd7fcf833f482a55..751af2550ed95befecc593c80343f20035f14bb4 100644 (file)
--- a/arch/x86/include/asm/mman.h
+++ b/arch/x86/include/asm/mman.h
@@ -1,7 +1,7 @@
 #ifndef _ASM_X86_MMAN_H
 #define _ASM_X86_MMAN_H
 
 #ifndef _ASM_X86_MMAN_H
 #define _ASM_X86_MMAN_H
 

-#include <asm-generic/mman.h>
+#include <asm-generic/mman-common.h>

 
 #define MAP_32BIT      0x40            /* only give out 32bit addresses */
 
 
 #define MAP_32BIT      0x40            /* only give out 32bit addresses */
 

diff --git a/arch/x86/include/asm/signal.h b/arch/x86/include/asm/signal.h
index 7761a5d554bb2eb567024375b5bb3c083991946f..598457cbd0f80c47e4cf7759e8d3b6c5de048f06 100644 (file)
--- a/arch/x86/include/asm/signal.h
+++ b/arch/x86/include/asm/signal.h
@@ -117,7 +117,7 @@ typedef unsigned long sigset_t;
 #define MINSIGSTKSZ    2048
 #define SIGSTKSZ       8192
 
 #define MINSIGSTKSZ    2048
 #define SIGSTKSZ       8192
 

-#include <asm-generic/signal.h>
+#include <asm-generic/signal-defs.h>

 
 #ifndef __ASSEMBLY__
 
 
 #ifndef __ASSEMBLY__
 

diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild
index 4c9932a2503f9d465caa909f5475b9ba5e6cc194..460b08d51e2e05eeda6b33372a861556bc08f39e 100644 (file)
--- a/include/asm-generic/Kbuild
+++ b/include/asm-generic/Kbuild
@@ -2,9 +2,9 @@ header-y += errno-base.h
 header-y += errno.h
 header-y += fcntl.h
 header-y += ioctl.h
 header-y += errno.h
 header-y += fcntl.h
 header-y += ioctl.h

-header-y += mman.h
+header-y += mman-common.h

 header-y += poll.h
 header-y += poll.h

-header-y += signal.h
+header-y += signal-defs.h

 header-y += statfs.h
 
 unifdef-y += int-l64.h
 header-y += statfs.h
 
 unifdef-y += int-l64.h

diff --git a/include/asm-generic/mman.h b/include/asm-generic/mman-common.h
similarity index 93%
rename from include/asm-generic/mman.h
rename to include/asm-generic/mman-common.h
index 5e3dde2ee5adf37f5ccd62fa11f9b3878bc5a653..3b69ad34189a9d87e267e131daeb23557b7bfc7a 100644 (file)
--- a/include/asm-generic/mman.h
+++ b/include/asm-generic/mman-common.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_GENERIC_MMAN_H
-#define _ASM_GENERIC_MMAN_H
+#ifndef __ASM_GENERIC_MMAN_COMMON_H
+#define __ASM_GENERIC_MMAN_COMMON_H

 
 /*
  Author: Michael S. Tsirkin <mst@mellanox.co.il>, Mellanox Technologies Ltd.
 
 /*
  Author: Michael S. Tsirkin <mst@mellanox.co.il>, Mellanox Technologies Ltd.


@@ -38,4 +38,4 @@
 /* compatibility flags */
 #define MAP_FILE       0
 
 /* compatibility flags */
 #define MAP_FILE       0
 

-#endif
+#endif /* __ASM_GENERIC_MMAN_COMMON_H */

diff --git a/include/asm-generic/signal.h b/include/asm-generic/signal-defs.h
similarity index 85%
rename from include/asm-generic/signal.h
rename to include/asm-generic/signal-defs.h
index dae1d8720076fde1aad89772b6390f22b1db3345..00f95df5429700a2780062811b712d0e971694d8 100644 (file)
--- a/include/asm-generic/signal.h
+++ b/include/asm-generic/signal-defs.h
@@ -1,5 +1,5 @@
-#ifndef __ASM_GENERIC_SIGNAL_H
-#define __ASM_GENERIC_SIGNAL_H
+#ifndef __ASM_GENERIC_SIGNAL_DEFS_H
+#define __ASM_GENERIC_SIGNAL_DEFS_H

 
 #include <linux/compiler.h>
 
 
 #include <linux/compiler.h>
 


@@ -25,4 +25,4 @@ typedef __restorefn_t __user *__sigrestore_t;
 #define SIG_ERR        ((__force __sighandler_t)-1)    /* error return from signal */
 #endif
 
 #define SIG_ERR        ((__force __sighandler_t)-1)    /* error return from signal */
 #endif
 

-#endif /* __ASM_GENERIC_SIGNAL_H */
+#endif /* __ASM_GENERIC_SIGNAL_DEFS_H */

diff --git a/include/asm-generic/termios.h b/include/asm-generic/termios-base.h
similarity index 94%
rename from include/asm-generic/termios.h
rename to include/asm-generic/termios-base.h
index 7d39ecc92d9430380ccd00d4be4021932b1db8c3..0a769feb22b07fb1bd3d4b9475c69144dc8d7d98 100644 (file)
--- a/include/asm-generic/termios.h
+++ b/include/asm-generic/termios-base.h
@@ -1,8 +1,8 @@
 /* termios.h: generic termios/termio user copying/translation
  */
 
 /* termios.h: generic termios/termio user copying/translation
  */
 

-#ifndef _ASM_GENERIC_TERMIOS_H
-#define _ASM_GENERIC_TERMIOS_H
+#ifndef _ASM_GENERIC_TERMIOS_BASE_H
+#define _ASM_GENERIC_TERMIOS_BASE_H

 
 #include <asm/uaccess.h>
 
 
 #include <asm/uaccess.h>
 


@@ -74,4 +74,4 @@ static inline int kernel_termios_to_user_termio(struct termio __user *termio,
 
 #endif /* __ARCH_TERMIO_GETPUT */
 
 
 #endif /* __ARCH_TERMIO_GETPUT */
 

-#endif /* _ASM_GENERIC_TERMIOS_H */
+#endif /* _ASM_GENERIC_TERMIOS_BASE_H */