aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-generic
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/Kbuild4
-rw-r--r--include/asm-generic/mman-common.h (renamed from include/asm-generic/mman.h)6
-rw-r--r--include/asm-generic/signal-defs.h (renamed from include/asm-generic/signal.h)6
-rw-r--r--include/asm-generic/termios-base.h (renamed from include/asm-generic/termios.h)6
4 files changed, 11 insertions, 11 deletions
diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild
index 4c9932a2503f..460b08d51e2e 100644
--- a/include/asm-generic/Kbuild
+++ b/include/asm-generic/Kbuild
@@ -2,9 +2,9 @@ header-y += errno-base.h
2header-y += errno.h 2header-y += errno.h
3header-y += fcntl.h 3header-y += fcntl.h
4header-y += ioctl.h 4header-y += ioctl.h
5header-y += mman.h 5header-y += mman-common.h
6header-y += poll.h 6header-y += poll.h
7header-y += signal.h 7header-y += signal-defs.h
8header-y += statfs.h 8header-y += statfs.h
9 9
10unifdef-y += int-l64.h 10unifdef-y += int-l64.h
diff --git a/include/asm-generic/mman.h b/include/asm-generic/mman-common.h
index 5e3dde2ee5ad..3b69ad34189a 100644
--- a/include/asm-generic/mman.h
+++ b/include/asm-generic/mman-common.h
@@ -1,5 +1,5 @@
1#ifndef _ASM_GENERIC_MMAN_H 1#ifndef __ASM_GENERIC_MMAN_COMMON_H
2#define _ASM_GENERIC_MMAN_H 2#define __ASM_GENERIC_MMAN_COMMON_H
3 3
4/* 4/*
5 Author: Michael S. Tsirkin <mst@mellanox.co.il>, Mellanox Technologies Ltd. 5 Author: Michael S. Tsirkin <mst@mellanox.co.il>, Mellanox Technologies Ltd.
@@ -38,4 +38,4 @@
38/* compatibility flags */ 38/* compatibility flags */
39#define MAP_FILE 0 39#define MAP_FILE 0
40 40
41#endif 41#endif /* __ASM_GENERIC_MMAN_COMMON_H */
diff --git a/include/asm-generic/signal.h b/include/asm-generic/signal-defs.h
index dae1d8720076..00f95df54297 100644
--- a/include/asm-generic/signal.h
+++ b/include/asm-generic/signal-defs.h
@@ -1,5 +1,5 @@
1#ifndef __ASM_GENERIC_SIGNAL_H 1#ifndef __ASM_GENERIC_SIGNAL_DEFS_H
2#define __ASM_GENERIC_SIGNAL_H 2#define __ASM_GENERIC_SIGNAL_DEFS_H
3 3
4#include <linux/compiler.h> 4#include <linux/compiler.h>
5 5
@@ -25,4 +25,4 @@ typedef __restorefn_t __user *__sigrestore_t;
25#define SIG_ERR ((__force __sighandler_t)-1) /* error return from signal */ 25#define SIG_ERR ((__force __sighandler_t)-1) /* error return from signal */
26#endif 26#endif
27 27
28#endif /* __ASM_GENERIC_SIGNAL_H */ 28#endif /* __ASM_GENERIC_SIGNAL_DEFS_H */
diff --git a/include/asm-generic/termios.h b/include/asm-generic/termios-base.h
index 7d39ecc92d94..0a769feb22b0 100644
--- a/include/asm-generic/termios.h
+++ b/include/asm-generic/termios-base.h
@@ -1,8 +1,8 @@
1/* termios.h: generic termios/termio user copying/translation 1/* termios.h: generic termios/termio user copying/translation
2 */ 2 */
3 3
4#ifndef _ASM_GENERIC_TERMIOS_H 4#ifndef _ASM_GENERIC_TERMIOS_BASE_H
5#define _ASM_GENERIC_TERMIOS_H 5#define _ASM_GENERIC_TERMIOS_BASE_H
6 6
7#include <asm/uaccess.h> 7#include <asm/uaccess.h>
8 8
@@ -74,4 +74,4 @@ static inline int kernel_termios_to_user_termio(struct termio __user *termio,
74 74
75#endif /* __ARCH_TERMIO_GETPUT */ 75#endif /* __ARCH_TERMIO_GETPUT */
76 76
77#endif /* _ASM_GENERIC_TERMIOS_H */ 77#endif /* _ASM_GENERIC_TERMIOS_BASE_H */