From: Chen Gang <gang.chen@asianux.com>
To: "dhowells@redhat.com" <dhowells@redhat.com>,
Richard Henderson <rth@twiddle.net>,
Ivan Kokshaysky <ink@jurassic.park.msu.ru>,
Matt Turner <mattst88@gmail.com>,
Paul McKenney <paulmck@linux.vnet.ibm.com>,
mcree@orcon.net.nz, Dave Jones <davej@redhat.com>,
sandeen@redhat.com, Al Viro <viro@zeniv.linux.org.uk>,
ak@linux.intel.com
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
alpha <linux-alpha@vger.kernel.org>
Subject: [PATCH v2] arch: alpha: uapi: be sure of "_UAPI" prefix for all guard macros
Date: Thu, 14 Nov 2013 11:09:28 +0800 [thread overview]
Message-ID: <52843EE8.4050702@asianux.com> (raw)
In-Reply-To: <52843DE7.8020705@asianux.com>
For all uapi headers, need use "_UAPI" prefix for its guard macro
(which will be stripped by "scripts/headers_installer.sh").
Also delete the redundant files (ipcbuf.h, kvm_para.h, and poll.h), and
add related 'generic-y' in Kbuild.
Also make sure only one empty line below "#define" and only one empty
line above "#endif".
Signed-off-by: Chen Gang <gang.chen@asianux.com>
---
arch/alpha/include/uapi/asm/Kbuild | 7 ++++---
arch/alpha/include/uapi/asm/auxvec.h | 6 +++---
arch/alpha/include/uapi/asm/bitsperlong.h | 6 +++---
arch/alpha/include/uapi/asm/byteorder.h | 6 +++---
arch/alpha/include/uapi/asm/compiler.h | 1 -
arch/alpha/include/uapi/asm/console.h | 1 -
arch/alpha/include/uapi/asm/errno.h | 6 +++---
arch/alpha/include/uapi/asm/fcntl.h | 6 +++---
arch/alpha/include/uapi/asm/fpu.h | 2 --
arch/alpha/include/uapi/asm/gentrap.h | 6 +++---
arch/alpha/include/uapi/asm/ioctl.h | 6 +++---
arch/alpha/include/uapi/asm/ioctls.h | 6 +++---
arch/alpha/include/uapi/asm/ipcbuf.h | 1 -
arch/alpha/include/uapi/asm/kvm_para.h | 1 -
arch/alpha/include/uapi/asm/mman.h | 6 +++---
arch/alpha/include/uapi/asm/msgbuf.h | 6 +++---
arch/alpha/include/uapi/asm/pal.h | 1 -
arch/alpha/include/uapi/asm/poll.h | 1 -
arch/alpha/include/uapi/asm/posix_types.h | 6 +++---
arch/alpha/include/uapi/asm/ptrace.h | 2 --
arch/alpha/include/uapi/asm/reg.h | 6 +++---
arch/alpha/include/uapi/asm/regdef.h | 6 +++---
arch/alpha/include/uapi/asm/resource.h | 6 +++---
arch/alpha/include/uapi/asm/sembuf.h | 6 +++---
arch/alpha/include/uapi/asm/setup.h | 6 +++---
arch/alpha/include/uapi/asm/shmbuf.h | 6 +++---
arch/alpha/include/uapi/asm/sigcontext.h | 7 +++----
arch/alpha/include/uapi/asm/siginfo.h | 6 +++---
arch/alpha/include/uapi/asm/signal.h | 1 -
arch/alpha/include/uapi/asm/sockios.h | 6 +++---
arch/alpha/include/uapi/asm/stat.h | 6 +++---
arch/alpha/include/uapi/asm/statfs.h | 6 +++---
arch/alpha/include/uapi/asm/swab.h | 6 +++---
arch/alpha/include/uapi/asm/sysinfo.h | 6 +++---
arch/alpha/include/uapi/asm/termbits.h | 6 +++---
arch/alpha/include/uapi/asm/termios.h | 1 -
36 files changed, 79 insertions(+), 91 deletions(-)
delete mode 100644 arch/alpha/include/uapi/asm/ipcbuf.h
delete mode 100644 arch/alpha/include/uapi/asm/kvm_para.h
delete mode 100644 arch/alpha/include/uapi/asm/poll.h
diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild
index d96f2ef..2ceb39b 100644
--- a/arch/alpha/include/uapi/asm/Kbuild
+++ b/arch/alpha/include/uapi/asm/Kbuild
@@ -1,6 +1,10 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
+generic-y += ipcbuf.h
+generic-y += kvm_para.h
+generic-y += poll.h
+
header-y += a.out.h
header-y += auxvec.h
header-y += bitsperlong.h
@@ -13,13 +17,10 @@ header-y += fpu.h
header-y += gentrap.h
header-y += ioctl.h
header-y += ioctls.h
-header-y += ipcbuf.h
-header-y += kvm_para.h
header-y += mman.h
header-y += msgbuf.h
header-y += pal.h
header-y += param.h
-header-y += poll.h
header-y += posix_types.h
header-y += ptrace.h
header-y += reg.h
diff --git a/arch/alpha/include/uapi/asm/auxvec.h b/arch/alpha/include/uapi/asm/auxvec.h
index a3a579d..d297271 100644
--- a/arch/alpha/include/uapi/asm/auxvec.h
+++ b/arch/alpha/include/uapi/asm/auxvec.h
@@ -1,5 +1,5 @@
-#ifndef __ASM_ALPHA_AUXVEC_H
-#define __ASM_ALPHA_AUXVEC_H
+#ifndef _UAPI__ASM_ALPHA_AUXVEC_H
+#define _UAPI__ASM_ALPHA_AUXVEC_H
/* Reserve these numbers for any future use of a VDSO. */
#if 0
@@ -23,4 +23,4 @@
#define AT_VECTOR_SIZE_ARCH 4 /* entries in ARCH_DLINFO */
-#endif /* __ASM_ALPHA_AUXVEC_H */
+#endif /* _UAPI__ASM_ALPHA_AUXVEC_H */
diff --git a/arch/alpha/include/uapi/asm/bitsperlong.h b/arch/alpha/include/uapi/asm/bitsperlong.h
index ad57f78..c3d1159 100644
--- a/arch/alpha/include/uapi/asm/bitsperlong.h
+++ b/arch/alpha/include/uapi/asm/bitsperlong.h
@@ -1,8 +1,8 @@
-#ifndef __ASM_ALPHA_BITSPERLONG_H
-#define __ASM_ALPHA_BITSPERLONG_H
+#ifndef _UAPI__ASM_ALPHA_BITSPERLONG_H
+#define _UAPI__ASM_ALPHA_BITSPERLONG_H
#define __BITS_PER_LONG 64
#include <asm-generic/bitsperlong.h>
-#endif /* __ASM_ALPHA_BITSPERLONG_H */
+#endif /* _UAPI__ASM_ALPHA_BITSPERLONG_H */
diff --git a/arch/alpha/include/uapi/asm/byteorder.h b/arch/alpha/include/uapi/asm/byteorder.h
index 7368309..331ca69 100644
--- a/arch/alpha/include/uapi/asm/byteorder.h
+++ b/arch/alpha/include/uapi/asm/byteorder.h
@@ -1,6 +1,6 @@
-#ifndef _ALPHA_BYTEORDER_H
-#define _ALPHA_BYTEORDER_H
+#ifndef _UAPI_ALPHA_BYTEORDER_H
+#define _UAPI_ALPHA_BYTEORDER_H
#include <linux/byteorder/little_endian.h>
-#endif /* _ALPHA_BYTEORDER_H */
+#endif /* _UAPI_ALPHA_BYTEORDER_H */
diff --git a/arch/alpha/include/uapi/asm/compiler.h b/arch/alpha/include/uapi/asm/compiler.h
index 32cc783..94a40cc 100644
--- a/arch/alpha/include/uapi/asm/compiler.h
+++ b/arch/alpha/include/uapi/asm/compiler.h
@@ -113,5 +113,4 @@
stw %1,%0" : "=m"(mem) : "r"(val))
#endif
-
#endif /* _UAPI__ALPHA_COMPILER_H */
diff --git a/arch/alpha/include/uapi/asm/console.h b/arch/alpha/include/uapi/asm/console.h
index fd08a19..335feb3 100644
--- a/arch/alpha/include/uapi/asm/console.h
+++ b/arch/alpha/include/uapi/asm/console.h
@@ -46,5 +46,4 @@
#define ENV_LANGUAGE 0x0E
#define ENV_TTY_DEV 0x0F
-
#endif /* _UAPI__AXP_CONSOLE_H */
diff --git a/arch/alpha/include/uapi/asm/errno.h b/arch/alpha/include/uapi/asm/errno.h
index 17f92aa..656023c 100644
--- a/arch/alpha/include/uapi/asm/errno.h
+++ b/arch/alpha/include/uapi/asm/errno.h
@@ -1,5 +1,5 @@
-#ifndef _ALPHA_ERRNO_H
-#define _ALPHA_ERRNO_H
+#ifndef _UAPI_ALPHA_ERRNO_H
+#define _UAPI_ALPHA_ERRNO_H
#include <asm-generic/errno-base.h>
@@ -124,4 +124,4 @@
#define EHWPOISON 139 /* Memory page has hardware error */
-#endif
+#endif /* _UAPI_ALPHA_ERRNO_H */
diff --git a/arch/alpha/include/uapi/asm/fcntl.h b/arch/alpha/include/uapi/asm/fcntl.h
index 09f49a6..46bd65a 100644
--- a/arch/alpha/include/uapi/asm/fcntl.h
+++ b/arch/alpha/include/uapi/asm/fcntl.h
@@ -1,5 +1,5 @@
-#ifndef _ALPHA_FCNTL_H
-#define _ALPHA_FCNTL_H
+#ifndef _UAPI_ALPHA_FCNTL_H
+#define _UAPI_ALPHA_FCNTL_H
#define O_CREAT 01000 /* not fcntl */
#define O_TRUNC 02000 /* not fcntl */
@@ -54,4 +54,4 @@
#include <asm-generic/fcntl.h>
-#endif
+#endif /* _UAPI_ALPHA_FCNTL_H */
diff --git a/arch/alpha/include/uapi/asm/fpu.h b/arch/alpha/include/uapi/asm/fpu.h
index 21a053ca..da2db37 100644
--- a/arch/alpha/include/uapi/asm/fpu.h
+++ b/arch/alpha/include/uapi/asm/fpu.h
@@ -1,7 +1,6 @@
#ifndef _UAPI__ASM_ALPHA_FPU_H
#define _UAPI__ASM_ALPHA_FPU_H
-
/*
* Alpha floating-point control register defines:
*/
@@ -119,5 +118,4 @@ ieee_fpcr_to_swcr(unsigned long fp)
return sw;
}
-
#endif /* _UAPI__ASM_ALPHA_FPU_H */
diff --git a/arch/alpha/include/uapi/asm/gentrap.h b/arch/alpha/include/uapi/asm/gentrap.h
index ae50cc3..8c40e37 100644
--- a/arch/alpha/include/uapi/asm/gentrap.h
+++ b/arch/alpha/include/uapi/asm/gentrap.h
@@ -1,5 +1,5 @@
-#ifndef _ASMAXP_GENTRAP_H
-#define _ASMAXP_GENTRAP_H
+#ifndef _UAPI_ASMAXP_GENTRAP_H
+#define _UAPI_ASMAXP_GENTRAP_H
/*
* Definitions for gentrap causes. They are generated by user-level
@@ -34,4 +34,4 @@
/* the remaining codes (-26..-1023) are reserved. */
-#endif /* _ASMAXP_GENTRAP_H */
+#endif /* _UAPI_ASMAXP_GENTRAP_H */
diff --git a/arch/alpha/include/uapi/asm/ioctl.h b/arch/alpha/include/uapi/asm/ioctl.h
index fc63727..e22781f 100644
--- a/arch/alpha/include/uapi/asm/ioctl.h
+++ b/arch/alpha/include/uapi/asm/ioctl.h
@@ -1,5 +1,5 @@
-#ifndef _ALPHA_IOCTL_H
-#define _ALPHA_IOCTL_H
+#ifndef _UAPI_ALPHA_IOCTL_H
+#define _UAPI_ALPHA_IOCTL_H
/*
* The original linux ioctl numbering scheme was just a general
@@ -63,4 +63,4 @@
#define IOCSIZE_MASK (_IOC_SIZEMASK << _IOC_SIZESHIFT)
#define IOCSIZE_SHIFT (_IOC_SIZESHIFT)
-#endif /* _ALPHA_IOCTL_H */
+#endif /* _UAPI_ALPHA_IOCTL_H */
diff --git a/arch/alpha/include/uapi/asm/ioctls.h b/arch/alpha/include/uapi/asm/ioctls.h
index 92c557b..4930bb2 100644
--- a/arch/alpha/include/uapi/asm/ioctls.h
+++ b/arch/alpha/include/uapi/asm/ioctls.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_ALPHA_IOCTLS_H
-#define _ASM_ALPHA_IOCTLS_H
+#ifndef _UAPI_ASM_ALPHA_IOCTLS_H
+#define _UAPI_ASM_ALPHA_IOCTLS_H
#include <asm/ioctl.h>
@@ -114,4 +114,4 @@
#define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */
#define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */
-#endif /* _ASM_ALPHA_IOCTLS_H */
+#endif /* _UAPI_ASM_ALPHA_IOCTLS_H */
diff --git a/arch/alpha/include/uapi/asm/ipcbuf.h b/arch/alpha/include/uapi/asm/ipcbuf.h
deleted file mode 100644
index 84c7e51..0000000
--- a/arch/alpha/include/uapi/asm/ipcbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ipcbuf.h>
diff --git a/arch/alpha/include/uapi/asm/kvm_para.h b/arch/alpha/include/uapi/asm/kvm_para.h
deleted file mode 100644
index 14fab8f..0000000
--- a/arch/alpha/include/uapi/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>
diff --git a/arch/alpha/include/uapi/asm/mman.h b/arch/alpha/include/uapi/asm/mman.h
index 0086b47..141f440 100644
--- a/arch/alpha/include/uapi/asm/mman.h
+++ b/arch/alpha/include/uapi/asm/mman.h
@@ -1,5 +1,5 @@
-#ifndef __ALPHA_MMAN_H__
-#define __ALPHA_MMAN_H__
+#ifndef _UAPI__ALPHA_MMAN_H__
+#define _UAPI__ALPHA_MMAN_H__
#define PROT_READ 0x1 /* page can be read */
#define PROT_WRITE 0x2 /* page can be written */
@@ -74,4 +74,4 @@
#define MAP_HUGE_SHIFT 26
#define MAP_HUGE_MASK 0x3f
-#endif /* __ALPHA_MMAN_H__ */
+#endif /* _UAPI__ALPHA_MMAN_H__ */
diff --git a/arch/alpha/include/uapi/asm/msgbuf.h b/arch/alpha/include/uapi/asm/msgbuf.h
index 9849650..63811d7 100644
--- a/arch/alpha/include/uapi/asm/msgbuf.h
+++ b/arch/alpha/include/uapi/asm/msgbuf.h
@@ -1,5 +1,5 @@
-#ifndef _ALPHA_MSGBUF_H
-#define _ALPHA_MSGBUF_H
+#ifndef _UAPI_ALPHA_MSGBUF_H
+#define _UAPI_ALPHA_MSGBUF_H
/*
* The msqid64_ds structure for alpha architecture.
@@ -24,4 +24,4 @@ struct msqid64_ds {
unsigned long __unused2;
};
-#endif /* _ALPHA_MSGBUF_H */
+#endif /* _UAPI_ALPHA_MSGBUF_H */
diff --git a/arch/alpha/include/uapi/asm/pal.h b/arch/alpha/include/uapi/asm/pal.h
index 3c0ce08..e0c4297 100644
--- a/arch/alpha/include/uapi/asm/pal.h
+++ b/arch/alpha/include/uapi/asm/pal.h
@@ -48,5 +48,4 @@
#define PAL_retsys 61
#define PAL_rti 63
-
#endif /* _UAPI__ALPHA_PAL_H */
diff --git a/arch/alpha/include/uapi/asm/poll.h b/arch/alpha/include/uapi/asm/poll.h
deleted file mode 100644
index c98509d..0000000
--- a/arch/alpha/include/uapi/asm/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/poll.h>
diff --git a/arch/alpha/include/uapi/asm/posix_types.h b/arch/alpha/include/uapi/asm/posix_types.h
index 5a8a483..d3d21e8 100644
--- a/arch/alpha/include/uapi/asm/posix_types.h
+++ b/arch/alpha/include/uapi/asm/posix_types.h
@@ -1,5 +1,5 @@
-#ifndef _ALPHA_POSIX_TYPES_H
-#define _ALPHA_POSIX_TYPES_H
+#ifndef _UAPI_ALPHA_POSIX_TYPES_H
+#define _UAPI_ALPHA_POSIX_TYPES_H
/*
* This file is generally used by user-level software, so you need to
@@ -14,4 +14,4 @@ typedef unsigned long __kernel_sigset_t; /* at least 32 bits */
#include <asm-generic/posix_types.h>
-#endif /* _ALPHA_POSIX_TYPES_H */
+#endif /* _UAPI_ALPHA_POSIX_TYPES_H */
diff --git a/arch/alpha/include/uapi/asm/ptrace.h b/arch/alpha/include/uapi/asm/ptrace.h
index 5ce83fa..6e68c6e 100644
--- a/arch/alpha/include/uapi/asm/ptrace.h
+++ b/arch/alpha/include/uapi/asm/ptrace.h
@@ -1,7 +1,6 @@
#ifndef _UAPI_ASMAXP_PTRACE_H
#define _UAPI_ASMAXP_PTRACE_H
-
/*
* This struct defines the way the registers are stored on the
* kernel stack during a system call or other kernel entry
@@ -66,5 +65,4 @@ struct switch_stack {
unsigned long fp[32]; /* fp[31] is fpcr */
};
-
#endif /* _UAPI_ASMAXP_PTRACE_H */
diff --git a/arch/alpha/include/uapi/asm/reg.h b/arch/alpha/include/uapi/asm/reg.h
index 86ff916..9fd7433 100644
--- a/arch/alpha/include/uapi/asm/reg.h
+++ b/arch/alpha/include/uapi/asm/reg.h
@@ -1,5 +1,5 @@
-#ifndef __reg_h__
-#define __reg_h__
+#ifndef _UAPI__reg_h__
+#define _UAPI__reg_h__
/*
* Exception frame offsets.
@@ -49,4 +49,4 @@
#define CORE_REG(reg, ubase) \
(((unsigned long *)((unsigned long)(ubase)))[reg])
-#endif /* __reg_h__ */
+#endif /* _UAPI__reg_h__ */
diff --git a/arch/alpha/include/uapi/asm/regdef.h b/arch/alpha/include/uapi/asm/regdef.h
index 142df9c..268cb3e 100644
--- a/arch/alpha/include/uapi/asm/regdef.h
+++ b/arch/alpha/include/uapi/asm/regdef.h
@@ -1,5 +1,5 @@
-#ifndef __alpha_regdef_h__
-#define __alpha_regdef_h__
+#ifndef _UAPI__alpha_regdef_h__
+#define _UAPI__alpha_regdef_h__
#define v0 $0 /* function return value */
@@ -41,4 +41,4 @@
#define sp $30 /* stack pointer */
#define zero $31 /* reads as zero, writes are noops */
-#endif /* __alpha_regdef_h__ */
+#endif /* _UAPI__alpha_regdef_h__ */
diff --git a/arch/alpha/include/uapi/asm/resource.h b/arch/alpha/include/uapi/asm/resource.h
index c10874f..5f7c549 100644
--- a/arch/alpha/include/uapi/asm/resource.h
+++ b/arch/alpha/include/uapi/asm/resource.h
@@ -1,5 +1,5 @@
-#ifndef _ALPHA_RESOURCE_H
-#define _ALPHA_RESOURCE_H
+#ifndef _UAPI_ALPHA_RESOURCE_H
+#define _UAPI_ALPHA_RESOURCE_H
/*
* Alpha/Linux-specific ordering of these four resource limit IDs,
@@ -19,4 +19,4 @@
#include <asm-generic/resource.h>
-#endif /* _ALPHA_RESOURCE_H */
+#endif /* _UAPI_ALPHA_RESOURCE_H */
diff --git a/arch/alpha/include/uapi/asm/sembuf.h b/arch/alpha/include/uapi/asm/sembuf.h
index 7b38b15..e227b21 100644
--- a/arch/alpha/include/uapi/asm/sembuf.h
+++ b/arch/alpha/include/uapi/asm/sembuf.h
@@ -1,5 +1,5 @@
-#ifndef _ALPHA_SEMBUF_H
-#define _ALPHA_SEMBUF_H
+#ifndef _UAPI_ALPHA_SEMBUF_H
+#define _UAPI_ALPHA_SEMBUF_H
/*
* The semid64_ds structure for alpha architecture.
@@ -19,4 +19,4 @@ struct semid64_ds {
unsigned long __unused2;
};
-#endif /* _ALPHA_SEMBUF_H */
+#endif /* _UAPI_ALPHA_SEMBUF_H */
diff --git a/arch/alpha/include/uapi/asm/setup.h b/arch/alpha/include/uapi/asm/setup.h
index b50014b..8f26aa4 100644
--- a/arch/alpha/include/uapi/asm/setup.h
+++ b/arch/alpha/include/uapi/asm/setup.h
@@ -1,5 +1,5 @@
-#ifndef __ALPHA_SETUP_H
-#define __ALPHA_SETUP_H
+#ifndef _UAPI__ALPHA_SETUP_H
+#define _UAPI__ALPHA_SETUP_H
#define COMMAND_LINE_SIZE 256
@@ -39,4 +39,4 @@
#define INITRD_START (*(unsigned long *) (PARAM+0x100))
#define INITRD_SIZE (*(unsigned long *) (PARAM+0x108))
-#endif
+#endif /* _UAPI__ALPHA_SETUP_H */
diff --git a/arch/alpha/include/uapi/asm/shmbuf.h b/arch/alpha/include/uapi/asm/shmbuf.h
index 37ee84f..d752749 100644
--- a/arch/alpha/include/uapi/asm/shmbuf.h
+++ b/arch/alpha/include/uapi/asm/shmbuf.h
@@ -1,5 +1,5 @@
-#ifndef _ALPHA_SHMBUF_H
-#define _ALPHA_SHMBUF_H
+#ifndef _UAPI_ALPHA_SHMBUF_H
+#define _UAPI_ALPHA_SHMBUF_H
/*
* The shmid64_ds structure for alpha architecture.
@@ -35,4 +35,4 @@ struct shminfo64 {
unsigned long __unused4;
};
-#endif /* _ALPHA_SHMBUF_H */
+#endif /* _UAPI_ALPHA_SHMBUF_H */
diff --git a/arch/alpha/include/uapi/asm/sigcontext.h b/arch/alpha/include/uapi/asm/sigcontext.h
index 323cdb0..3577f6d 100644
--- a/arch/alpha/include/uapi/asm/sigcontext.h
+++ b/arch/alpha/include/uapi/asm/sigcontext.h
@@ -1,5 +1,5 @@
-#ifndef _ASMAXP_SIGCONTEXT_H
-#define _ASMAXP_SIGCONTEXT_H
+#ifndef _UAPI_ASMAXP_SIGCONTEXT_H
+#define _UAPI_ASMAXP_SIGCONTEXT_H
struct sigcontext {
/*
@@ -30,5 +30,4 @@ struct sigcontext {
unsigned long sc_fp_trigger_inst;
};
-
-#endif
+#endif /* _UAPI_ASMAXP_SIGCONTEXT_H */
diff --git a/arch/alpha/include/uapi/asm/siginfo.h b/arch/alpha/include/uapi/asm/siginfo.h
index 9822362..d8fb147 100644
--- a/arch/alpha/include/uapi/asm/siginfo.h
+++ b/arch/alpha/include/uapi/asm/siginfo.h
@@ -1,9 +1,9 @@
-#ifndef _ALPHA_SIGINFO_H
-#define _ALPHA_SIGINFO_H
+#ifndef _UAPI_ALPHA_SIGINFO_H
+#define _UAPI_ALPHA_SIGINFO_H
#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))
#define __ARCH_SI_TRAPNO
#include <asm-generic/siginfo.h>
-#endif
+#endif /* _UAPI_ALPHA_SIGINFO_H */
diff --git a/arch/alpha/include/uapi/asm/signal.h b/arch/alpha/include/uapi/asm/signal.h
index dd4ca4bc..9393b27 100644
--- a/arch/alpha/include/uapi/asm/signal.h
+++ b/arch/alpha/include/uapi/asm/signal.h
@@ -125,5 +125,4 @@ struct sigstack {
int ss_onstack;
};
-
#endif /* _UAPI_ASMAXP_SIGNAL_H */
diff --git a/arch/alpha/include/uapi/asm/sockios.h b/arch/alpha/include/uapi/asm/sockios.h
index 7932c7a..6a1adac 100644
--- a/arch/alpha/include/uapi/asm/sockios.h
+++ b/arch/alpha/include/uapi/asm/sockios.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_ALPHA_SOCKIOS_H
-#define _ASM_ALPHA_SOCKIOS_H
+#ifndef _UAPI_ASM_ALPHA_SOCKIOS_H
+#define _UAPI_ASM_ALPHA_SOCKIOS_H
/* Socket-level I/O control calls. */
@@ -13,4 +13,4 @@
#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
#define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */
-#endif /* _ASM_ALPHA_SOCKIOS_H */
+#endif /* _UAPI_ASM_ALPHA_SOCKIOS_H */
diff --git a/arch/alpha/include/uapi/asm/stat.h b/arch/alpha/include/uapi/asm/stat.h
index 07ad3e6..485ebc6 100644
--- a/arch/alpha/include/uapi/asm/stat.h
+++ b/arch/alpha/include/uapi/asm/stat.h
@@ -1,5 +1,5 @@
-#ifndef _ALPHA_STAT_H
-#define _ALPHA_STAT_H
+#ifndef _UAPI_ALPHA_STAT_H
+#define _UAPI_ALPHA_STAT_H
struct stat {
unsigned int st_dev;
@@ -45,4 +45,4 @@ struct stat64 {
long __unused[3];
};
-#endif
+#endif /* _UAPI_ALPHA_STAT_H */
diff --git a/arch/alpha/include/uapi/asm/statfs.h b/arch/alpha/include/uapi/asm/statfs.h
index ccd2e18..4b9ae7b 100644
--- a/arch/alpha/include/uapi/asm/statfs.h
+++ b/arch/alpha/include/uapi/asm/statfs.h
@@ -1,5 +1,5 @@
-#ifndef _ALPHA_STATFS_H
-#define _ALPHA_STATFS_H
+#ifndef _UAPI_ALPHA_STATFS_H
+#define _UAPI_ALPHA_STATFS_H
#include <linux/types.h>
@@ -9,4 +9,4 @@
#include <asm-generic/statfs.h>
-#endif
+#endif /* _UAPI_ALPHA_STATFS_H */
diff --git a/arch/alpha/include/uapi/asm/swab.h b/arch/alpha/include/uapi/asm/swab.h
index 4d682b1..db18d10 100644
--- a/arch/alpha/include/uapi/asm/swab.h
+++ b/arch/alpha/include/uapi/asm/swab.h
@@ -1,5 +1,5 @@
-#ifndef _ALPHA_SWAB_H
-#define _ALPHA_SWAB_H
+#ifndef _UAPI_ALPHA_SWAB_H
+#define _UAPI_ALPHA_SWAB_H
#include <linux/types.h>
#include <linux/compiler.h>
@@ -39,4 +39,4 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
#endif /* __GNUC__ */
-#endif /* _ALPHA_SWAB_H */
+#endif /* _UAPI_ALPHA_SWAB_H */
diff --git a/arch/alpha/include/uapi/asm/sysinfo.h b/arch/alpha/include/uapi/asm/sysinfo.h
index 0b80e79..0466499 100644
--- a/arch/alpha/include/uapi/asm/sysinfo.h
+++ b/arch/alpha/include/uapi/asm/sysinfo.h
@@ -2,8 +2,8 @@
* include/asm-alpha/sysinfo.h
*/
-#ifndef __ASM_ALPHA_SYSINFO_H
-#define __ASM_ALPHA_SYSINFO_H
+#ifndef _UAPI__ASM_ALPHA_SYSINFO_H
+#define _UAPI__ASM_ALPHA_SYSINFO_H
/* This defines the subset of the OSF/1 getsysinfo/setsysinfo calls
that we support. */
@@ -28,4 +28,4 @@
#define UAC_NOFIX 2
#define UAC_SIGBUS 4
-#endif /* __ASM_ALPHA_SYSINFO_H */
+#endif /* _UAPI__ASM_ALPHA_SYSINFO_H */
diff --git a/arch/alpha/include/uapi/asm/termbits.h b/arch/alpha/include/uapi/asm/termbits.h
index 879dd35..c6e92ef 100644
--- a/arch/alpha/include/uapi/asm/termbits.h
+++ b/arch/alpha/include/uapi/asm/termbits.h
@@ -1,5 +1,5 @@
-#ifndef _ALPHA_TERMBITS_H
-#define _ALPHA_TERMBITS_H
+#ifndef _UAPI_ALPHA_TERMBITS_H
+#define _UAPI_ALPHA_TERMBITS_H
#include <linux/posix_types.h>
@@ -198,4 +198,4 @@ struct ktermios {
#define TCSADRAIN 1
#define TCSAFLUSH 2
-#endif /* _ALPHA_TERMBITS_H */
+#endif /* _UAPI_ALPHA_TERMBITS_H */
diff --git a/arch/alpha/include/uapi/asm/termios.h b/arch/alpha/include/uapi/asm/termios.h
index 580ed1e..ce4c9dc 100644
--- a/arch/alpha/include/uapi/asm/termios.h
+++ b/arch/alpha/include/uapi/asm/termios.h
@@ -66,5 +66,4 @@ struct termio {
#define _VEOL2 6
#define _VSWTC 7
-
#endif /* _UAPI_ALPHA_TERMIOS_H */
--
1.7.7.6
prev parent reply other threads:[~2013-11-14 3:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-07 4:03 [PATCH] arch: alpha: uapi: be sure of "_UAPI" prefix for all guard macros Chen Gang
2013-11-14 3:05 ` Chen Gang
2013-11-14 3:09 ` Chen Gang [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52843EE8.4050702@asianux.com \
--to=gang.chen@asianux.com \
--cc=ak@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=davej@redhat.com \
--cc=dhowells@redhat.com \
--cc=ink@jurassic.park.msu.ru \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mattst88@gmail.com \
--cc=mcree@orcon.net.nz \
--cc=paulmck@linux.vnet.ibm.com \
--cc=rth@twiddle.net \
--cc=sandeen@redhat.com \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.