diff options
| author | Richard Dale <richard.dale@codethink.co.uk> | 2015-02-25 10:40:10 +0000 |
|---|---|---|
| committer | Richard Dale <richard.dale@codethink.co.uk> | 2015-02-25 10:40:10 +0000 |
| commit | 6d90449f594534084a7847c0b9f0216b0f9056b1 (patch) | |
| tree | 4410ead1480f15bff8f0bccdaa97c6edcc582d83 | |
| parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff) | |
| download | linux-baserock/v3.12-musl.tar.gz | |
Add kernel headers patched for use with the musl libc library from:baserock/v3.12-musl
https://github.com/sabotage-linux/kernel-headers.git
371 files changed, 1518 insertions, 1749 deletions
diff --git a/arch/arm/include/uapi/asm/hwcap.h b/arch/arm/include/uapi/asm/hwcap.h index 6d34d080372a..edb850960012 100644 --- a/arch/arm/include/uapi/asm/hwcap.h +++ b/arch/arm/include/uapi/asm/hwcap.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__ASMARM_HWCAP_H -#define _UAPI__ASMARM_HWCAP_H +#ifndef __ASMARM_HWCAP_H +#define __ASMARM_HWCAP_H /* * HWCAP flags - for elf_hwcap (in kernel) and AT_HWCAP @@ -27,4 +27,4 @@ #define HWCAP_IDIV (HWCAP_IDIVA | HWCAP_IDIVT) #define HWCAP_LPAE (1 << 20) -#endif /* _UAPI__ASMARM_HWCAP_H */ +#endif /* __ASMARM_HWCAP_H */ diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h index 5af0ed1b825a..950ab550d4d7 100644 --- a/arch/arm/include/uapi/asm/ptrace.h +++ b/arch/arm/include/uapi/asm/ptrace.h @@ -7,8 +7,8 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#ifndef _UAPI__ASM_ARM_PTRACE_H -#define _UAPI__ASM_ARM_PTRACE_H +#ifndef __ASM_ARM_PTRACE_H +#define __ASM_ARM_PTRACE_H #include <asm/hwcap.h> @@ -40,17 +40,8 @@ #define FIQ26_MODE 0x00000001 #define IRQ26_MODE 0x00000002 #define SVC26_MODE 0x00000003 -#if defined(__KERNEL__) && defined(CONFIG_CPU_V7M) -/* - * Use 0 here to get code right that creates a userspace - * or kernel space thread. - */ -#define USR_MODE 0x00000000 -#define SVC_MODE 0x00000000 -#else #define USR_MODE 0x00000010 #define SVC_MODE 0x00000013 -#endif #define FIQ_MODE 0x00000011 #define IRQ_MODE 0x00000012 #define ABT_MODE 0x00000017 @@ -62,12 +53,8 @@ #define V4_PSR_T_BIT 0x00000020 /* >= V4T, but not V7M */ #define V7M_PSR_T_BIT 0x01000000 -#if defined(__KERNEL__) && defined(CONFIG_CPU_V7M) -#define PSR_T_BIT V7M_PSR_T_BIT -#else /* for compatibility */ #define PSR_T_BIT V4_PSR_T_BIT -#endif #define PSR_F_BIT 0x00000040 /* >= V4, but not V7M */ #define PSR_I_BIT 0x00000080 /* >= V4, but not V7M */ @@ -120,11 +107,9 @@ * stack during a system call. Note that sizeof(struct pt_regs) * has to be a multiple of 8. */ -#ifndef __KERNEL__ struct pt_regs { long uregs[18]; }; -#endif /* __KERNEL__ */ #define ARM_cpsr uregs[16] #define ARM_pc uregs[15] @@ -154,4 +139,4 @@ struct pt_regs { #endif /* __ASSEMBLY__ */ -#endif /* _UAPI__ASM_ARM_PTRACE_H */ +#endif /* __ASM_ARM_PTRACE_H */ diff --git a/arch/arm/include/uapi/asm/setup.h b/arch/arm/include/uapi/asm/setup.h index 979ff4016404..734ff39c98dc 100644 --- a/arch/arm/include/uapi/asm/setup.h +++ b/arch/arm/include/uapi/asm/setup.h @@ -11,8 +11,8 @@ * hardware it's running on. See Documentation/arm/Setup * for more info. */ -#ifndef _UAPI__ASMARM_SETUP_H -#define _UAPI__ASMARM_SETUP_H +#ifndef __ASMARM_SETUP_H +#define __ASMARM_SETUP_H #include <linux/types.h> @@ -184,4 +184,4 @@ struct tagtable { for (t = base; t->hdr.size; t = tag_next(t)) -#endif /* _UAPI__ASMARM_SETUP_H */ +#endif /* __ASMARM_SETUP_H */ diff --git a/arch/arm/include/uapi/asm/signal.h b/arch/arm/include/uapi/asm/signal.h index 33073bdcf091..93a5c1854513 100644 --- a/arch/arm/include/uapi/asm/signal.h +++ b/arch/arm/include/uapi/asm/signal.h @@ -1,18 +1,16 @@ -#ifndef _UAPI_ASMARM_SIGNAL_H -#define _UAPI_ASMARM_SIGNAL_H +#ifndef _ASMARM_SIGNAL_H +#define _ASMARM_SIGNAL_H #include <linux/types.h> /* Avoid too many header ordering problems. */ struct siginfo; -#ifndef __KERNEL__ /* Here we must cater to libcs that poke about in kernel headers. */ #define NSIG 32 typedef unsigned long sigset_t; -#endif /* __KERNEL__ */ #define SIGHUP 1 #define SIGINT 2 @@ -92,7 +90,6 @@ typedef unsigned long sigset_t; #include <asm-generic/signal-defs.h> -#ifndef __KERNEL__ /* Here we must cater to libcs that poke about in kernel headers. */ struct sigaction { @@ -108,13 +105,12 @@ struct sigaction { #define sa_handler _u._sa_handler #define sa_sigaction _u._sa_sigaction -#endif /* __KERNEL__ */ typedef struct sigaltstack { - void __user *ss_sp; + void *ss_sp; int ss_flags; size_t ss_size; } stack_t; -#endif /* _UAPI_ASMARM_SIGNAL_H */ +#endif /* _ASMARM_SIGNAL_H */ diff --git a/arch/arm/include/uapi/asm/swab.h b/arch/arm/include/uapi/asm/swab.h index 6fcb32a5c453..5f621bfba8b9 100644 --- a/arch/arm/include/uapi/asm/swab.h +++ b/arch/arm/include/uapi/asm/swab.h @@ -12,10 +12,10 @@ * and word accesses (data or instruction) appear as: * d0...d31 */ -#ifndef _UAPI__ASM_ARM_SWAB_H -#define _UAPI__ASM_ARM_SWAB_H +#ifndef __ASM_ARM_SWAB_H +#define __ASM_ARM_SWAB_H + -#include <linux/compiler.h> #include <linux/types.h> #if !defined(__STRICT_ANSI__) || defined(__KERNEL__) @@ -23,8 +23,7 @@ #endif -#if !defined(__KERNEL__) || __LINUX_ARM_ARCH__ < 6 -static inline __attribute_const__ __u32 __arch_swab32(__u32 x) +static __inline__ __u32 __arch_swab32(__u32 x) { __u32 t; @@ -35,7 +34,7 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x) * right thing and not screw it up to different degrees * depending on the gcc version. */ - asm ("eor\t%0, %1, %1, ror #16" : "=r" (t) : "r" (x)); + __asm__ ("eor\t%0, %1, %1, ror #16" : "=r" (t) : "r" (x)); } else #endif t = x ^ ((x << 16) | (x >> 16)); /* eor r1,r0,r0,ror #16 */ @@ -48,6 +47,5 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x) } #define __arch_swab32 __arch_swab32 -#endif -#endif /* _UAPI__ASM_ARM_SWAB_H */ +#endif /* __ASM_ARM_SWAB_H */ diff --git a/arch/arm/include/uapi/asm/unistd.h b/arch/arm/include/uapi/asm/unistd.h index af33b44990ed..896d5143c87d 100644 --- a/arch/arm/include/uapi/asm/unistd.h +++ b/arch/arm/include/uapi/asm/unistd.h @@ -10,8 +10,8 @@ * Please forward _all_ changes to this file to rmk@arm.linux.org.uk, * no matter what the change is. Thanks! */ -#ifndef _UAPI__ASM_ARM_UNISTD_H -#define _UAPI__ASM_ARM_UNISTD_H +#ifndef __ASM_ARM_UNISTD_H +#define __ASM_ARM_UNISTD_H #define __NR_OABI_SYSCALL_BASE 0x900000 @@ -431,7 +431,6 @@ /* * The following syscalls are obsolete and no longer available for EABI. */ -#if !defined(__KERNEL__) #if defined(__ARM_EABI__) #undef __NR_time #undef __NR_umount @@ -446,6 +445,5 @@ #undef __NR_syscall #undef __NR_ipc #endif -#endif -#endif /* _UAPI__ASM_ARM_UNISTD_H */ +#endif /* __ASM_ARM_UNISTD_H */ diff --git a/arch/arm64/include/uapi/asm/hwcap.h b/arch/arm64/include/uapi/asm/hwcap.h index eea497578b87..f2890d01cc07 100644 --- a/arch/arm64/include/uapi/asm/hwcap.h +++ b/arch/arm64/include/uapi/asm/hwcap.h @@ -13,8 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _UAPI__ASM_HWCAP_H -#define _UAPI__ASM_HWCAP_H +#ifndef __ASM_HWCAP_H +#define __ASM_HWCAP_H /* * HWCAP flags - for elf_hwcap (in kernel) and AT_HWCAP @@ -23,4 +23,4 @@ #define HWCAP_ASIMD (1 << 1) -#endif /* _UAPI__ASM_HWCAP_H */ +#endif /* __ASM_HWCAP_H */ diff --git a/arch/arm64/include/uapi/asm/ptrace.h b/arch/arm64/include/uapi/asm/ptrace.h index 6913643bbe54..d2fcc969e7df 100644 --- a/arch/arm64/include/uapi/asm/ptrace.h +++ b/arch/arm64/include/uapi/asm/ptrace.h @@ -16,8 +16,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _UAPI__ASM_PTRACE_H -#define _UAPI__ASM_PTRACE_H +#ifndef __ASM_PTRACE_H +#define __ASM_PTRACE_H #include <linux/types.h> @@ -89,4 +89,4 @@ struct user_hwdebug_state { #endif /* __ASSEMBLY__ */ -#endif /* _UAPI__ASM_PTRACE_H */ +#endif /* __ASM_PTRACE_H */ diff --git a/arch/arm64/include/uapi/asm/sigcontext.h b/arch/arm64/include/uapi/asm/sigcontext.h index 690ad51cc901..fd5b447ed4b6 100644 --- a/arch/arm64/include/uapi/asm/sigcontext.h +++ b/arch/arm64/include/uapi/asm/sigcontext.h @@ -13,8 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _UAPI__ASM_SIGCONTEXT_H -#define _UAPI__ASM_SIGCONTEXT_H +#ifndef __ASM_SIGCONTEXT_H +#define __ASM_SIGCONTEXT_H #include <linux/types.h> @@ -54,4 +54,4 @@ struct fpsimd_context { }; -#endif /* _UAPI__ASM_SIGCONTEXT_H */ +#endif /* __ASM_SIGCONTEXT_H */ diff --git a/arch/microblaze/include/uapi/asm/elf.h b/arch/microblaze/include/uapi/asm/elf.h index be1731d5e2fa..f96828f2b70a 100644 --- a/arch/microblaze/include/uapi/asm/elf.h +++ b/arch/microblaze/include/uapi/asm/elf.h @@ -8,8 +8,8 @@ * for more details. */ -#ifndef _UAPI_ASM_MICROBLAZE_ELF_H -#define _UAPI_ASM_MICROBLAZE_ELF_H +#ifndef _ASM_MICROBLAZE_ELF_H +#define _ASM_MICROBLAZE_ELF_H /* * Note there is no "official" ELF designation for Microblaze. @@ -118,4 +118,4 @@ do { \ #endif /* __uClinux__ */ -#endif /* _UAPI_ASM_MICROBLAZE_ELF_H */ +#endif /* _ASM_MICROBLAZE_ELF_H */ diff --git a/arch/microblaze/include/uapi/asm/ptrace.h b/arch/microblaze/include/uapi/asm/ptrace.h index d31238a5f946..5b0be96be9d7 100644 --- a/arch/microblaze/include/uapi/asm/ptrace.h +++ b/arch/microblaze/include/uapi/asm/ptrace.h @@ -6,8 +6,8 @@ * for more details. */ -#ifndef _UAPI_ASM_MICROBLAZE_PTRACE_H -#define _UAPI_ASM_MICROBLAZE_PTRACE_H +#ifndef _ASM_MICROBLAZE_PTRACE_H +#define _ASM_MICROBLAZE_PTRACE_H #ifndef __ASSEMBLY__ @@ -54,7 +54,6 @@ struct pt_regs { int pt_mode; }; -#ifndef __KERNEL__ /* pt_regs offsets used by gdbserver etc in ptrace syscalls */ #define PT_GPR(n) ((n) * sizeof(microblaze_reg_t)) @@ -65,8 +64,7 @@ struct pt_regs { #define PT_FSR (36 * sizeof(microblaze_reg_t)) #define PT_KERNEL_MODE (37 * sizeof(microblaze_reg_t)) -#endif /* __KERNEL */ #endif /* __ASSEMBLY__ */ -#endif /* _UAPI_ASM_MICROBLAZE_PTRACE_H */ +#endif /* _ASM_MICROBLAZE_PTRACE_H */ diff --git a/arch/microblaze/include/uapi/asm/setup.h b/arch/microblaze/include/uapi/asm/setup.h index 76bc2acee6af..6af93cf87815 100644 --- a/arch/microblaze/include/uapi/asm/setup.h +++ b/arch/microblaze/include/uapi/asm/setup.h @@ -8,12 +8,12 @@ * for more details. */ -#ifndef _UAPI_ASM_MICROBLAZE_SETUP_H -#define _UAPI_ASM_MICROBLAZE_SETUP_H +#ifndef _ASM_MICROBLAZE_SETUP_H +#define _ASM_MICROBLAZE_SETUP_H #define COMMAND_LINE_SIZE 256 # ifndef __ASSEMBLY__ # endif /* __ASSEMBLY__ */ -#endif /* _UAPI_ASM_MICROBLAZE_SETUP_H */ +#endif /* _ASM_MICROBLAZE_SETUP_H */ diff --git a/arch/microblaze/include/uapi/asm/unistd.h b/arch/microblaze/include/uapi/asm/unistd.h index 20043b67d158..0fa49724e42f 100644 --- a/arch/microblaze/include/uapi/asm/unistd.h +++ b/arch/microblaze/include/uapi/asm/unistd.h @@ -7,8 +7,8 @@ * for more details. */ -#ifndef _UAPI_ASM_MICROBLAZE_UNISTD_H -#define _UAPI_ASM_MICROBLAZE_UNISTD_H +#ifndef _ASM_MICROBLAZE_UNISTD_H +#define _ASM_MICROBLAZE_UNISTD_H #define __NR_restart_syscall 0 /* ok */ #define __NR_exit 1 /* ok */ @@ -397,4 +397,4 @@ #define __NR_kcmp 379 #define __NR_finit_module 380 -#endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */ +#endif /* _ASM_MICROBLAZE_UNISTD_H */ diff --git a/arch/mips/include/uapi/asm/errno.h b/arch/mips/include/uapi/asm/errno.h index 31575e2fd1bd..8919f87a5418 100644 --- a/arch/mips/include/uapi/asm/errno.h +++ b/arch/mips/include/uapi/asm/errno.h @@ -5,8 +5,8 @@ * * Copyright (C) 1995, 1999, 2001, 2002 by Ralf Baechle */ -#ifndef _UAPI_ASM_ERRNO_H -#define _UAPI_ASM_ERRNO_H +#ifndef _ASM_ERRNO_H +#define _ASM_ERRNO_H /* * These error numbers are intended to be MIPS ABI compatible @@ -126,4 +126,4 @@ #define EDQUOT 1133 /* Quota exceeded */ -#endif /* _UAPI_ASM_ERRNO_H */ +#endif /* _ASM_ERRNO_H */ diff --git a/arch/mips/include/uapi/asm/fcntl.h b/arch/mips/include/uapi/asm/fcntl.h index 6ca432f00860..88755eed9474 100644 --- a/arch/mips/include/uapi/asm/fcntl.h +++ b/arch/mips/include/uapi/asm/fcntl.h @@ -5,8 +5,8 @@ * * Copyright (C) 1995, 96, 97, 98, 99, 2003, 05 Ralf Baechle */ -#ifndef _UAPI_ASM_FCNTL_H -#define _UAPI_ASM_FCNTL_H +#ifndef _ASM_FCNTL_H +#define _ASM_FCNTL_H #include <asm/sgidefs.h> @@ -76,4 +76,4 @@ struct flock { #include <asm-generic/fcntl.h> -#endif /* _UAPI_ASM_FCNTL_H */ +#endif /* _ASM_FCNTL_H */ diff --git a/arch/mips/include/uapi/asm/inst.h b/arch/mips/include/uapi/asm/inst.h index e5a676e3d3c0..2c1ceb66e34a 100644 --- a/arch/mips/include/uapi/asm/inst.h +++ b/arch/mips/include/uapi/asm/inst.h @@ -9,8 +9,8 @@ * Copyright (C) 2006 by Thiemo Seufer * Copyright (C) 2012 MIPS Technologies, Inc. All rights reserved. */ -#ifndef _UAPI_ASM_INST_H -#define _UAPI_ASM_INST_H +#ifndef _ASM_INST_H +#define _ASM_INST_H /* * Major opcodes; before MIPS IV cop1x was called cop3. @@ -893,4 +893,4 @@ union mips16e_instruction { struct m16e_i8 i8; }; -#endif /* _UAPI_ASM_INST_H */ +#endif /* _ASM_INST_H */ diff --git a/arch/mips/include/uapi/asm/ioctls.h b/arch/mips/include/uapi/asm/ioctls.h index b1e637757fe3..70b139113b86 100644 --- a/arch/mips/include/uapi/asm/ioctls.h +++ b/arch/mips/include/uapi/asm/ioctls.h @@ -108,6 +108,6 @@ #define TIOCSERGETMULTI 0x548f /* Get multiport config */ #define TIOCSERSETMULTI 0x5490 /* Set multiport config */ #define TIOCMIWAIT 0x5491 /* wait for a change on serial input line(s) */ -#define TIOCGICOUNT 0x5492 /* read serial port inline interrupt counts */ +#define TIOCGICOUNT 0x5492 /* read serial port __inline__ interrupt counts */ #endif /* __ASM_IOCTLS_H */ diff --git a/arch/mips/include/uapi/asm/ptrace.h b/arch/mips/include/uapi/asm/ptrace.h index b26f7e317279..508f8fdc79ed 100644 --- a/arch/mips/include/uapi/asm/ptrace.h +++ b/arch/mips/include/uapi/asm/ptrace.h @@ -6,8 +6,8 @@ * Copyright (C) 1994, 95, 96, 97, 98, 99, 2000 by Ralf Baechle * Copyright (C) 1999, 2000 Silicon Graphics, Inc. */ -#ifndef _UAPI_ASM_PTRACE_H -#define _UAPI_ASM_PTRACE_H +#ifndef _ASM_PTRACE_H +#define _ASM_PTRACE_H /* 0 - 31 are integer registers, 32 - 63 are fp registers. */ #define FPR_BASE 32 @@ -22,7 +22,6 @@ #define DSP_CONTROL 77 #define ACX 78 -#ifndef __KERNEL__ /* * This struct defines the way the registers are stored on the stack during a * system call/exception. As usual the registers k0/k1 aren't being saved. @@ -39,7 +38,6 @@ struct pt_regs { unsigned long cp0_cause; unsigned long cp0_epc; } __attribute__ ((aligned (8))); -#endif /* __KERNEL__ */ /* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */ #define PTRACE_GETREGS 12 @@ -100,4 +98,4 @@ struct pt_watch_regs { #define PTRACE_SET_WATCH_REGS 0xd1 -#endif /* _UAPI_ASM_PTRACE_H */ +#endif /* _ASM_PTRACE_H */ diff --git a/arch/mips/include/uapi/asm/setup.h b/arch/mips/include/uapi/asm/setup.h index 93f237bb1353..716f4b74b416 100644 --- a/arch/mips/include/uapi/asm/setup.h +++ b/arch/mips/include/uapi/asm/setup.h @@ -1,7 +1,7 @@ -#ifndef _UAPI_MIPS_SETUP_H -#define _UAPI_MIPS_SETUP_H +#ifndef _MIPS_SETUP_H +#define _MIPS_SETUP_H #define COMMAND_LINE_SIZE 4096 -#endif /* _UAPI_MIPS_SETUP_H */ +#endif /* _MIPS_SETUP_H */ diff --git a/arch/mips/include/uapi/asm/sigcontext.h b/arch/mips/include/uapi/asm/sigcontext.h index 6c9906f59c6e..0f64a709cd54 100644 --- a/arch/mips/include/uapi/asm/sigcontext.h +++ b/arch/mips/include/uapi/asm/sigcontext.h @@ -6,8 +6,8 @@ * Copyright (C) 1996, 1997, 1999 by Ralf Baechle * Copyright (C) 1999 Silicon Graphics, Inc. */ -#ifndef _UAPI_ASM_SIGCONTEXT_H -#define _UAPI_ASM_SIGCONTEXT_H +#ifndef _ASM_SIGCONTEXT_H +#define _ASM_SIGCONTEXT_H #include <linux/types.h> #include <asm/sgidefs.h> @@ -75,4 +75,4 @@ struct sigcontext { #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32 */ -#endif /* _UAPI_ASM_SIGCONTEXT_H */ +#endif /* _ASM_SIGCONTEXT_H */ diff --git a/arch/mips/include/uapi/asm/siginfo.h b/arch/mips/include/uapi/asm/siginfo.h index 88e292b7719e..4d847c8af7fb 100644 --- a/arch/mips/include/uapi/asm/siginfo.h +++ b/arch/mips/include/uapi/asm/siginfo.h @@ -6,8 +6,8 @@ * Copyright (C) 1998, 1999, 2001, 2003 Ralf Baechle * Copyright (C) 2000, 2001 Silicon Graphics, Inc. */ -#ifndef _UAPI_ASM_SIGINFO_H -#define _UAPI_ASM_SIGINFO_H +#ifndef _ASM_SIGINFO_H +#define _ASM_SIGINFO_H #define __ARCH_SIGEV_PREAMBLE_SIZE (sizeof(long) + 2*sizeof(int)) @@ -46,13 +46,13 @@ typedef struct siginfo { /* kill() */ struct { - pid_t _pid; /* sender's pid */ + __kernel_pid_t _pid; /* sender's pid */ __ARCH_SI_UID_T _uid; /* sender's uid */ } _kill; /* POSIX.1b timers */ struct { - timer_t _tid; /* timer id */ + __kernel_timer_t _tid; /* timer id */ int _overrun; /* overrun count */ char _pad[sizeof( __ARCH_SI_UID_T) - sizeof(int)]; sigval_t _sigval; /* same as below */ @@ -61,31 +61,31 @@ typedef struct siginfo { /* POSIX.1b signals */ struct { - pid_t _pid; /* sender's pid */ + __kernel_pid_t _pid; /* sender's pid */ __ARCH_SI_UID_T _uid; /* sender's uid */ sigval_t _sigval; } _rt; /* SIGCHLD */ struct { - pid_t _pid; /* which child */ + __kernel_pid_t _pid; /* which child */ __ARCH_SI_UID_T _uid; /* sender's uid */ int _status; /* exit code */ - clock_t _utime; - clock_t _stime; + __kernel_clock_t _utime; + __kernel_clock_t _stime; } _sigchld; /* IRIX SIGCHLD */ struct { - pid_t _pid; /* which child */ - clock_t _utime; + __kernel_pid_t _pid; /* which child */ + __kernel_clock_t _utime; int _status; /* exit code */ - clock_t _stime; + __kernel_clock_t _stime; } _irix_sigchld; /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */ struct { - void __user *_addr; /* faulting insn/memory ref. */ + void *_addr; /* faulting insn/memory ref. */ #ifdef __ARCH_SI_TRAPNO int _trapno; /* TRAP # which caused the signal */ #endif @@ -112,4 +112,4 @@ typedef struct siginfo { #define SI_MESGQ __SI_CODE(__SI_MESGQ, -4) /* sent by real time mesq state change */ -#endif /* _UAPI_ASM_SIGINFO_H */ +#endif /* _ASM_SIGINFO_H */ diff --git a/arch/mips/include/uapi/asm/signal.h b/arch/mips/include/uapi/asm/signal.h index addb9f556b71..13aa4c21b5c8 100644 --- a/arch/mips/include/uapi/asm/signal.h +++ b/arch/mips/include/uapi/asm/signal.h @@ -6,8 +6,8 @@ * Copyright (C) 1995, 96, 97, 98, 99, 2003 by Ralf Baechle * Copyright (C) 1999 Silicon Graphics, Inc. */ -#ifndef _UAPI_ASM_SIGNAL_H -#define _UAPI_ASM_SIGNAL_H +#ifndef _ASM_SIGNAL_H +#define _ASM_SIGNAL_H #include <linux/types.h> @@ -100,20 +100,18 @@ typedef unsigned long old_sigset_t; /* at least 32 bits */ #include <asm-generic/signal-defs.h> -#ifndef __KERNEL__ struct sigaction { unsigned int sa_flags; __sighandler_t sa_handler; sigset_t sa_mask; }; -#endif /* IRIX compatible stack_t */ typedef struct sigaltstack { - void __user *ss_sp; + void *ss_sp; size_t ss_size; int ss_flags; } stack_t; -#endif /* _UAPI_ASM_SIGNAL_H */ +#endif /* _ASM_SIGNAL_H */ diff --git a/arch/mips/include/uapi/asm/socket.h b/arch/mips/include/uapi/asm/socket.h index 61c01f054d1b..00927d419971 100644 --- a/arch/mips/include/uapi/asm/socket.h +++ b/arch/mips/include/uapi/asm/socket.h @@ -6,8 +6,8 @@ * Copyright (C) 1997, 1999, 2000, 2001 Ralf Baechle * Copyright (C) 2000, 2001 Silicon Graphics, Inc. */ -#ifndef _UAPI_ASM_SOCKET_H -#define _UAPI_ASM_SOCKET_H +#ifndef _ASM_SOCKET_H +#define _ASM_SOCKET_H #include <asm/sockios.h> @@ -94,4 +94,4 @@ #define SO_BUSY_POLL 46 -#endif /* _UAPI_ASM_SOCKET_H */ +#endif /* _ASM_SOCKET_H */ diff --git a/arch/mips/include/uapi/asm/swab.h b/arch/mips/include/uapi/asm/swab.h index ac9a8f9cd1fb..b098829cd600 100644 --- a/arch/mips/include/uapi/asm/swab.h +++ b/arch/mips/include/uapi/asm/swab.h @@ -8,14 +8,14 @@ #ifndef _ASM_SWAB_H #define _ASM_SWAB_H -#include <linux/compiler.h> + #include <linux/types.h> #define __SWAB_64_THRU_32__ #if defined(__mips_isa_rev) && (__mips_isa_rev >= 2) -static inline __attribute_const__ __u16 __arch_swab16(__u16 x) +static __inline__ __u16 __arch_swab16(__u16 x) { __asm__( " wsbh %0, %1 \n" @@ -26,7 +26,7 @@ static inline __attribute_const__ __u16 __arch_swab16(__u16 x) } #define __arch_swab16 __arch_swab16 -static inline __attribute_const__ __u32 __arch_swab32(__u32 x) +static __inline__ __u32 __arch_swab32(__u32 x) { __asm__( " wsbh %0, %1 \n" @@ -43,7 +43,7 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x) * 64-bit kernel on r2 CPUs. */ #ifdef __mips64 -static inline __attribute_const__ __u64 __arch_swab64(__u64 x) +static __inline__ __u64 __arch_swab64(__u64 x) { __asm__( " dsbh %0, %1\n" diff --git a/arch/mips/include/uapi/asm/termios.h b/arch/mips/include/uapi/asm/termios.h index baeb2fa87451..36c1884cb7f3 100644 --- a/arch/mips/include/uapi/asm/termios.h +++ b/arch/mips/include/uapi/asm/termios.h @@ -6,8 +6,8 @@ * Copyright (C) 1995, 1996, 2000, 2001 by Ralf Baechle * Copyright (C) 2000, 2001 Silicon Graphics, Inc. */ -#ifndef _UAPI_ASM_TERMIOS_H -#define _UAPI_ASM_TERMIOS_H +#ifndef _ASM_TERMIOS_H +#define _ASM_TERMIOS_H #include <linux/errno.h> #include <asm/termbits.h> @@ -77,4 +77,4 @@ struct termio { #define TIOCM_LOOP 0x8000 -#endif /* _UAPI_ASM_TERMIOS_H */ +#endif /* _ASM_TERMIOS_H */ diff --git a/arch/mips/include/uapi/asm/types.h b/arch/mips/include/uapi/asm/types.h index 7ac9d0baad84..21f80aaeef9b 100644 --- a/arch/mips/include/uapi/asm/types.h +++ b/arch/mips/include/uapi/asm/types.h @@ -8,20 +8,18 @@ * written by Ralf Baechle * Copyright (C) 1999 Silicon Graphics, Inc. */ -#ifndef _UAPI_ASM_TYPES_H -#define _UAPI_ASM_TYPES_H +#ifndef _ASM_TYPES_H +#define _ASM_TYPES_H /* * We don't use int-l64.h for the kernel anymore but still use it for * userspace to avoid code changes. */ -#ifndef __KERNEL__ # if _MIPS_SZLONG == 64 # include <asm-generic/int-l64.h> # else # include <asm-generic/int-ll64.h> # endif -#endif -#endif /* _UAPI_ASM_TYPES_H */ +#endif /* _ASM_TYPES_H */ diff --git a/arch/mips/include/uapi/asm/unistd.h b/arch/mips/include/uapi/asm/unistd.h index 1dee279f9665..acf4818e1b9b 100644 --- a/arch/mips/include/uapi/asm/unistd.h +++ b/arch/mips/include/uapi/asm/unistd.h @@ -9,8 +9,8 @@ * Changed system calls macros _syscall5 - _syscall7 to push args 5 to 7 onto * the stack. Robin Farine for ACN S.A, Copyright (C) 1996 by ACN S.A */ -#ifndef _UAPI_ASM_UNISTD_H -#define _UAPI_ASM_UNISTD_H +#ifndef _ASM_UNISTD_H +#define _ASM_UNISTD_H #include <asm/sgidefs.h> @@ -1036,4 +1036,4 @@ #define __NR_N32_Linux 6000 #define __NR_N32_Linux_syscalls 312 -#endif /* _UAPI_ASM_UNISTD_H */ +#endif /* _ASM_UNISTD_H */ diff --git a/arch/powerpc/include/asm/linkage.h b/arch/powerpc/include/asm/linkage.h index b36f650a13ff..167ceca08aa9 100644 --- a/arch/powerpc/include/asm/linkage.h +++ b/arch/powerpc/include/asm/linkage.h @@ -3,10 +3,10 @@ #ifdef CONFIG_PPC64 #define cond_syscall(x) \ - asm ("\t.weak " #x "\n\t.set " #x ", sys_ni_syscall\n" \ + __asm__ ("\t.weak " #x "\n\t.set " #x ", sys_ni_syscall\n" \ "\t.weak ." #x "\n\t.set ." #x ", .sys_ni_syscall\n") #define SYSCALL_ALIAS(alias, name) \ - asm ("\t.globl " #alias "\n\t.set " #alias ", " #name "\n" \ + __asm__ ("\t.globl " #alias "\n\t.set " #alias ", " #name "\n" \ "\t.globl ." #alias "\n\t.set ." #alias ", ." #name) #endif diff --git a/arch/powerpc/include/uapi/asm/bootx.h b/arch/powerpc/include/uapi/asm/bootx.h index 6e51cf0708a1..7f82d64acc2e 100644 --- a/arch/powerpc/include/uapi/asm/bootx.h +++ b/arch/powerpc/include/uapi/asm/bootx.h @@ -6,8 +6,8 @@ */ -#ifndef _UAPI__ASM_BOOTX_H__ -#define _UAPI__ASM_BOOTX_H__ +#ifndef __ASM_BOOTX_H__ +#define __ASM_BOOTX_H__ #include <linux/types.h> @@ -129,4 +129,4 @@ typedef struct boot_infos #pragma options align=reset #endif -#endif /* _UAPI__ASM_BOOTX_H__ */ +#endif /* __ASM_BOOTX_H__ */ diff --git a/arch/powerpc/include/uapi/asm/cputable.h b/arch/powerpc/include/uapi/asm/cputable.h index 5b7657959faa..8144a22c5587 100644 --- a/arch/powerpc/include/uapi/asm/cputable.h +++ b/arch/powerpc/include/uapi/asm/cputable.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__ASM_POWERPC_CPUTABLE_H -#define _UAPI__ASM_POWERPC_CPUTABLE_H +#ifndef __ASM_POWERPC_CPUTABLE_H +#define __ASM_POWERPC_CPUTABLE_H /* in AT_HWCAP */ #define PPC_FEATURE_32 0x80000000 @@ -42,4 +42,4 @@ #define PPC_FEATURE2_ISEL 0x08000000 #define PPC_FEATURE2_TAR 0x04000000 -#endif /* _UAPI__ASM_POWERPC_CPUTABLE_H */ +#endif /* __ASM_POWERPC_CPUTABLE_H */ diff --git a/arch/powerpc/include/uapi/asm/elf.h b/arch/powerpc/include/uapi/asm/elf.h index 7e39c9146a71..36ff1f7fd16d 100644 --- a/arch/powerpc/include/uapi/asm/elf.h +++ b/arch/powerpc/include/uapi/asm/elf.h @@ -6,8 +6,8 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI_ASM_POWERPC_ELF_H -#define _UAPI_ASM_POWERPC_ELF_H +#ifndef _ASM_POWERPC_ELF_H +#define _ASM_POWERPC_ELF_H #include <linux/types.h> @@ -303,4 +303,4 @@ struct ppc64_opd_entry }; -#endif /* _UAPI_ASM_POWERPC_ELF_H */ +#endif /* _ASM_POWERPC_ELF_H */ diff --git a/arch/powerpc/include/uapi/asm/epapr_hcalls.h b/arch/powerpc/include/uapi/asm/epapr_hcalls.h index 7f9c74b46704..06f724786a44 100644 --- a/arch/powerpc/include/uapi/asm/epapr_hcalls.h +++ b/arch/powerpc/include/uapi/asm/epapr_hcalls.h @@ -37,8 +37,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _UAPI_ASM_POWERPC_EPAPR_HCALLS_H -#define _UAPI_ASM_POWERPC_EPAPR_HCALLS_H +#ifndef _ASM_POWERPC_EPAPR_HCALLS_H +#define _ASM_POWERPC_EPAPR_HCALLS_H #define EV_BYTE_CHANNEL_SEND 1 #define EV_BYTE_CHANNEL_RECEIVE 2 @@ -95,4 +95,4 @@ #define EV_UNIMPLEMENTED 12 /* Unimplemented hypercall */ #define EV_BUFFER_OVERFLOW 13 /* Caller-supplied buffer too small */ -#endif /* _UAPI_ASM_POWERPC_EPAPR_HCALLS_H */ +#endif /* _ASM_POWERPC_EPAPR_HCALLS_H */ diff --git a/arch/powerpc/include/uapi/asm/ioctls.h b/arch/powerpc/include/uapi/asm/ioctls.h index 49a25796a61a..d5b258cd9c37 100644 --- a/arch/powerpc/include/uapi/asm/ioctls.h +++ b/arch/powerpc/include/uapi/asm/ioctls.h @@ -114,6 +114,6 @@ #define TIOCSERSETMULTI 0x545B /* Set multiport config */ #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ -#define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ +#define TIOCGICOUNT 0x545D /* read serial port __inline__ interrupt counts */ #endif /* _ASM_POWERPC_IOCTLS_H */ diff --git a/arch/powerpc/include/uapi/asm/kvm_para.h b/arch/powerpc/include/uapi/asm/kvm_para.h index e3af3286a068..7e64f575f670 100644 --- a/arch/powerpc/include/uapi/asm/kvm_para.h +++ b/arch/powerpc/include/uapi/asm/kvm_para.h @@ -17,8 +17,8 @@ * Authors: Hollis Blanchard <hollisb@us.ibm.com> */ -#ifndef _UAPI__POWERPC_KVM_PARA_H__ -#define _UAPI__POWERPC_KVM_PARA_H__ +#ifndef __POWERPC_KVM_PARA_H__ +#define __POWERPC_KVM_PARA_H__ #include <linux/types.h> @@ -88,4 +88,4 @@ struct kvm_vcpu_arch_shared { #define KVM_MAGIC_FEAT_MAS0_TO_SPRG7 (1 << 1) -#endif /* _UAPI__POWERPC_KVM_PARA_H__ */ +#endif /* __POWERPC_KVM_PARA_H__ */ diff --git a/arch/powerpc/include/uapi/asm/mman.h b/arch/powerpc/include/uapi/asm/mman.h index 6ea26df0a73c..6fa6b6012f1f 100644 --- a/arch/powerpc/include/uapi/asm/mman.h +++ b/arch/powerpc/include/uapi/asm/mman.h @@ -4,8 +4,8 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI_ASM_POWERPC_MMAN_H -#define _UAPI_ASM_POWERPC_MMAN_H +#ifndef _ASM_POWERPC_MMAN_H +#define _ASM_POWERPC_MMAN_H #include <asm-generic/mman-common.h> @@ -28,4 +28,4 @@ #define MAP_STACK 0x20000 /* give out an address that is best suited for process/thread stacks */ #define MAP_HUGETLB 0x40000 /* create a huge page mapping */ -#endif /* _UAPI_ASM_POWERPC_MMAN_H */ +#endif /* _ASM_POWERPC_MMAN_H */ diff --git a/arch/powerpc/include/uapi/asm/nvram.h b/arch/powerpc/include/uapi/asm/nvram.h index 608bdc8aedd1..a18abfc7cd83 100644 --- a/arch/powerpc/include/uapi/asm/nvram.h +++ b/arch/powerpc/include/uapi/asm/nvram.h @@ -7,8 +7,8 @@ * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI_ASM_POWERPC_NVRAM_H -#define _UAPI_ASM_POWERPC_NVRAM_H +#ifndef _ASM_POWERPC_NVRAM_H +#define _ASM_POWERPC_NVRAM_H /* Signatures for nvram partitions */ #define NVRAM_SIG_SP 0x02 /* support processor */ @@ -59,4 +59,4 @@ struct pmac_machine_location { #define IOC_NVRAM_GET_OFFSET _IOWR('p', 0x42, int) /* Get NVRAM partition offset */ #define IOC_NVRAM_SYNC _IO('p', 0x43) /* Sync NVRAM image */ -#endif /* _UAPI_ASM_POWERPC_NVRAM_H */ +#endif /* _ASM_POWERPC_NVRAM_H */ diff --git a/arch/powerpc/include/uapi/asm/perf_event.h b/arch/powerpc/include/uapi/asm/perf_event.h index 80a4d40cf5bc..6c9ad175b25e 100644 --- a/arch/powerpc/include/uapi/asm/perf_event.h +++ b/arch/powerpc/include/uapi/asm/perf_event.h @@ -7,12 +7,12 @@ * License. */ -#ifndef _UAPI_ASM_POWERPC_PERF_EVENT_H -#define _UAPI_ASM_POWERPC_PERF_EVENT_H +#ifndef _ASM_POWERPC_PERF_EVENT_H +#define _ASM_POWERPC_PERF_EVENT_H /* * We use bit 63 of perf_event_attr.config as a flag to request EBB. */ #define PERF_EVENT_CONFIG_EBB_SHIFT 63 -#endif /* _UAPI_ASM_POWERPC_PERF_EVENT_H */ +#endif /* _ASM_POWERPC_PERF_EVENT_H */ diff --git a/arch/powerpc/include/uapi/asm/ptrace.h b/arch/powerpc/include/uapi/asm/ptrace.h index 77d2ed35b111..d216fe1fc874 100644 --- a/arch/powerpc/include/uapi/asm/ptrace.h +++ b/arch/powerpc/include/uapi/asm/ptrace.h @@ -4,7 +4,7 @@ * This struct defines the way the registers are stored on the * kernel stack during a system call or other kernel entry. * - * this should only contain volatile regs + * this should only contain __volatile__ regs * since we can keep non-volatile in the thread_struct * should set this up when only volatiles are saved * by intr code. @@ -20,8 +20,8 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI_ASM_POWERPC_PTRACE_H -#define _UAPI_ASM_POWERPC_PTRACE_H +#ifndef _ASM_POWERPC_PTRACE_H +#define _ASM_POWERPC_PTRACE_H #include <linux/types.h> @@ -258,4 +258,4 @@ struct ppc_hw_breakpoint { #define PPC_BREAKPOINT_CONDITION_BE(n) \ (1<<((n)+PPC_BREAKPOINT_CONDITION_BE_SHIFT)) -#endif /* _UAPI_ASM_POWERPC_PTRACE_H */ +#endif /* _ASM_POWERPC_PTRACE_H */ diff --git a/arch/powerpc/include/uapi/asm/sigcontext.h b/arch/powerpc/include/uapi/asm/sigcontext.h index 9c1f24fd5d11..70c3dbf01dc1 100644 --- a/arch/powerpc/include/uapi/asm/sigcontext.h +++ b/arch/powerpc/include/uapi/asm/sigcontext.h @@ -7,7 +7,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#include <linux/compiler.h> + #include <asm/ptrace.h> #ifdef __powerpc64__ #include <asm/elf.h> @@ -21,7 +21,7 @@ struct sigcontext { #endif unsigned long handler; unsigned long oldmask; - struct pt_regs __user *regs; + struct pt_regs *regs; #ifdef __powerpc64__ elf_gregset_t gp_regs; elf_fpregset_t fp_regs; @@ -79,7 +79,7 @@ struct sigcontext { * backwards compatility to store VSR 0-31 doubleword 1 after the VMX * registers and vscr/vrsave. */ - elf_vrreg_t __user *v_regs; + elf_vrreg_t *v_regs; long vmx_reserve[ELF_NVRREG+ELF_NVRREG+32+1]; #endif }; diff --git a/arch/powerpc/include/uapi/asm/signal.h b/arch/powerpc/include/uapi/asm/signal.h index 6c69ee94fd8d..4cdbe24591e0 100644 --- a/arch/powerpc/include/uapi/asm/signal.h +++ b/arch/powerpc/include/uapi/asm/signal.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_ASM_POWERPC_SIGNAL_H -#define _UAPI_ASM_POWERPC_SIGNAL_H +#ifndef _ASM_POWERPC_SIGNAL_H +#define _ASM_POWERPC_SIGNAL_H #include <linux/types.h> @@ -90,7 +90,6 @@ typedef struct { #include <asm-generic/signal-defs.h> -#ifndef __KERNEL__ struct old_sigaction { __sighandler_t sa_handler; old_sigset_t sa_mask; @@ -104,10 +103,9 @@ struct sigaction { __sigrestore_t sa_restorer; sigset_t sa_mask; /* mask last for extensibility */ }; -#endif typedef struct sigaltstack { - void __user *ss_sp; + void *ss_sp; int ss_flags; size_t ss_size; } stack_t; @@ -134,4 +132,4 @@ struct sig_dbg_op { #define SIG_DBG_BRANCH_TRACING 2 #endif /* ! __powerpc64__ */ -#endif /* _UAPI_ASM_POWERPC_SIGNAL_H */ +#endif /* _ASM_POWERPC_SIGNAL_H */ diff --git a/arch/powerpc/include/uapi/asm/spu_info.h b/arch/powerpc/include/uapi/asm/spu_info.h index ed071bf97707..de8afe320247 100644 --- a/arch/powerpc/include/uapi/asm/spu_info.h +++ b/arch/powerpc/include/uapi/asm/spu_info.h @@ -20,19 +20,17 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _UAPI_SPU_INFO_H -#define _UAPI_SPU_INFO_H +#ifndef _SPU_INFO_H +#define _SPU_INFO_H #include <linux/types.h> -#ifndef __KERNEL__ struct mfc_cq_sr { __u64 mfc_cq_data0_RW; __u64 mfc_cq_data1_RW; __u64 mfc_cq_data2_RW; __u64 mfc_cq_data3_RW; }; -#endif /* __KERNEL__ */ struct spu_dma_info { __u64 dma_info_type; @@ -50,4 +48,4 @@ struct spu_proxydma_info { struct mfc_cq_sr proxydma_info_command_data[8]; }; -#endif /* _UAPI_SPU_INFO_H */ +#endif /* _SPU_INFO_H */ diff --git a/arch/powerpc/include/uapi/asm/swab.h b/arch/powerpc/include/uapi/asm/swab.h index b6c368aa5c05..3958720b6359 100644 --- a/arch/powerpc/include/uapi/asm/swab.h +++ b/arch/powerpc/include/uapi/asm/swab.h @@ -4,12 +4,12 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI_ASM_POWERPC_SWAB_H -#define _UAPI_ASM_POWERPC_SWAB_H +#ifndef _ASM_POWERPC_SWAB_H +#define _ASM_POWERPC_SWAB_H #include <linux/types.h> -#include <linux/compiler.h> + #ifdef __GNUC__ @@ -20,4 +20,4 @@ #endif /* __GNUC__ */ -#endif /* _UAPI_ASM_POWERPC_SWAB_H */ +#endif /* _ASM_POWERPC_SWAB_H */ diff --git a/arch/powerpc/include/uapi/asm/termios.h b/arch/powerpc/include/uapi/asm/termios.h index 6cca5cdfec04..64fad8505aaf 100644 --- a/arch/powerpc/include/uapi/asm/termios.h +++ b/arch/powerpc/include/uapi/asm/termios.h @@ -9,8 +9,8 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI_ASM_POWERPC_TERMIOS_H -#define _UAPI_ASM_POWERPC_TERMIOS_H +#ifndef _ASM_POWERPC_TERMIOS_H +#define _ASM_POWERPC_TERMIOS_H #include <asm/ioctls.h> @@ -73,4 +73,4 @@ struct termio { -#endif /* _UAPI_ASM_POWERPC_TERMIOS_H */ +#endif /* _ASM_POWERPC_TERMIOS_H */ diff --git a/arch/powerpc/include/uapi/asm/types.h b/arch/powerpc/include/uapi/asm/types.h index 4b8ab990a3c1..3ca9bbbbd844 100644 --- a/arch/powerpc/include/uapi/asm/types.h +++ b/arch/powerpc/include/uapi/asm/types.h @@ -10,8 +10,8 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI_ASM_POWERPC_TYPES_H -#define _UAPI_ASM_POWERPC_TYPES_H +#ifndef _ASM_POWERPC_TYPES_H +#define _ASM_POWERPC_TYPES_H /* * This is here because we used to use l64 for 64bit powerpc @@ -37,4 +37,4 @@ typedef struct { #endif /* __ASSEMBLY__ */ -#endif /* _UAPI_ASM_POWERPC_TYPES_H */ +#endif /* _ASM_POWERPC_TYPES_H */ diff --git a/arch/powerpc/include/uapi/asm/ucontext.h b/arch/powerpc/include/uapi/asm/ucontext.h index d9a4ddf0cc86..11726716906f 100644 --- a/arch/powerpc/include/uapi/asm/ucontext.h +++ b/arch/powerpc/include/uapi/asm/ucontext.h @@ -19,11 +19,11 @@ struct mcontext { struct ucontext { unsigned long uc_flags; - struct ucontext __user *uc_link; + struct ucontext *uc_link; stack_t uc_stack; #ifndef __powerpc64__ int uc_pad[7]; - struct mcontext __user *uc_regs;/* points to uc_mcontext field */ + struct mcontext *uc_regs;/* points to uc_mcontext field */ #endif sigset_t uc_sigmask; /* glibc has 1024-bit signal masks, ours are 64-bit */ diff --git a/arch/powerpc/include/uapi/asm/unistd.h b/arch/powerpc/include/uapi/asm/unistd.h index 74cb4d72d673..46a9783d6da3 100644 --- a/arch/powerpc/include/uapi/asm/unistd.h +++ b/arch/powerpc/include/uapi/asm/unistd.h @@ -6,8 +6,8 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI_ASM_POWERPC_UNISTD_H_ -#define _UAPI_ASM_POWERPC_UNISTD_H_ +#ifndef _ASM_POWERPC_UNISTD_H_ +#define _ASM_POWERPC_UNISTD_H_ #define __NR_restart_syscall 0 @@ -379,4 +379,4 @@ #define __NR_kcmp 354 -#endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */ +#endif /* _ASM_POWERPC_UNISTD_H_ */ diff --git a/arch/x86/include/uapi/asm/boot.h b/arch/x86/include/uapi/asm/boot.h index 94292c4c8122..1f200ace58c5 100644 --- a/arch/x86/include/uapi/asm/boot.h +++ b/arch/x86/include/uapi/asm/boot.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_ASM_X86_BOOT_H -#define _UAPI_ASM_X86_BOOT_H +#ifndef _ASM_X86_BOOT_H +#define _ASM_X86_BOOT_H /* Internal svga startup constants */ #define NORMAL_VGA 0xffff /* 80x25 mode */ @@ -7,4 +7,4 @@ #define ASK_VGA 0xfffd /* ask for it at bootup */ -#endif /* _UAPI_ASM_X86_BOOT_H */ +#endif /* _ASM_X86_BOOT_H */ diff --git a/arch/x86/include/uapi/asm/debugreg.h b/arch/x86/include/uapi/asm/debugreg.h index 3c0874dd9861..4cd9bd35bdb3 100644 --- a/arch/x86/include/uapi/asm/debugreg.h +++ b/arch/x86/include/uapi/asm/debugreg.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_ASM_X86_DEBUGREG_H -#define _UAPI_ASM_X86_DEBUGREG_H +#ifndef _ASM_X86_DEBUGREG_H +#define _ASM_X86_DEBUGREG_H /* Indicate the register numbers for a number of the specific @@ -77,4 +77,4 @@ * HW breakpoint additions */ -#endif /* _UAPI_ASM_X86_DEBUGREG_H */ +#endif /* _ASM_X86_DEBUGREG_H */ diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h index bbae02470701..cd8706e19512 100644 --- a/arch/x86/include/uapi/asm/e820.h +++ b/arch/x86/include/uapi/asm/e820.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_ASM_X86_E820_H -#define _UAPI_ASM_X86_E820_H +#ifndef _ASM_X86_E820_H +#define _ASM_X86_E820_H #define E820MAP 0x2d0 /* our map */ #define E820MAX 128 /* number of entries in E820MAP */ @@ -26,9 +26,7 @@ * to collapse the next two #ifdef lines to a single line: * #if defined(__KERNEL__) && defined(CONFIG_EFI) */ -#ifndef __KERNEL__ #define E820_X_MAX E820MAX -#endif #define E820NR 0x1e8 /* # entries in E820MAP */ @@ -72,4 +70,4 @@ struct e820map { #endif /* __ASSEMBLY__ */ -#endif /* _UAPI_ASM_X86_E820_H */ +#endif /* _ASM_X86_E820_H */ diff --git a/arch/x86/include/uapi/asm/ist.h b/arch/x86/include/uapi/asm/ist.h index bad9f5ea4070..192dec3d69fd 100644 --- a/arch/x86/include/uapi/asm/ist.h +++ b/arch/x86/include/uapi/asm/ist.h @@ -12,8 +12,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. */ -#ifndef _UAPI_ASM_X86_IST_H -#define _UAPI_ASM_X86_IST_H +#ifndef _ASM_X86_IST_H +#define _ASM_X86_IST_H @@ -26,4 +26,4 @@ struct ist_info { __u32 perf_level; }; -#endif /* _UAPI_ASM_X86_IST_H */ +#endif /* _ASM_X86_IST_H */ diff --git a/arch/x86/include/uapi/asm/kvm_para.h b/arch/x86/include/uapi/asm/kvm_para.h index 94dc8ca434e0..e41c5c1a28da 100644 --- a/arch/x86/include/uapi/asm/kvm_para.h +++ b/arch/x86/include/uapi/asm/kvm_para.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_ASM_X86_KVM_PARA_H -#define _UAPI_ASM_X86_KVM_PARA_H +#ifndef _ASM_X86_KVM_PARA_H +#define _ASM_X86_KVM_PARA_H #include <linux/types.h> #include <asm/hyperv.h> @@ -98,4 +98,4 @@ struct kvm_vcpu_pv_apf_data { #define KVM_PV_EOI_DISABLED 0x0 -#endif /* _UAPI_ASM_X86_KVM_PARA_H */ +#endif /* _ASM_X86_KVM_PARA_H */ diff --git a/arch/x86/include/uapi/asm/mce.h b/arch/x86/include/uapi/asm/mce.h index a0eab85ce7b8..46e0674ad046 100644 --- a/arch/x86/include/uapi/asm/mce.h +++ b/arch/x86/include/uapi/asm/mce.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_ASM_X86_MCE_H -#define _UAPI_ASM_X86_MCE_H +#ifndef _ASM_X86_MCE_H +#define _ASM_X86_MCE_H #include <linux/types.h> #include <asm/ioctls.h> @@ -31,4 +31,4 @@ struct mce { #define MCE_GET_LOG_LEN _IOR('M', 2, int) #define MCE_GETCLEAR_FLAGS _IOR('M', 3, int) -#endif /* _UAPI_ASM_X86_MCE_H */ +#endif /* _ASM_X86_MCE_H */ diff --git a/arch/x86/include/uapi/asm/msr.h b/arch/x86/include/uapi/asm/msr.h index 155e51048fa4..f1aeaf77242c 100644 --- a/arch/x86/include/uapi/asm/msr.h +++ b/arch/x86/include/uapi/asm/msr.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_ASM_X86_MSR_H -#define _UAPI_ASM_X86_MSR_H +#ifndef _ASM_X86_MSR_H +#define _ASM_X86_MSR_H #include <asm/msr-index.h> @@ -12,4 +12,4 @@ #define X86_IOC_WRMSR_REGS _IOWR('c', 0xA1, __u32[8]) #endif /* __ASSEMBLY__ */ -#endif /* _UAPI_ASM_X86_MSR_H */ +#endif /* _ASM_X86_MSR_H */ diff --git a/arch/x86/include/uapi/asm/mtrr.h b/arch/x86/include/uapi/asm/mtrr.h index d0acb658c8f4..a39f6438bd3c 100644 --- a/arch/x86/include/uapi/asm/mtrr.h +++ b/arch/x86/include/uapi/asm/mtrr.h @@ -20,8 +20,8 @@ The postal address is: Richard Gooch, c/o ATNF, P. O. Box 76, Epping, N.S.W., 2121, Australia. */ -#ifndef _UAPI_ASM_X86_MTRR_H -#define _UAPI_ASM_X86_MTRR_H +#ifndef _ASM_X86_MTRR_H +#define _ASM_X86_MTRR_H #include <linux/types.h> #include <linux/ioctl.h> @@ -114,4 +114,4 @@ struct mtrr_state_type { #define MTRR_NUM_TYPES 7 -#endif /* _UAPI_ASM_X86_MTRR_H */ +#endif /* _ASM_X86_MTRR_H */ diff --git a/arch/x86/include/uapi/asm/posix_types.h b/arch/x86/include/uapi/asm/posix_types.h index 85506b383627..9b4a886ffd8b 100644 --- a/arch/x86/include/uapi/asm/posix_types.h +++ b/arch/x86/include/uapi/asm/posix_types.h @@ -1,4 +1,3 @@ -#ifndef __KERNEL__ # ifdef __i386__ # include <asm/posix_types_32.h> # elif defined(__ILP32__) @@ -6,4 +5,3 @@ # else # include <asm/posix_types_64.h> # endif -#endif diff --git a/arch/x86/include/uapi/asm/processor-flags.h b/arch/x86/include/uapi/asm/processor-flags.h index 180a0c3c224d..de35a8e0c38f 100644 --- a/arch/x86/include/uapi/asm/processor-flags.h +++ b/arch/x86/include/uapi/asm/processor-flags.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_ASM_X86_PROCESSOR_FLAGS_H -#define _UAPI_ASM_X86_PROCESSOR_FLAGS_H +#ifndef _ASM_X86_PROCESSOR_FLAGS_H +#define _ASM_X86_PROCESSOR_FLAGS_H /* Various flags defined: can be included from assembler. */ #include <linux/const.h> @@ -150,4 +150,4 @@ #define CX86_RCR_BASE 0xdc -#endif /* _UAPI_ASM_X86_PROCESSOR_FLAGS_H */ +#endif /* _ASM_X86_PROCESSOR_FLAGS_H */ diff --git a/arch/x86/include/uapi/asm/ptrace.h b/arch/x86/include/uapi/asm/ptrace.h index ac4b9aa4d999..4dc18e96d5f5 100644 --- a/arch/x86/include/uapi/asm/ptrace.h +++ b/arch/x86/include/uapi/asm/ptrace.h @@ -1,7 +1,7 @@ -#ifndef _UAPI_ASM_X86_PTRACE_H -#define _UAPI_ASM_X86_PTRACE_H +#ifndef _ASM_X86_PTRACE_H +#define _ASM_X86_PTRACE_H -#include <linux/compiler.h> /* For __user */ + /* For */ #include <asm/ptrace-abi.h> #include <asm/processor-flags.h> @@ -12,7 +12,6 @@ /* this struct defines the way the registers are stored on the stack during a system call. */ -#ifndef __KERNEL__ struct pt_regs { long ebx; @@ -34,11 +33,9 @@ struct pt_regs { int xss; }; -#endif /* __KERNEL__ */ #else /* __i386__ */ -#ifndef __KERNEL__ struct pt_regs { unsigned long r15; @@ -68,11 +65,10 @@ struct pt_regs { /* top of stack page */ }; -#endif /* __KERNEL__ */ #endif /* !__i386__ */ #endif /* !__ASSEMBLY__ */ -#endif /* _UAPI_ASM_X86_PTRACE_H */ +#endif /* _ASM_X86_PTRACE_H */ diff --git a/arch/x86/include/uapi/asm/sigcontext.h b/arch/x86/include/uapi/asm/sigcontext.h index d8b9f9081e86..a6193135f319 100644 --- a/arch/x86/include/uapi/asm/sigcontext.h +++ b/arch/x86/include/uapi/asm/sigcontext.h @@ -1,7 +1,7 @@ -#ifndef _UAPI_ASM_X86_SIGCONTEXT_H -#define _UAPI_ASM_X86_SIGCONTEXT_H +#ifndef _ASM_X86_SIGCONTEXT_H +#define _ASM_X86_SIGCONTEXT_H + -#include <linux/compiler.h> #include <linux/types.h> #define FP_XSTATE_MAGIC1 0x46505853U @@ -98,7 +98,6 @@ struct _fpstate { #define X86_FXSR_MAGIC 0x0000 -#ifndef __KERNEL__ /* * User-space might still rely on the old definition: */ @@ -122,11 +121,10 @@ struct sigcontext { unsigned long eflags; unsigned long esp_at_signal; unsigned short ss, __ssh; - struct _fpstate __user *fpstate; + struct _fpstate *fpstate; unsigned long oldmask; unsigned long cr2; }; -#endif /* !__KERNEL__ */ #else /* __i386__ */ @@ -153,7 +151,6 @@ struct _fpstate { }; }; -#ifndef __KERNEL__ /* * User-space might still rely on the old definition: */ @@ -184,13 +181,12 @@ struct sigcontext { __u64 trapno; __u64 oldmask; __u64 cr2; - struct _fpstate __user *fpstate; /* zero when no FPU context */ + struct _fpstate *fpstate; /* zero when no FPU context */ #ifdef __ILP32__ __u32 __fpstate_pad; #endif __u64 reserved1[8]; }; -#endif /* !__KERNEL__ */ #endif /* !__i386__ */ @@ -218,4 +214,4 @@ struct _xstate { /* new processor state extensions go here */ }; -#endif /* _UAPI_ASM_X86_SIGCONTEXT_H */ +#endif /* _ASM_X86_SIGCONTEXT_H */ diff --git a/arch/x86/include/uapi/asm/signal.h b/arch/x86/include/uapi/asm/signal.h index 8264f47cf53e..facdb433a0e9 100644 --- a/arch/x86/include/uapi/asm/signal.h +++ b/arch/x86/include/uapi/asm/signal.h @@ -1,21 +1,19 @@ -#ifndef _UAPI_ASM_X86_SIGNAL_H -#define _UAPI_ASM_X86_SIGNAL_H +#ifndef _ASM_X86_SIGNAL_H +#define _ASM_X86_SIGNAL_H #ifndef __ASSEMBLY__ #include <linux/types.h> #include <linux/time.h> -#include <linux/compiler.h> + /* Avoid too many header ordering problems. */ struct siginfo; -#ifndef __KERNEL__ /* Here we must cater to libcs that poke about in kernel headers. */ #define NSIG 32 typedef unsigned long sigset_t; -#endif /* __KERNEL__ */ #endif /* __ASSEMBLY__ */ @@ -95,7 +93,6 @@ typedef unsigned long sigset_t; #ifndef __ASSEMBLY__ -# ifndef __KERNEL__ /* Here we must cater to libcs that poke about in kernel headers. */ #ifdef __i386__ @@ -122,14 +119,13 @@ struct sigaction { }; #endif /* !__i386__ */ -# endif /* ! __KERNEL__ */ typedef struct sigaltstack { - void __user *ss_sp; + void *ss_sp; int ss_flags; size_t ss_size; } stack_t; #endif /* __ASSEMBLY__ */ -#endif /* _UAPI_ASM_X86_SIGNAL_H */ +#endif /* _ASM_X86_SIGNAL_H */ diff --git a/arch/x86/include/uapi/asm/svm.h b/arch/x86/include/uapi/asm/svm.h index b5d7640abc5d..ff6edd617d1b 100644 --- a/arch/x86/include/uapi/asm/svm.h +++ b/arch/x86/include/uapi/asm/svm.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__SVM_H -#define _UAPI__SVM_H +#ifndef __SVM_H +#define __SVM_H #define SVM_EXIT_READ_CR0 0x000 #define SVM_EXIT_READ_CR3 0x003 @@ -129,4 +129,4 @@ { SVM_EXIT_NPF, "npf" } -#endif /* _UAPI__SVM_H */ +#endif /* __SVM_H */ diff --git a/arch/x86/include/uapi/asm/swab.h b/arch/x86/include/uapi/asm/swab.h index 7f235c7105c1..d1b09bf3d1cb 100644 --- a/arch/x86/include/uapi/asm/swab.h +++ b/arch/x86/include/uapi/asm/swab.h @@ -2,16 +2,16 @@ #define _ASM_X86_SWAB_H #include <linux/types.h> -#include <linux/compiler.h> -static inline __attribute_const__ __u32 __arch_swab32(__u32 val) + +static __inline__ __u32 __arch_swab32(__u32 val) { - asm("bswapl %0" : "=r" (val) : "0" (val)); + __asm__("bswapl %0" : "=r" (val) : "0" (val)); return val; } #define __arch_swab32 __arch_swab32 -static inline __attribute_const__ __u64 __arch_swab64(__u64 val) +static __inline__ __u64 __arch_swab64(__u64 val) { #ifdef __i386__ union { @@ -22,12 +22,12 @@ static inline __attribute_const__ __u64 __arch_swab64(__u64 val) __u64 u; } v; v.u = val; - asm("bswapl %0 ; bswapl %1 ; xchgl %0,%1" + __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1" : "=r" (v.s.a), "=r" (v.s.b) : "0" (v.s.a), "1" (v.s.b)); return v.u; #else /* __i386__ */ - asm("bswapq %0" : "=r" (val) : "0" (val)); + __asm__("bswapq %0" : "=r" (val) : "0" (val)); return val; #endif } diff --git a/arch/x86/include/uapi/asm/unistd.h b/arch/x86/include/uapi/asm/unistd.h index a26df0d75cd0..1f99b12843ae 100644 --- a/arch/x86/include/uapi/asm/unistd.h +++ b/arch/x86/include/uapi/asm/unistd.h @@ -1,10 +1,9 @@ -#ifndef _UAPI_ASM_X86_UNISTD_H -#define _UAPI_ASM_X86_UNISTD_H +#ifndef _ASM_X86_UNISTD_H +#define _ASM_X86_UNISTD_H /* x32 syscall flag bit */ #define __X32_SYSCALL_BIT 0x40000000 -#ifndef __KERNEL__ # ifdef __i386__ # include <asm/unistd_32.h> # elif defined(__ILP32__) @@ -12,6 +11,5 @@ # else # include <asm/unistd_64.h> # endif -#endif -#endif /* _UAPI_ASM_X86_UNISTD_H */ +#endif /* _ASM_X86_UNISTD_H */ diff --git a/arch/x86/include/uapi/asm/vm86.h b/arch/x86/include/uapi/asm/vm86.h index e0b243e9d859..211da113fb7c 100644 --- a/arch/x86/include/uapi/asm/vm86.h +++ b/arch/x86/include/uapi/asm/vm86.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_ASM_X86_VM86_H -#define _UAPI_ASM_X86_VM86_H +#ifndef _ASM_X86_VM86_H +#define _ASM_X86_VM86_H /* * I'm guessing at the VIF/VIP flag usage, but hope that this is how @@ -126,4 +126,4 @@ struct vm86plus_struct { }; -#endif /* _UAPI_ASM_X86_VM86_H */ +#endif /* _ASM_X86_VM86_H */ diff --git a/arch/x86/include/uapi/asm/vmx.h b/arch/x86/include/uapi/asm/vmx.h index 0e79420376eb..89c1fc92838f 100644 --- a/arch/x86/include/uapi/asm/vmx.h +++ b/arch/x86/include/uapi/asm/vmx.h @@ -21,8 +21,8 @@ * Yaniv Kamay <yaniv@qumranet.com> * */ -#ifndef _UAPIVMX_H -#define _UAPIVMX_H +#ifndef VMX_H +#define VMX_H #define VMX_EXIT_REASONS_FAILED_VMENTRY 0x80000000 @@ -116,4 +116,4 @@ { EXIT_REASON_INVD, "INVD" }, \ { EXIT_REASON_INVPCID, "INVPCID" } -#endif /* _UAPIVMX_H */ +#endif /* VMX_H */ diff --git a/arch/x86/include/uapi/asm/vsyscall.h b/arch/x86/include/uapi/asm/vsyscall.h index 85dc1b3825ab..a565bb198087 100644 --- a/arch/x86/include/uapi/asm/vsyscall.h +++ b/arch/x86/include/uapi/asm/vsyscall.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_ASM_X86_VSYSCALL_H -#define _UAPI_ASM_X86_VSYSCALL_H +#ifndef _ASM_X86_VSYSCALL_H +#define _ASM_X86_VSYSCALL_H enum vsyscall_num { __NR_vgettimeofday, @@ -14,4 +14,4 @@ enum vsyscall_num { #define VSYSCALL_ADDR(vsyscall_nr) (VSYSCALL_START+VSYSCALL_SIZE*(vsyscall_nr)) -#endif /* _UAPI_ASM_X86_VSYSCALL_H */ +#endif /* _ASM_X86_VSYSCALL_H */ diff --git a/include/uapi/asm-generic/bitsperlong.h b/include/uapi/asm-generic/bitsperlong.h index 23e6c416b85f..f832c3c92877 100644 --- a/include/uapi/asm-generic/bitsperlong.h +++ b/include/uapi/asm-generic/bitsperlong.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__ASM_GENERIC_BITS_PER_LONG -#define _UAPI__ASM_GENERIC_BITS_PER_LONG +#ifndef __ASM_GENERIC_BITS_PER_LONG +#define __ASM_GENERIC_BITS_PER_LONG /* * There seems to be no way of detecting this automatically from user @@ -12,4 +12,4 @@ #define __BITS_PER_LONG 32 #endif -#endif /* _UAPI__ASM_GENERIC_BITS_PER_LONG */ +#endif /* __ASM_GENERIC_BITS_PER_LONG */ diff --git a/include/uapi/asm-generic/int-l64.h b/include/uapi/asm-generic/int-l64.h index 978f21cae2f4..e271ae2cf266 100644 --- a/include/uapi/asm-generic/int-l64.h +++ b/include/uapi/asm-generic/int-l64.h @@ -5,8 +5,8 @@ * for 64-bit types. */ -#ifndef _UAPI_ASM_GENERIC_INT_L64_H -#define _UAPI_ASM_GENERIC_INT_L64_H +#ifndef _ASM_GENERIC_INT_L64_H +#define _ASM_GENERIC_INT_L64_H #include <asm/bitsperlong.h> @@ -31,4 +31,4 @@ typedef unsigned long __u64; #endif /* __ASSEMBLY__ */ -#endif /* _UAPI_ASM_GENERIC_INT_L64_H */ +#endif /* _ASM_GENERIC_INT_L64_H */ diff --git a/include/uapi/asm-generic/int-ll64.h b/include/uapi/asm-generic/int-ll64.h index a8658b2423ba..0ede0470d73b 100644 --- a/include/uapi/asm-generic/int-ll64.h +++ b/include/uapi/asm-generic/int-ll64.h @@ -5,8 +5,8 @@ * for 64-bit types. */ -#ifndef _UAPI_ASM_GENERIC_INT_LL64_H -#define _UAPI_ASM_GENERIC_INT_LL64_H +#ifndef _ASM_GENERIC_INT_LL64_H +#define _ASM_GENERIC_INT_LL64_H #include <asm/bitsperlong.h> @@ -36,4 +36,4 @@ typedef unsigned long long __u64; #endif /* __ASSEMBLY__ */ -#endif /* _UAPI_ASM_GENERIC_INT_LL64_H */ +#endif /* _ASM_GENERIC_INT_LL64_H */ diff --git a/include/uapi/asm-generic/ioctl.h b/include/uapi/asm-generic/ioctl.h index 7e7c11b52143..0da2c7d18a63 100644 --- a/include/uapi/asm-generic/ioctl.h +++ b/include/uapi/asm-generic/ioctl.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_ASM_GENERIC_IOCTL_H -#define _UAPI_ASM_GENERIC_IOCTL_H +#ifndef _ASM_GENERIC_IOCTL_H +#define _ASM_GENERIC_IOCTL_H /* ioctl command encoding: 32 bits total, command in lower 16 bits, * size of the parameter structure in the lower 14 bits of the @@ -68,9 +68,7 @@ ((nr) << _IOC_NRSHIFT) | \ ((size) << _IOC_SIZESHIFT)) -#ifndef __KERNEL__ #define _IOC_TYPECHECK(t) (sizeof(t)) -#endif /* used to create numbers */ #define _IO(type,nr) _IOC(_IOC_NONE,(type),(nr),0) @@ -95,4 +93,4 @@ #define IOCSIZE_MASK (_IOC_SIZEMASK << _IOC_SIZESHIFT) #define IOCSIZE_SHIFT (_IOC_SIZESHIFT) -#endif /* _UAPI_ASM_GENERIC_IOCTL_H */ +#endif /* _ASM_GENERIC_IOCTL_H */ diff --git a/include/uapi/asm-generic/ioctls.h b/include/uapi/asm-generic/ioctls.h index 143dacbb7d9a..467cdba91a36 100644 --- a/include/uapi/asm-generic/ioctls.h +++ b/include/uapi/asm-generic/ioctls.h @@ -92,7 +92,7 @@ #define TIOCSERSETMULTI 0x545B /* Set multiport config */ #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ -#define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ +#define TIOCGICOUNT 0x545D /* read serial port __inline__ interrupt counts */ /* * Some arches already define FIOQSIZE due to a historical diff --git a/include/uapi/asm-generic/param.h b/include/uapi/asm-generic/param.h index 5becc84396b8..bd69ff3fce47 100644 --- a/include/uapi/asm-generic/param.h +++ b/include/uapi/asm-generic/param.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__ASM_GENERIC_PARAM_H -#define _UAPI__ASM_GENERIC_PARAM_H +#ifndef __ASM_GENERIC_PARAM_H +#define __ASM_GENERIC_PARAM_H #ifndef HZ #define HZ 100 @@ -16,4 +16,4 @@ #define MAXHOSTNAMELEN 64 /* max length of hostname */ -#endif /* _UAPI__ASM_GENERIC_PARAM_H */ +#endif /* __ASM_GENERIC_PARAM_H */ diff --git a/include/uapi/asm-generic/resource.h b/include/uapi/asm-generic/resource.h index f863428796d5..1bd7dd42537b 100644 --- a/include/uapi/asm-generic/resource.h +++ b/include/uapi/asm-generic/resource.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_ASM_GENERIC_RESOURCE_H -#define _UAPI_ASM_GENERIC_RESOURCE_H +#ifndef _ASM_GENERIC_RESOURCE_H +#define _ASM_GENERIC_RESOURCE_H /* * Resource limit IDs @@ -65,4 +65,4 @@ #endif -#endif /* _UAPI_ASM_GENERIC_RESOURCE_H */ +#endif /* _ASM_GENERIC_RESOURCE_H */ diff --git a/include/uapi/asm-generic/siginfo.h b/include/uapi/asm-generic/siginfo.h index ba5be7fdbdfe..62819ef505b8 100644 --- a/include/uapi/asm-generic/siginfo.h +++ b/include/uapi/asm-generic/siginfo.h @@ -1,12 +1,12 @@ -#ifndef _UAPI_ASM_GENERIC_SIGINFO_H -#define _UAPI_ASM_GENERIC_SIGINFO_H +#ifndef _ASM_GENERIC_SIGINFO_H +#define _ASM_GENERIC_SIGINFO_H + -#include <linux/compiler.h> #include <linux/types.h> typedef union sigval { int sival_int; - void __user *sival_ptr; + void *sival_ptr; } sigval_t; /* @@ -86,7 +86,7 @@ typedef struct siginfo { /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */ struct { - void __user *_addr; /* faulting insn/memory ref. */ + void *_addr; /* faulting insn/memory ref. */ #ifdef __ARCH_SI_TRAPNO int _trapno; /* TRAP # which caused the signal */ #endif @@ -101,7 +101,7 @@ typedef struct siginfo { /* SIGSYS */ struct { - void __user *_call_addr; /* calling user insn */ + void *_call_addr; /* calling user insn */ int _syscall; /* triggering system call number */ unsigned int _arch; /* AUDIT_ARCH_* of syscall */ } _sigsys; @@ -139,7 +139,6 @@ typedef struct siginfo { #define si_arch _sifields._sigsys._arch #endif -#ifndef __KERNEL__ #define __SI_KILL 0 #define __SI_TIMER 0 #define __SI_POLL 0 @@ -149,7 +148,6 @@ typedef struct siginfo { #define __SI_MESGQ 0 #define __SI_SYS 0 #define __SI_CODE(T,N) (N) -#endif /* * si_code values @@ -295,4 +293,4 @@ typedef struct sigevent { #define sigev_notify_thread_id _sigev_un._tid -#endif /* _UAPI_ASM_GENERIC_SIGINFO_H */ +#endif /* _ASM_GENERIC_SIGINFO_H */ diff --git a/include/uapi/asm-generic/signal-defs.h b/include/uapi/asm-generic/signal-defs.h index 00f95df54297..04cfb6d81a1e 100644 --- a/include/uapi/asm-generic/signal-defs.h +++ b/include/uapi/asm-generic/signal-defs.h @@ -1,7 +1,7 @@ #ifndef __ASM_GENERIC_SIGNAL_DEFS_H #define __ASM_GENERIC_SIGNAL_DEFS_H -#include <linux/compiler.h> + #ifndef SIG_BLOCK #define SIG_BLOCK 0 /* for blocking signals */ @@ -15,14 +15,14 @@ #ifndef __ASSEMBLY__ typedef void __signalfn_t(int); -typedef __signalfn_t __user *__sighandler_t; +typedef __signalfn_t *__sighandler_t; typedef void __restorefn_t(void); -typedef __restorefn_t __user *__sigrestore_t; +typedef __restorefn_t *__sigrestore_t; -#define SIG_DFL ((__force __sighandler_t)0) /* default signal handling */ -#define SIG_IGN ((__force __sighandler_t)1) /* ignore signal */ -#define SIG_ERR ((__force __sighandler_t)-1) /* error return from signal */ +#define SIG_DFL ((__sighandler_t)0) /* default signal handling */ +#define SIG_IGN ((__sighandler_t)1) /* ignore signal */ +#define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ #endif #endif /* __ASM_GENERIC_SIGNAL_DEFS_H */ diff --git a/include/uapi/asm-generic/signal.h b/include/uapi/asm-generic/signal.h index 9df61f1edb0f..34d2c5fa5434 100644 --- a/include/uapi/asm-generic/signal.h +++ b/include/uapi/asm-generic/signal.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__ASM_GENERIC_SIGNAL_H -#define _UAPI__ASM_GENERIC_SIGNAL_H +#ifndef __ASM_GENERIC_SIGNAL_H +#define __ASM_GENERIC_SIGNAL_H #include <linux/types.h> @@ -97,7 +97,6 @@ typedef unsigned long old_sigset_t; #define __ARCH_HAS_SA_RESTORER #endif -#ifndef __KERNEL__ struct sigaction { __sighandler_t sa_handler; unsigned long sa_flags; @@ -106,14 +105,13 @@ struct sigaction { #endif sigset_t sa_mask; /* mask last for extensibility */ }; -#endif typedef struct sigaltstack { - void __user *ss_sp; + void *ss_sp; int ss_flags; size_t ss_size; } stack_t; #endif /* __ASSEMBLY__ */ -#endif /* _UAPI__ASM_GENERIC_SIGNAL_H */ +#endif /* __ASM_GENERIC_SIGNAL_H */ diff --git a/include/uapi/asm-generic/statfs.h b/include/uapi/asm-generic/statfs.h index 0999647fca13..5241f168816b 100644 --- a/include/uapi/asm-generic/statfs.h +++ b/include/uapi/asm-generic/statfs.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_GENERIC_STATFS_H -#define _UAPI_GENERIC_STATFS_H +#ifndef _GENERIC_STATFS_H +#define _GENERIC_STATFS_H #include <linux/types.h> @@ -80,4 +80,4 @@ struct compat_statfs64 { __u32 f_spare[4]; } ARCH_PACK_COMPAT_STATFS64; -#endif /* _UAPI_GENERIC_STATFS_H */ +#endif /* _GENERIC_STATFS_H */ diff --git a/include/uapi/asm-generic/termios.h b/include/uapi/asm-generic/termios.h index 088176062133..1c1166a88d0b 100644 --- a/include/uapi/asm-generic/termios.h +++ b/include/uapi/asm-generic/termios.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_ASM_GENERIC_TERMIOS_H -#define _UAPI_ASM_GENERIC_TERMIOS_H +#ifndef _ASM_GENERIC_TERMIOS_H +#define _ASM_GENERIC_TERMIOS_H /* * Most architectures have straight copies of the x86 code, with * varying levels of bug fixes on top. Usually it's a good idea @@ -47,4 +47,4 @@ struct termio { /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ -#endif /* _UAPI_ASM_GENERIC_TERMIOS_H */ +#endif /* _ASM_GENERIC_TERMIOS_H */ diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index ece867889cc7..e82075a451b8 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -130,11 +130,11 @@ struct drm_version { int version_minor; /**< Minor version */ int version_patchlevel; /**< Patch level */ size_t name_len; /**< Length of name buffer */ - char __user *name; /**< Name of driver */ + char *name; /**< Name of driver */ size_t date_len; /**< Length of date buffer */ - char __user *date; /**< User-space buffer to hold date */ + char *date; /**< User-space buffer to hold date */ size_t desc_len; /**< Length of desc buffer */ - char __user *desc; /**< User-space buffer to hold desc */ + char *desc; /**< User-space buffer to hold desc */ }; /** @@ -144,12 +144,12 @@ struct drm_version { */ struct drm_unique { size_t unique_len; /**< Length of unique */ - char __user *unique; /**< Unique name for driver instantiation */ + char *unique; /**< Unique name for driver instantiation */ }; struct drm_list { int count; /**< Length of user-space structures */ - struct drm_version __user *version; + struct drm_version *version; }; struct drm_block { @@ -345,7 +345,7 @@ struct drm_buf_desc { */ struct drm_buf_info { int count; /**< Entries in list */ - struct drm_buf_desc __user *list; + struct drm_buf_desc *list; }; /** @@ -353,7 +353,7 @@ struct drm_buf_info { */ struct drm_buf_free { int count; - int __user *list; + int *list; }; /** @@ -365,7 +365,7 @@ struct drm_buf_pub { int idx; /**< Index into the master buffer list */ int total; /**< Buffer size */ int used; /**< Amount of buffer in use (for DMA) */ - void __user *address; /**< Address of buffer */ + void *address; /**< Address of buffer */ }; /** @@ -373,8 +373,8 @@ struct drm_buf_pub { */ struct drm_buf_map { int count; /**< Length of the buffer list */ - void __user *virtual; /**< Mmap'd area in user-virtual */ - struct drm_buf_pub __user *list; /**< Buffer information */ + void *virtual; /**< Mmap'd area in user-virtual */ + struct drm_buf_pub *list; /**< Buffer information */ }; /** @@ -387,13 +387,13 @@ struct drm_buf_map { struct drm_dma { int context; /**< Context handle */ int send_count; /**< Number of buffers to send */ - int __user *send_indices; /**< List of handles to buffers */ - int __user *send_sizes; /**< Lengths of data to send */ + int *send_indices; /**< List of handles to buffers */ + int *send_sizes; /**< Lengths of data to send */ enum drm_dma_flags flags; /**< Flags */ int request_count; /**< Number of buffers requested */ int request_size; /**< Desired size for buffers */ - int __user *request_indices; /**< Buffer information */ - int __user *request_sizes; + int *request_indices; /**< Buffer information */ + int *request_sizes; int granted_count; /**< Number of buffers granted */ }; @@ -417,7 +417,7 @@ struct drm_ctx { */ struct drm_ctx_res { int count; - struct drm_ctx __user *contexts; + struct drm_ctx *contexts; }; /** @@ -786,7 +786,6 @@ struct drm_event_vblank { #define DRM_PRIME_CAP_EXPORT 0x2 /* typedef area */ -#ifndef __KERNEL__ typedef struct drm_clip_rect drm_clip_rect_t; typedef struct drm_drawable_info drm_drawable_info_t; typedef struct drm_tex_region drm_tex_region_t; @@ -828,6 +827,5 @@ typedef struct drm_agp_binding drm_agp_binding_t; typedef struct drm_agp_info drm_agp_info_t; typedef struct drm_scatter_gather drm_scatter_gather_t; typedef struct drm_set_version drm_set_version_t; -#endif #endif diff --git a/include/uapi/drm/drm_sarea.h b/include/uapi/drm/drm_sarea.h index 413a5642d49f..8e7aa2c4cbff 100644 --- a/include/uapi/drm/drm_sarea.h +++ b/include/uapi/drm/drm_sarea.h @@ -77,10 +77,8 @@ struct drm_sarea { drm_context_t dummy_context; }; -#ifndef __KERNEL__ typedef struct drm_sarea_drawable drm_sarea_drawable_t; typedef struct drm_sarea_frame drm_sarea_frame_t; typedef struct drm_sarea drm_sarea_t; -#endif #endif /* _DRM_SAREA_H_ */ diff --git a/include/uapi/drm/exynos_drm.h b/include/uapi/drm/exynos_drm.h index d5844122ff32..14b6c3a77643 100644 --- a/include/uapi/drm/exynos_drm.h +++ b/include/uapi/drm/exynos_drm.h @@ -12,8 +12,8 @@ * option) any later version. */ -#ifndef _UAPI_EXYNOS_DRM_H_ -#define _UAPI_EXYNOS_DRM_H_ +#ifndef _EXYNOS_DRM_H_ +#define _EXYNOS_DRM_H_ #include <drm/drm.h> @@ -387,4 +387,4 @@ struct drm_exynos_ipp_event { __u32 buf_id[EXYNOS_DRM_OPS_MAX]; }; -#endif /* _UAPI_EXYNOS_DRM_H_ */ +#endif /* _EXYNOS_DRM_H_ */ diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h index 55bb5729bd78..d8e2540cd6c1 100644 --- a/include/uapi/drm/i915_drm.h +++ b/include/uapi/drm/i915_drm.h @@ -24,8 +24,8 @@ * */ -#ifndef _UAPI_I915_DRM_H_ -#define _UAPI_I915_DRM_H_ +#ifndef _I915_DRM_H_ +#define _I915_DRM_H_ #include <drm/drm.h> @@ -281,25 +281,25 @@ typedef struct drm_i915_batchbuffer { int DR1; /* hw flags for GFX_OP_DRAWRECT_INFO */ int DR4; /* window origin for GFX_OP_DRAWRECT_INFO */ int num_cliprects; /* mulitpass with multiple cliprects? */ - struct drm_clip_rect __user *cliprects; /* pointer to userspace cliprects */ + struct drm_clip_rect *cliprects; /* pointer to userspace cliprects */ } drm_i915_batchbuffer_t; /* As above, but pass a pointer to userspace buffer which can be * validated by the kernel prior to sending to hardware. */ typedef struct _drm_i915_cmdbuffer { - char __user *buf; /* pointer to userspace command buffer */ + char *buf; /* pointer to userspace command buffer */ int sz; /* nr bytes in buf */ int DR1; /* hw flags for GFX_OP_DRAWRECT_INFO */ int DR4; /* window origin for GFX_OP_DRAWRECT_INFO */ int num_cliprects; /* mulitpass with multiple cliprects? */ - struct drm_clip_rect __user *cliprects; /* pointer to userspace cliprects */ + struct drm_clip_rect *cliprects; /* pointer to userspace cliprects */ } drm_i915_cmdbuffer_t; /* Userspace can request & wait on irq's: */ typedef struct drm_i915_irq_emit { - int __user *irq_seq; + int *irq_seq; } drm_i915_irq_emit_t; typedef struct drm_i915_irq_wait { @@ -338,7 +338,7 @@ typedef struct drm_i915_irq_wait { typedef struct drm_i915_getparam { int param; - int __user *value; + int *value; } drm_i915_getparam_t; /* Ioctl to set kernel params: @@ -361,7 +361,7 @@ typedef struct drm_i915_mem_alloc { int region; int alignment; int size; - int __user *region_offset; /* offset from start of fb or agp */ + int *region_offset; /* offset from start of fb or agp */ } drm_i915_mem_alloc_t; typedef struct drm_i915_mem_free { @@ -1030,4 +1030,4 @@ struct drm_i915_reg_read { __u64 offset; __u64 val; /* Return value */ }; -#endif /* _UAPI_I915_DRM_H_ */ +#endif /* _I915_DRM_H_ */ diff --git a/include/uapi/drm/mga_drm.h b/include/uapi/drm/mga_drm.h index 2375bfd6e5e9..ac95c6274de5 100644 --- a/include/uapi/drm/mga_drm.h +++ b/include/uapi/drm/mga_drm.h @@ -413,7 +413,7 @@ typedef struct _drm_mga_blit { typedef struct drm_mga_getparam { int param; - void __user *value; + void *value; } drm_mga_getparam_t; #endif diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h index d3c62074016d..53b7c718998a 100644 --- a/include/uapi/drm/msm_drm.h +++ b/include/uapi/drm/msm_drm.h @@ -136,7 +136,7 @@ struct drm_msm_gem_submit_cmd { uint32_t size; /* in, cmdstream size */ uint32_t pad; uint32_t nr_relocs; /* in, number of submit_reloc's */ - uint64_t __user relocs; /* in, ptr to array of submit_reloc's */ + uint64_t relocs; /* in, ptr to array of submit_reloc's */ }; /* Each buffer referenced elsewhere in the cmdstream submit (ie. the @@ -167,8 +167,8 @@ struct drm_msm_gem_submit { uint32_t fence; /* out */ uint32_t nr_bos; /* in, number of submit_bo's */ uint32_t nr_cmds; /* in, number of submit_cmd's */ - uint64_t __user bos; /* in, ptr to array of submit_bo's */ - uint64_t __user cmds; /* in, ptr to array of submit_cmd's */ + uint64_t bos; /* in, ptr to array of submit_bo's */ + uint64_t cmds; /* in, ptr to array of submit_cmd's */ }; /* The normal way to synchronize with the GPU is just to CPU_PREP on diff --git a/include/uapi/drm/qxl_drm.h b/include/uapi/drm/qxl_drm.h index ebebd36c4117..5d7de70270bb 100644 --- a/include/uapi/drm/qxl_drm.h +++ b/include/uapi/drm/qxl_drm.h @@ -77,8 +77,8 @@ struct drm_qxl_reloc { }; struct drm_qxl_command { - uint64_t __user command; /* void* */ - uint64_t __user relocs; /* struct drm_qxl_reloc* */ + uint64_t command; /* void* */ + uint64_t relocs; /* struct drm_qxl_reloc* */ uint32_t type; uint32_t command_size; uint32_t relocs_num; @@ -89,7 +89,7 @@ struct drm_qxl_command { struct drm_qxl_execbuffer { uint32_t flags; /* for future use */ uint32_t commands_num; - uint64_t __user commands; /* struct drm_qxl_command* */ + uint64_t commands; /* struct drm_qxl_command* */ }; struct drm_qxl_update_area { diff --git a/include/uapi/drm/r128_drm.h b/include/uapi/drm/r128_drm.h index 8d8878b55f55..ede78ff9d41f 100644 --- a/include/uapi/drm/r128_drm.h +++ b/include/uapi/drm/r128_drm.h @@ -289,14 +289,14 @@ typedef struct drm_r128_depth { R128_READ_PIXELS = 0x04 } func; int n; - int __user *x; - int __user *y; - unsigned int __user *buffer; - unsigned char __user *mask; + int *x; + int *y; + unsigned int *buffer; + unsigned char *mask; } drm_r128_depth_t; typedef struct drm_r128_stipple { - unsigned int __user *mask; + unsigned int *mask; } drm_r128_stipple_t; typedef struct drm_r128_indirect { @@ -320,7 +320,7 @@ typedef struct drm_r128_fullscreen { typedef struct drm_r128_getparam { int param; - void __user *value; + void *value; } drm_r128_getparam_t; #endif diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h index 46d41e8b0dcc..cc1321c9f196 100644 --- a/include/uapi/drm/radeon_drm.h +++ b/include/uapi/drm/radeon_drm.h @@ -611,7 +611,7 @@ typedef struct drm_radeon_clear { unsigned int clear_depth; unsigned int color_mask; unsigned int depth_mask; /* misnamed field: should be stencil */ - drm_radeon_clear_rect_t __user *depth_boxes; + drm_radeon_clear_rect_t *depth_boxes; } drm_radeon_clear_t; typedef struct drm_radeon_vertex { @@ -637,9 +637,9 @@ typedef struct drm_radeon_vertex2 { int idx; /* Index of vertex buffer */ int discard; /* Client finished with buffer? */ int nr_states; - drm_radeon_state_t __user *state; + drm_radeon_state_t *state; int nr_prims; - drm_radeon_prim_t __user *prim; + drm_radeon_prim_t *prim; } drm_radeon_vertex2_t; /* v1.3 - obsoletes drm_radeon_vertex2 @@ -654,15 +654,15 @@ typedef struct drm_radeon_vertex2 { */ typedef struct drm_radeon_cmd_buffer { int bufsz; - char __user *buf; + char *buf; int nbox; - struct drm_clip_rect __user *boxes; + struct drm_clip_rect *boxes; } drm_radeon_cmd_buffer_t; typedef struct drm_radeon_tex_image { unsigned int x, y; /* Blit coordinates */ unsigned int width, height; - const void __user *data; + const void *data; } drm_radeon_tex_image_t; typedef struct drm_radeon_texture { @@ -671,11 +671,11 @@ typedef struct drm_radeon_texture { int format; int width; /* Texture image coordinates */ int height; - drm_radeon_tex_image_t __user *image; + drm_radeon_tex_image_t *image; } drm_radeon_texture_t; typedef struct drm_radeon_stipple { - unsigned int __user *mask; + unsigned int *mask; } drm_radeon_stipple_t; typedef struct drm_radeon_indirect { @@ -715,7 +715,7 @@ typedef struct drm_radeon_indirect { typedef struct drm_radeon_getparam { int param; - void __user *value; + void *value; } drm_radeon_getparam_t; /* 1.6: Set up a memory manager for regions of shared memory: @@ -727,7 +727,7 @@ typedef struct drm_radeon_mem_alloc { int region; int alignment; int size; - int __user *region_offset; /* offset from start of fb or GART */ + int *region_offset; /* offset from start of fb or GART */ } drm_radeon_mem_alloc_t; typedef struct drm_radeon_mem_free { @@ -744,7 +744,7 @@ typedef struct drm_radeon_mem_init_heap { /* 1.6: Userspace can request & wait on irq's: */ typedef struct drm_radeon_irq_emit { - int __user *irq_seq; + int *irq_seq; } drm_radeon_irq_emit_t; typedef struct drm_radeon_irq_wait { diff --git a/include/uapi/drm/savage_drm.h b/include/uapi/drm/savage_drm.h index 818d49be2e6e..a1df939591f7 100644 --- a/include/uapi/drm/savage_drm.h +++ b/include/uapi/drm/savage_drm.h @@ -103,17 +103,17 @@ typedef struct drm_savage_init { typedef union drm_savage_cmd_header drm_savage_cmd_header_t; typedef struct drm_savage_cmdbuf { /* command buffer in client's address space */ - drm_savage_cmd_header_t __user *cmd_addr; + drm_savage_cmd_header_t *cmd_addr; unsigned int size; /* size of the command buffer in 64bit units */ unsigned int dma_idx; /* DMA buffer index to use */ int discard; /* discard DMA buffer when done */ /* vertex buffer in client's address space */ - unsigned int __user *vb_addr; + unsigned int *vb_addr; unsigned int vb_size; /* size of client vertex buffer in bytes */ unsigned int vb_stride; /* stride of vertices in 32bit words */ /* boxes in client's address space */ - struct drm_clip_rect __user *box_addr; + struct drm_clip_rect *box_addr; unsigned int nbox; /* number of clipping boxes */ } drm_savage_cmdbuf_t; diff --git a/include/uapi/drm/tegra_drm.h b/include/uapi/drm/tegra_drm.h index 73bde4eaf16c..480a8da46487 100644 --- a/include/uapi/drm/tegra_drm.h +++ b/include/uapi/drm/tegra_drm.h @@ -14,8 +14,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _UAPI_TEGRA_DRM_H_ -#define _UAPI_TEGRA_DRM_H_ +#ifndef _TEGRA_DRM_H_ +#define _TEGRA_DRM_H_ #include <drm/drm.h> diff --git a/include/uapi/drm/via_drm.h b/include/uapi/drm/via_drm.h index 8b0533ccbd5a..ece3e9fdc7cc 100644 --- a/include/uapi/drm/via_drm.h +++ b/include/uapi/drm/via_drm.h @@ -33,16 +33,14 @@ #ifndef _VIA_DEFINES_ #define _VIA_DEFINES_ -#ifndef __KERNEL__ #include "via_drmclient.h" -#endif #define VIA_NR_SAREA_CLIPRECTS 8 #define VIA_NR_XVMC_PORTS 10 #define VIA_NR_XVMC_LOCKS 5 #define VIA_MAX_CACHELINE_SIZE 64 #define XVMCLOCKPTR(saPriv,lockNo) \ - ((volatile struct drm_hw_lock *)(((((unsigned long) (saPriv)->XvMCLockArea) + \ + ((__volatile__ struct drm_hw_lock *)(((((unsigned long) (saPriv)->XvMCLockArea) + \ (VIA_MAX_CACHELINE_SIZE - 1)) & \ ~(VIA_MAX_CACHELINE_SIZE - 1)) + \ VIA_MAX_CACHELINE_SIZE*(lockNo))) @@ -168,7 +166,7 @@ typedef struct _drm_via_dma_init { } drm_via_dma_init_t; typedef struct _drm_via_cmdbuffer { - char __user *buf; + char *buf; unsigned long size; } drm_via_cmdbuffer_t; diff --git a/include/uapi/linux/acct.h b/include/uapi/linux/acct.h index df2f9a0bba6a..19baf8a5103e 100644 --- a/include/uapi/linux/acct.h +++ b/include/uapi/linux/acct.h @@ -12,8 +12,8 @@ * */ -#ifndef _UAPI_LINUX_ACCT_H -#define _UAPI_LINUX_ACCT_H +#ifndef _LINUX_ACCT_H +#define _LINUX_ACCT_H #include <linux/types.h> @@ -59,9 +59,7 @@ struct acct comp_t ac_majflt; /* Major Pagefaults */ comp_t ac_swaps; /* Number of Swaps */ /* m68k had no padding here. */ -#if !defined(CONFIG_M68K) || !defined(__KERNEL__) __u16 ac_ahz; /* AHZ */ -#endif __u32 ac_exitcode; /* Exitcode */ char ac_comm[ACCT_COMM + 1]; /* Command Name */ __u8 ac_etime_hi; /* Elapsed Time MSB */ @@ -81,11 +79,7 @@ struct acct_v3 __u32 ac_pid; /* Process ID */ __u32 ac_ppid; /* Parent Process ID */ __u32 ac_btime; /* Process Creation Time */ -#ifdef __KERNEL__ - __u32 ac_etime; /* Elapsed Time */ -#else float ac_etime; /* Elapsed Time */ -#endif comp_t ac_utime; /* User Time */ comp_t ac_stime; /* System Time */ comp_t ac_mem; /* Average Memory Usage */ @@ -115,10 +109,8 @@ struct acct_v3 #error unspecified endianness #endif -#ifndef __KERNEL__ #define ACCT_VERSION 2 #define AHZ (HZ) -#endif /* __KERNEL */ -#endif /* _UAPI_LINUX_ACCT_H */ +#endif /* _LINUX_ACCT_H */ diff --git a/include/uapi/linux/adb.h b/include/uapi/linux/adb.h index 0ea1075fc4a0..081502519de1 100644 --- a/include/uapi/linux/adb.h +++ b/include/uapi/linux/adb.h @@ -1,8 +1,8 @@ /* * Definitions for ADB (Apple Desktop Bus) support. */ -#ifndef _UAPI__ADB_H -#define _UAPI__ADB_H +#ifndef __ADB_H +#define __ADB_H /* ADB commands */ #define ADB_BUSRESET 0 @@ -41,4 +41,4 @@ #define ADB_QUERY_GETDEVINFO 1 -#endif /* _UAPI__ADB_H */ +#endif /* __ADB_H */ diff --git a/include/uapi/linux/adfs_fs.h b/include/uapi/linux/adfs_fs.h index a1bf43754ddd..4f506dc1d99a 100644 --- a/include/uapi/linux/adfs_fs.h +++ b/include/uapi/linux/adfs_fs.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_ADFS_FS_H -#define _UAPI_ADFS_FS_H +#ifndef _ADFS_FS_H +#define _ADFS_FS_H #include <linux/types.h> #include <linux/magic.h> @@ -41,4 +41,4 @@ struct adfs_discrecord { #define ADFS_DR_SIZE_BITS (ADFS_DR_SIZE << 3) -#endif /* _UAPI_ADFS_FS_H */ +#endif /* _ADFS_FS_H */ diff --git a/include/uapi/linux/agpgart.h b/include/uapi/linux/agpgart.h index 4e828cf487bc..126eb8aaeef0 100644 --- a/include/uapi/linux/agpgart.h +++ b/include/uapi/linux/agpgart.h @@ -24,8 +24,8 @@ * */ -#ifndef _UAPI_AGP_H -#define _UAPI_AGP_H +#ifndef _AGP_H +#define _AGP_H #define AGPIOC_BASE 'A' #define AGPIOC_INFO _IOR (AGPIOC_BASE, 0, struct agp_info*) @@ -50,7 +50,6 @@ #define FALSE 0 #endif -#ifndef __KERNEL__ #include <linux/types.h> struct agp_version { @@ -108,6 +107,5 @@ typedef struct _agp_unbind { __u32 priority; /* priority for paging out */ } agp_unbind; -#endif /* __KERNEL__ */ -#endif /* _UAPI_AGP_H */ +#endif /* _AGP_H */ diff --git a/include/uapi/linux/apm_bios.h b/include/uapi/linux/apm_bios.h index 724f409adae0..e6e431981f27 100644 --- a/include/uapi/linux/apm_bios.h +++ b/include/uapi/linux/apm_bios.h @@ -12,8 +12,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. */ -#ifndef _UAPI_LINUX_APM_H -#define _UAPI_LINUX_APM_H +#ifndef _LINUX_APM_H +#define _LINUX_APM_H #include <linux/types.h> @@ -132,4 +132,4 @@ struct apm_bios_info { #define APM_IOC_STANDBY _IO('A', 1) #define APM_IOC_SUSPEND _IO('A', 2) -#endif /* _UAPI_LINUX_APM_H */ +#endif /* _LINUX_APM_H */ diff --git a/include/uapi/linux/atalk.h b/include/uapi/linux/atalk.h index 4bcd596e6388..4e5eefe59960 100644 --- a/include/uapi/linux/atalk.h +++ b/include/uapi/linux/atalk.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__LINUX_ATALK_H__ -#define _UAPI__LINUX_ATALK_H__ +#ifndef __LINUX_ATALK_H__ +#define __LINUX_ATALK_H__ #include <linux/types.h> #include <asm/byteorder.h> @@ -41,4 +41,4 @@ struct atalk_netrange { __be16 nr_lastnet; }; -#endif /* _UAPI__LINUX_ATALK_H__ */ +#endif /* __LINUX_ATALK_H__ */ diff --git a/include/uapi/linux/atm.h b/include/uapi/linux/atm.h index 88399db602ac..08e27bebaacf 100644 --- a/include/uapi/linux/atm.h +++ b/include/uapi/linux/atm.h @@ -8,15 +8,15 @@ * Instead, #include <atm.h> */ -#ifndef _UAPI_LINUX_ATM_H -#define _UAPI_LINUX_ATM_H +#ifndef _LINUX_ATM_H +#define _LINUX_ATM_H /* * BEGIN_xx and END_xx markers are used for automatic generation of * documentation. Do not change them. */ -#include <linux/compiler.h> + #include <linux/atmapi.h> #include <linux/atmsap.h> #include <linux/atmioc.h> @@ -233,9 +233,9 @@ static __inline__ int atmpvc_addr_in_use(struct sockaddr_atmpvc addr) struct atmif_sioc { int number; int length; - void __user *arg; + void *arg; }; typedef unsigned short atm_backend_t; -#endif /* _UAPI_LINUX_ATM_H */ +#endif /* _LINUX_ATM_H */ diff --git a/include/uapi/linux/atm_tcp.h b/include/uapi/linux/atm_tcp.h index 914e821da64d..f3aa76a2a7e3 100644 --- a/include/uapi/linux/atm_tcp.h +++ b/include/uapi/linux/atm_tcp.h @@ -4,8 +4,8 @@ /* Written 1997-2000 by Werner Almesberger, EPFL LRC/ICA */ -#ifndef _UAPILINUX_ATM_TCP_H -#define _UAPILINUX_ATM_TCP_H +#ifndef LINUX_ATM_TCP_H +#define LINUX_ATM_TCP_H #include <linux/atmapi.h> #include <linux/atm.h> @@ -58,4 +58,4 @@ struct atmtcp_control { -#endif /* _UAPILINUX_ATM_TCP_H */ +#endif /* LINUX_ATM_TCP_H */ diff --git a/include/uapi/linux/atmdev.h b/include/uapi/linux/atmdev.h index 93e0ec008ca8..8faa8b94091c 100644 --- a/include/uapi/linux/atmdev.h +++ b/include/uapi/linux/atmdev.h @@ -3,8 +3,8 @@ /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ -#ifndef _UAPILINUX_ATMDEV_H -#define _UAPILINUX_ATMDEV_H +#ifndef LINUX_ATMDEV_H +#define LINUX_ATMDEV_H #include <linux/atmapi.h> @@ -158,7 +158,7 @@ struct atm_dev_stats { struct atm_iobuf { int length; - void __user *buffer; + void *buffer; }; /* for ATM_GETCIRANGE / ATM_SETCIRANGE */ @@ -212,4 +212,4 @@ struct atm_cirange { -#endif /* _UAPILINUX_ATMDEV_H */ +#endif /* LINUX_ATMDEV_H */ diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h index 75cef3fd97ad..12c9b2f070c9 100644 --- a/include/uapi/linux/audit.h +++ b/include/uapi/linux/audit.h @@ -21,8 +21,8 @@ * */ -#ifndef _UAPI_LINUX_AUDIT_H_ -#define _UAPI_LINUX_AUDIT_H_ +#ifndef _LINUX_AUDIT_H_ +#define _LINUX_AUDIT_H_ #include <linux/types.h> #include <linux/elf-em.h> @@ -403,4 +403,4 @@ struct audit_rule { /* for AUDIT_LIST, AUDIT_ADD, and AUDIT_DEL */ __u32 values[AUDIT_MAX_FIELDS]; }; -#endif /* _UAPI_LINUX_AUDIT_H_ */ +#endif /* _LINUX_AUDIT_H_ */ diff --git a/include/uapi/linux/auto_fs.h b/include/uapi/linux/auto_fs.h index bb991dfe134f..556e4095f49f 100644 --- a/include/uapi/linux/auto_fs.h +++ b/include/uapi/linux/auto_fs.h @@ -11,13 +11,11 @@ * ----------------------------------------------------------------------- */ -#ifndef _UAPI_LINUX_AUTO_FS_H -#define _UAPI_LINUX_AUTO_FS_H +#ifndef _LINUX_AUTO_FS_H +#define _LINUX_AUTO_FS_H #include <linux/types.h> -#ifndef __KERNEL__ #include <sys/ioctl.h> -#endif /* __KERNEL__ */ /* This file describes autofs v3 */ @@ -71,4 +69,4 @@ struct autofs_packet_expire { #define AUTOFS_IOC_SETTIMEOUT _IOWR(0x93,0x64,unsigned long) #define AUTOFS_IOC_EXPIRE _IOR(0x93,0x65,struct autofs_packet_expire) -#endif /* _UAPI_LINUX_AUTO_FS_H */ +#endif /* _LINUX_AUTO_FS_H */ diff --git a/include/uapi/linux/auto_fs4.h b/include/uapi/linux/auto_fs4.h index e02982fa2953..674aa7536eda 100644 --- a/include/uapi/linux/auto_fs4.h +++ b/include/uapi/linux/auto_fs4.h @@ -35,40 +35,40 @@ #define AUTOFS_TYPE_DIRECT 2U #define AUTOFS_TYPE_OFFSET 4U -static inline void set_autofs_type_indirect(unsigned int *type) +static __inline__ void set_autofs_type_indirect(unsigned int *type) { *type = AUTOFS_TYPE_INDIRECT; return; } -static inline unsigned int autofs_type_indirect(unsigned int type) +static __inline__ unsigned int autofs_type_indirect(unsigned int type) { return (type == AUTOFS_TYPE_INDIRECT); } -static inline void set_autofs_type_direct(unsigned int *type) +static __inline__ void set_autofs_type_direct(unsigned int *type) { *type = AUTOFS_TYPE_DIRECT; return; } -static inline unsigned int autofs_type_direct(unsigned int type) +static __inline__ unsigned int autofs_type_direct(unsigned int type) { return (type == AUTOFS_TYPE_DIRECT); } -static inline void set_autofs_type_offset(unsigned int *type) +static __inline__ void set_autofs_type_offset(unsigned int *type) { *type = AUTOFS_TYPE_OFFSET; return; } -static inline unsigned int autofs_type_offset(unsigned int type) +static __inline__ unsigned int autofs_type_offset(unsigned int type) { return (type == AUTOFS_TYPE_OFFSET); } -static inline unsigned int autofs_type_trigger(unsigned int type) +static __inline__ unsigned int autofs_type_trigger(unsigned int type) { return (type == AUTOFS_TYPE_DIRECT || type == AUTOFS_TYPE_OFFSET); } @@ -78,13 +78,13 @@ static inline unsigned int autofs_type_trigger(unsigned int type) * indicate we want to search for "any" mount in the * autofs_dev_ioctl_ismountpoint() device ioctl function. */ -static inline void set_autofs_type_any(unsigned int *type) +static __inline__ void set_autofs_type_any(unsigned int *type) { *type = AUTOFS_TYPE_ANY; return; } -static inline unsigned int autofs_type_any(unsigned int type) +static __inline__ unsigned int autofs_type_any(unsigned int type) { return (type == AUTOFS_TYPE_ANY); } diff --git a/include/uapi/linux/auxvec.h b/include/uapi/linux/auxvec.h index 835c065cc7e1..4bad5882701c 100644 --- a/include/uapi/linux/auxvec.h +++ b/include/uapi/linux/auxvec.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_AUXVEC_H -#define _UAPI_LINUX_AUXVEC_H +#ifndef _LINUX_AUXVEC_H +#define _LINUX_AUXVEC_H #include <asm/auxvec.h> @@ -33,4 +33,4 @@ #define AT_EXECFN 31 /* filename of program */ -#endif /* _UAPI_LINUX_AUXVEC_H */ +#endif /* _LINUX_AUXVEC_H */ diff --git a/include/uapi/linux/binfmts.h b/include/uapi/linux/binfmts.h index 4eb5972867c0..6416794847dc 100644 --- a/include/uapi/linux/binfmts.h +++ b/include/uapi/linux/binfmts.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_BINFMTS_H -#define _UAPI_LINUX_BINFMTS_H +#ifndef _LINUX_BINFMTS_H +#define _LINUX_BINFMTS_H #include <linux/capability.h> @@ -17,4 +17,4 @@ struct pt_regs; /* sizeof(linux_binprm->buf) */ #define BINPRM_BUF_SIZE 128 -#endif /* _UAPI_LINUX_BINFMTS_H */ +#endif /* _LINUX_BINFMTS_H */ diff --git a/include/uapi/linux/blkpg.h b/include/uapi/linux/blkpg.h index a8519446c111..1b6074e42034 100644 --- a/include/uapi/linux/blkpg.h +++ b/include/uapi/linux/blkpg.h @@ -24,7 +24,7 @@ * * For today, only the partition stuff - aeb, 990515 */ -#include <linux/compiler.h> + #include <linux/ioctl.h> #define BLKPG _IO(0x12,105) @@ -34,7 +34,7 @@ struct blkpg_ioctl_arg { int op; int flags; int datalen; - void __user *data; + void *data; }; /* The subfunctions (for the op field) */ diff --git a/include/uapi/linux/blktrace_api.h b/include/uapi/linux/blktrace_api.h index c590ca6bfbd9..8d0007189c76 100644 --- a/include/uapi/linux/blktrace_api.h +++ b/include/uapi/linux/blktrace_api.h @@ -1,5 +1,5 @@ -#ifndef _UAPIBLKTRACE_H -#define _UAPIBLKTRACE_H +#ifndef BLKTRACE_H +#define BLKTRACE_H #include <linux/types.h> @@ -139,4 +139,4 @@ struct blk_user_trace_setup { __u32 pid; }; -#endif /* _UAPIBLKTRACE_H */ +#endif /* BLKTRACE_H */ diff --git a/include/uapi/linux/bsg.h b/include/uapi/linux/bsg.h index 7a12e1c0f371..3eff40ee9a75 100644 --- a/include/uapi/linux/bsg.h +++ b/include/uapi/linux/bsg.h @@ -1,5 +1,5 @@ -#ifndef _UAPIBSG_H -#define _UAPIBSG_H +#ifndef BSG_H +#define BSG_H #include <linux/types.h> @@ -62,4 +62,4 @@ struct sg_io_v4 { }; -#endif /* _UAPIBSG_H */ +#endif /* BSG_H */ diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h index 45e618921c61..ecaf2e59f0d2 100644 --- a/include/uapi/linux/btrfs.h +++ b/include/uapi/linux/btrfs.h @@ -16,8 +16,8 @@ * Boston, MA 021110-1307, USA. */ -#ifndef _UAPI_LINUX_BTRFS_H -#define _UAPI_LINUX_BTRFS_H +#ifndef _LINUX_BTRFS_H +#define _LINUX_BTRFS_H #include <linux/types.h> #include <linux/ioctl.h> @@ -71,7 +71,7 @@ struct btrfs_ioctl_vol_args_v2 { union { struct { __u64 size; - struct btrfs_qgroup_inherit __user *qgroup_inherit; + struct btrfs_qgroup_inherit *qgroup_inherit; }; __u64 unused[4]; }; @@ -466,7 +466,7 @@ struct btrfs_ioctl_received_subvol_args { struct btrfs_ioctl_send_args { __s64 send_fd; /* in */ __u64 clone_sources_count; /* in */ - __u64 __user *clone_sources; /* in */ + __u64 *clone_sources; /* in */ __u64 parent_root; /* in */ __u64 flags; /* in */ __u64 reserved[4]; /* in */ @@ -487,7 +487,7 @@ enum btrfs_err_code { /* An error code to error string mapping for the kernel * error codes */ -static inline char *btrfs_err_str(enum btrfs_err_code err_code) +static __inline__ char *btrfs_err_str(enum btrfs_err_code err_code) { switch (err_code) { case BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET: @@ -607,4 +607,4 @@ static inline char *btrfs_err_str(enum btrfs_err_code err_code) #define BTRFS_IOC_FILE_EXTENT_SAME _IOWR(BTRFS_IOCTL_MAGIC, 54, \ struct btrfs_ioctl_same_args) -#endif /* _UAPI_LINUX_BTRFS_H */ +#endif /* _LINUX_BTRFS_H */ diff --git a/include/uapi/linux/byteorder/big_endian.h b/include/uapi/linux/byteorder/big_endian.h index 672374450095..a4ef98d9cda5 100644 --- a/include/uapi/linux/byteorder/big_endian.h +++ b/include/uapi/linux/byteorder/big_endian.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_BYTEORDER_BIG_ENDIAN_H -#define _UAPI_LINUX_BYTEORDER_BIG_ENDIAN_H +#ifndef _LINUX_BYTEORDER_BIG_ENDIAN_H +#define _LINUX_BYTEORDER_BIG_ENDIAN_H #ifndef __BIG_ENDIAN #define __BIG_ENDIAN 4321 @@ -11,82 +11,82 @@ #include <linux/types.h> #include <linux/swab.h> -#define __constant_htonl(x) ((__force __be32)(__u32)(x)) -#define __constant_ntohl(x) ((__force __u32)(__be32)(x)) -#define __constant_htons(x) ((__force __be16)(__u16)(x)) -#define __constant_ntohs(x) ((__force __u16)(__be16)(x)) -#define __constant_cpu_to_le64(x) ((__force __le64)___constant_swab64((x))) -#define __constant_le64_to_cpu(x) ___constant_swab64((__force __u64)(__le64)(x)) -#define __constant_cpu_to_le32(x) ((__force __le32)___constant_swab32((x))) -#define __constant_le32_to_cpu(x) ___constant_swab32((__force __u32)(__le32)(x)) -#define __constant_cpu_to_le16(x) ((__force __le16)___constant_swab16((x))) -#define __constant_le16_to_cpu(x) ___constant_swab16((__force __u16)(__le16)(x)) -#define __constant_cpu_to_be64(x) ((__force __be64)(__u64)(x)) -#define __constant_be64_to_cpu(x) ((__force __u64)(__be64)(x)) -#define __constant_cpu_to_be32(x) ((__force __be32)(__u32)(x)) -#define __constant_be32_to_cpu(x) ((__force __u32)(__be32)(x)) -#define __constant_cpu_to_be16(x) ((__force __be16)(__u16)(x)) -#define __constant_be16_to_cpu(x) ((__force __u16)(__be16)(x)) -#define __cpu_to_le64(x) ((__force __le64)__swab64((x))) -#define __le64_to_cpu(x) __swab64((__force __u64)(__le64)(x)) -#define __cpu_to_le32(x) ((__force __le32)__swab32((x))) -#define __le32_to_cpu(x) __swab32((__force __u32)(__le32)(x)) -#define __cpu_to_le16(x) ((__force __le16)__swab16((x))) -#define __le16_to_cpu(x) __swab16((__force __u16)(__le16)(x)) -#define __cpu_to_be64(x) ((__force __be64)(__u64)(x)) -#define __be64_to_cpu(x) ((__force __u64)(__be64)(x)) -#define __cpu_to_be32(x) ((__force __be32)(__u32)(x)) -#define __be32_to_cpu(x) ((__force __u32)(__be32)(x)) -#define __cpu_to_be16(x) ((__force __be16)(__u16)(x)) -#define __be16_to_cpu(x) ((__force __u16)(__be16)(x)) +#define __constant_htonl(x) ((__be32)(__u32)(x)) +#define __constant_ntohl(x) ((__u32)(__be32)(x)) +#define __constant_htons(x) ((__be16)(__u16)(x)) +#define __constant_ntohs(x) ((__u16)(__be16)(x)) +#define __constant_cpu_to_le64(x) ((__le64)___constant_swab64((x))) +#define __constant_le64_to_cpu(x) ___constant_swab64((__u64)(__le64)(x)) +#define __constant_cpu_to_le32(x) ((__le32)___constant_swab32((x))) +#define __constant_le32_to_cpu(x) ___constant_swab32((__u32)(__le32)(x)) +#define __constant_cpu_to_le16(x) ((__le16)___constant_swab16((x))) +#define __constant_le16_to_cpu(x) ___constant_swab16((__u16)(__le16)(x)) +#define __constant_cpu_to_be64(x) ((__be64)(__u64)(x)) +#define __constant_be64_to_cpu(x) ((__u64)(__be64)(x)) +#define __constant_cpu_to_be32(x) ((__be32)(__u32)(x)) +#define __constant_be32_to_cpu(x) ((__u32)(__be32)(x)) +#define __constant_cpu_to_be16(x) ((__be16)(__u16)(x)) +#define __constant_be16_to_cpu(x) ((__u16)(__be16)(x)) +#define __cpu_to_le64(x) ((__le64)__swab64((x))) +#define __le64_to_cpu(x) __swab64((__u64)(__le64)(x)) +#define __cpu_to_le32(x) ((__le32)__swab32((x))) +#define __le32_to_cpu(x) __swab32((__u32)(__le32)(x)) +#define __cpu_to_le16(x) ((__le16)__swab16((x))) +#define __le16_to_cpu(x) __swab16((__u16)(__le16)(x)) +#define __cpu_to_be64(x) ((__be64)(__u64)(x)) +#define __be64_to_cpu(x) ((__u64)(__be64)(x)) +#define __cpu_to_be32(x) ((__be32)(__u32)(x)) +#define __be32_to_cpu(x) ((__u32)(__be32)(x)) +#define __cpu_to_be16(x) ((__be16)(__u16)(x)) +#define __be16_to_cpu(x) ((__u16)(__be16)(x)) -static inline __le64 __cpu_to_le64p(const __u64 *p) +static __inline__ __le64 __cpu_to_le64p(const __u64 *p) { - return (__force __le64)__swab64p(p); + return (__le64)__swab64p(p); } -static inline __u64 __le64_to_cpup(const __le64 *p) +static __inline__ __u64 __le64_to_cpup(const __le64 *p) { return __swab64p((__u64 *)p); } -static inline __le32 __cpu_to_le32p(const __u32 *p) +static __inline__ __le32 __cpu_to_le32p(const __u32 *p) { - return (__force __le32)__swab32p(p); + return (__le32)__swab32p(p); } -static inline __u32 __le32_to_cpup(const __le32 *p) +static __inline__ __u32 __le32_to_cpup(const __le32 *p) { return __swab32p((__u32 *)p); } -static inline __le16 __cpu_to_le16p(const __u16 *p) +static __inline__ __le16 __cpu_to_le16p(const __u16 *p) { - return (__force __le16)__swab16p(p); + return (__le16)__swab16p(p); } -static inline __u16 __le16_to_cpup(const __le16 *p) +static __inline__ __u16 __le16_to_cpup(const __le16 *p) { return __swab16p((__u16 *)p); } -static inline __be64 __cpu_to_be64p(const __u64 *p) +static __inline__ __be64 __cpu_to_be64p(const __u64 *p) { - return (__force __be64)*p; + return (__be64)*p; } -static inline __u64 __be64_to_cpup(const __be64 *p) +static __inline__ __u64 __be64_to_cpup(const __be64 *p) { - return (__force __u64)*p; + return (__u64)*p; } -static inline __be32 __cpu_to_be32p(const __u32 *p) +static __inline__ __be32 __cpu_to_be32p(const __u32 *p) { - return (__force __be32)*p; + return (__be32)*p; } -static inline __u32 __be32_to_cpup(const __be32 *p) +static __inline__ __u32 __be32_to_cpup(const __be32 *p) { - return (__force __u32)*p; + return (__u32)*p; } -static inline __be16 __cpu_to_be16p(const __u16 *p) +static __inline__ __be16 __cpu_to_be16p(const __u16 *p) { - return (__force __be16)*p; + return (__be16)*p; } -static inline __u16 __be16_to_cpup(const __be16 *p) +static __inline__ __u16 __be16_to_cpup(const __be16 *p) { - return (__force __u16)*p; + return (__u16)*p; } #define __cpu_to_le64s(x) __swab64s((x)) #define __le64_to_cpus(x) __swab64s((x)) @@ -102,4 +102,4 @@ static inline __u16 __be16_to_cpup(const __be16 *p) #define __be16_to_cpus(x) do { (void)(x); } while (0) -#endif /* _UAPI_LINUX_BYTEORDER_BIG_ENDIAN_H */ +#endif /* _LINUX_BYTEORDER_BIG_ENDIAN_H */ diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h index d876736a0017..74e8a159117c 100644 --- a/include/uapi/linux/byteorder/little_endian.h +++ b/include/uapi/linux/byteorder/little_endian.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_BYTEORDER_LITTLE_ENDIAN_H -#define _UAPI_LINUX_BYTEORDER_LITTLE_ENDIAN_H +#ifndef _LINUX_BYTEORDER_LITTLE_ENDIAN_H +#define _LINUX_BYTEORDER_LITTLE_ENDIAN_H #ifndef __LITTLE_ENDIAN #define __LITTLE_ENDIAN 1234 @@ -11,80 +11,80 @@ #include <linux/types.h> #include <linux/swab.h> -#define __constant_htonl(x) ((__force __be32)___constant_swab32((x))) -#define __constant_ntohl(x) ___constant_swab32((__force __be32)(x)) -#define __constant_htons(x) ((__force __be16)___constant_swab16((x))) -#define __constant_ntohs(x) ___constant_swab16((__force __be16)(x)) -#define __constant_cpu_to_le64(x) ((__force __le64)(__u64)(x)) -#define __constant_le64_to_cpu(x) ((__force __u64)(__le64)(x)) -#define __constant_cpu_to_le32(x) ((__force __le32)(__u32)(x)) -#define __constant_le32_to_cpu(x) ((__force __u32)(__le32)(x)) -#define __constant_cpu_to_le16(x) ((__force __le16)(__u16)(x)) -#define __constant_le16_to_cpu(x) ((__force __u16)(__le16)(x)) -#define __constant_cpu_to_be64(x) ((__force __be64)___constant_swab64((x))) -#define __constant_be64_to_cpu(x) ___constant_swab64((__force __u64)(__be64)(x)) -#define __constant_cpu_to_be32(x) ((__force __be32)___constant_swab32((x))) -#define __constant_be32_to_cpu(x) ___constant_swab32((__force __u32)(__be32)(x)) -#define __constant_cpu_to_be16(x) ((__force __be16)___constant_swab16((x))) -#define __constant_be16_to_cpu(x) ___constant_swab16((__force __u16)(__be16)(x)) -#define __cpu_to_le64(x) ((__force __le64)(__u64)(x)) -#define __le64_to_cpu(x) ((__force __u64)(__le64)(x)) -#define __cpu_to_le32(x) ((__force __le32)(__u32)(x)) -#define __le32_to_cpu(x) ((__force __u32)(__le32)(x)) -#define __cpu_to_le16(x) ((__force __le16)(__u16)(x)) -#define __le16_to_cpu(x) ((__force __u16)(__le16)(x)) -#define __cpu_to_be64(x) ((__force __be64)__swab64((x))) -#define __be64_to_cpu(x) __swab64((__force __u64)(__be64)(x)) -#define __cpu_to_be32(x) ((__force __be32)__swab32((x))) -#define __be32_to_cpu(x) __swab32((__force __u32)(__be32)(x)) -#define __cpu_to_be16(x) ((__force __be16)__swab16((x))) -#define __be16_to_cpu(x) __swab16((__force __u16)(__be16)(x)) +#define __constant_htonl(x) ((__be32)___constant_swab32((x))) +#define __constant_ntohl(x) ___constant_swab32((__be32)(x)) +#define __constant_htons(x) ((__be16)___constant_swab16((x))) +#define __constant_ntohs(x) ___constant_swab16((__be16)(x)) +#define __constant_cpu_to_le64(x) ((__le64)(__u64)(x)) +#define __constant_le64_to_cpu(x) ((__u64)(__le64)(x)) +#define __constant_cpu_to_le32(x) ((__le32)(__u32)(x)) +#define __constant_le32_to_cpu(x) ((__u32)(__le32)(x)) +#define __constant_cpu_to_le16(x) ((__le16)(__u16)(x)) +#define __constant_le16_to_cpu(x) ((__u16)(__le16)(x)) +#define __constant_cpu_to_be64(x) ((__be64)___constant_swab64((x))) +#define __constant_be64_to_cpu(x) ___constant_swab64((__u64)(__be64)(x)) +#define __constant_cpu_to_be32(x) ((__be32)___constant_swab32((x))) +#define __constant_be32_to_cpu(x) ___constant_swab32((__u32)(__be32)(x)) +#define __constant_cpu_to_be16(x) ((__be16)___constant_swab16((x))) +#define __constant_be16_to_cpu(x) ___constant_swab16((__u16)(__be16)(x)) +#define __cpu_to_le64(x) ((__le64)(__u64)(x)) +#define __le64_to_cpu(x) ((__u64)(__le64)(x)) +#define __cpu_to_le32(x) ((__le32)(__u32)(x)) +#define __le32_to_cpu(x) ((__u32)(__le32)(x)) +#define __cpu_to_le16(x) ((__le16)(__u16)(x)) +#define __le16_to_cpu(x) ((__u16)(__le16)(x)) +#define __cpu_to_be64(x) ((__be64)__swab64((x))) +#define __be64_to_cpu(x) __swab64((__u64)(__be64)(x)) +#define __cpu_to_be32(x) ((__be32)__swab32((x))) +#define __be32_to_cpu(x) __swab32((__u32)(__be32)(x)) +#define __cpu_to_be16(x) ((__be16)__swab16((x))) +#define __be16_to_cpu(x) __swab16((__u16)(__be16)(x)) -static inline __le64 __cpu_to_le64p(const __u64 *p) +static __inline__ __le64 __cpu_to_le64p(const __u64 *p) { - return (__force __le64)*p; + return (__le64)*p; } -static inline __u64 __le64_to_cpup(const __le64 *p) +static __inline__ __u64 __le64_to_cpup(const __le64 *p) { - return (__force __u64)*p; + return (__u64)*p; } -static inline __le32 __cpu_to_le32p(const __u32 *p) +static __inline__ __le32 __cpu_to_le32p(const __u32 *p) { - return (__force __le32)*p; + return (__le32)*p; } -static inline __u32 __le32_to_cpup(const __le32 *p) +static __inline__ __u32 __le32_to_cpup(const __le32 *p) { - return (__force __u32)*p; + return (__u32)*p; } -static inline __le16 __cpu_to_le16p(const __u16 *p) +static __inline__ __le16 __cpu_to_le16p(const __u16 *p) { - return (__force __le16)*p; + return (__le16)*p; } -static inline __u16 __le16_to_cpup(const __le16 *p) +static __inline__ __u16 __le16_to_cpup(const __le16 *p) { - return (__force __u16)*p; + return (__u16)*p; } -static inline __be64 __cpu_to_be64p(const __u64 *p) +static __inline__ __be64 __cpu_to_be64p(const __u64 *p) { - return (__force __be64)__swab64p(p); + return (__be64)__swab64p(p); } -static inline __u64 __be64_to_cpup(const __be64 *p) +static __inline__ __u64 __be64_to_cpup(const __be64 *p) { return __swab64p((__u64 *)p); } -static inline __be32 __cpu_to_be32p(const __u32 *p) +static __inline__ __be32 __cpu_to_be32p(const __u32 *p) { - return (__force __be32)__swab32p(p); + return (__be32)__swab32p(p); } -static inline __u32 __be32_to_cpup(const __be32 *p) +static __inline__ __u32 __be32_to_cpup(const __be32 *p) { return __swab32p((__u32 *)p); } -static inline __be16 __cpu_to_be16p(const __u16 *p) +static __inline__ __be16 __cpu_to_be16p(const __u16 *p) { - return (__force __be16)__swab16p(p); + return (__be16)__swab16p(p); } -static inline __u16 __be16_to_cpup(const __be16 *p) +static __inline__ __u16 __be16_to_cpup(const __be16 *p) { return __swab16p((__u16 *)p); } @@ -102,4 +102,4 @@ static inline __u16 __be16_to_cpup(const __be16 *p) #define __be16_to_cpus(x) __swab16s((x)) -#endif /* _UAPI_LINUX_BYTEORDER_LITTLE_ENDIAN_H */ +#endif /* _LINUX_BYTEORDER_LITTLE_ENDIAN_H */ diff --git a/include/uapi/linux/capability.h b/include/uapi/linux/capability.h index ba478fa3012e..251ce74f2880 100644 --- a/include/uapi/linux/capability.h +++ b/include/uapi/linux/capability.h @@ -10,8 +10,8 @@ * ftp://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/ */ -#ifndef _UAPI_LINUX_CAPABILITY_H -#define _UAPI_LINUX_CAPABILITY_H +#ifndef _LINUX_CAPABILITY_H +#define _LINUX_CAPABILITY_H #include <linux/types.h> @@ -40,13 +40,13 @@ struct task_struct; typedef struct __user_cap_header_struct { __u32 version; int pid; -} __user *cap_user_header_t; +} *cap_user_header_t; typedef struct __user_cap_data_struct { __u32 effective; __u32 permitted; __u32 inheritable; -} __user *cap_user_data_t; +} *cap_user_data_t; #define VFS_CAP_REVISION_MASK 0xFF000000 @@ -74,7 +74,6 @@ struct vfs_cap_data { } data[VFS_CAP_U32]; }; -#ifndef __KERNEL__ /* * Backwardly compatible definition for source code - trapped in a @@ -84,7 +83,6 @@ struct vfs_cap_data { #define _LINUX_CAPABILITY_VERSION _LINUX_CAPABILITY_VERSION_1 #define _LINUX_CAPABILITY_U32S _LINUX_CAPABILITY_U32S_1 -#endif /** @@ -355,4 +353,4 @@ struct vfs_cap_data { #define CAP_TO_MASK(x) (1 << ((x) & 31)) /* mask for indexed __u32 */ -#endif /* _UAPI_LINUX_CAPABILITY_H */ +#endif /* _LINUX_CAPABILITY_H */ diff --git a/include/uapi/linux/capi.h b/include/uapi/linux/capi.h index 65100d6cb89b..2e00af4a3d37 100644 --- a/include/uapi/linux/capi.h +++ b/include/uapi/linux/capi.h @@ -14,9 +14,7 @@ #include <linux/types.h> #include <linux/ioctl.h> -#ifndef __KERNEL__ #include <linux/kernelcapi.h> -#endif /* * CAPI_REGISTER @@ -77,7 +75,7 @@ typedef struct capi_profile { typedef struct capi_manufacturer_cmd { unsigned long cmd; - void __user *data; + void *data; } capi_manufacturer_cmd; /* diff --git a/include/uapi/linux/cciss_ioctl.h b/include/uapi/linux/cciss_ioctl.h index bb0b9ddf7eeb..d85fd2b1b530 100644 --- a/include/uapi/linux/cciss_ioctl.h +++ b/include/uapi/linux/cciss_ioctl.h @@ -1,5 +1,5 @@ -#ifndef _UAPICCISS_IOCTLH -#define _UAPICCISS_IOCTLH +#ifndef CCISS_IOCTLH +#define CCISS_IOCTLH #include <linux/types.h> #include <linux/ioctl.h> @@ -42,7 +42,7 @@ typedef struct _IOCTL_Command_struct { RequestBlock_struct Request; ErrorInfo_struct error_info; WORD buf_size; /* size in bytes of the buf */ - BYTE __user *buf; + BYTE *buf; } IOCTL_Command_struct; typedef struct _BIG_IOCTL_Command_struct { @@ -52,7 +52,7 @@ typedef struct _BIG_IOCTL_Command_struct { DWORD malloc_size; /* < MAX_KMALLOC_SIZE in cciss.c */ DWORD buf_size; /* size in bytes of the buf */ /* < malloc_size * MAXSGENTRIES */ - BYTE __user *buf; + BYTE *buf; } BIG_IOCTL_Command_struct; typedef struct _LogvolInfo_struct{ @@ -85,4 +85,4 @@ typedef struct _LogvolInfo_struct{ #define CCISS_GETLUNINFO _IOR(CCISS_IOC_MAGIC, 17, LogvolInfo_struct) #define CCISS_BIG_PASSTHRU _IOWR(CCISS_IOC_MAGIC, 18, BIG_IOCTL_Command_struct) -#endif /* _UAPICCISS_IOCTLH */ +#endif /* CCISS_IOCTLH */ diff --git a/include/uapi/linux/cdrom.h b/include/uapi/linux/cdrom.h index bd17ad5aa06d..db59b9b1b8e0 100644 --- a/include/uapi/linux/cdrom.h +++ b/include/uapi/linux/cdrom.h @@ -8,8 +8,8 @@ * 1998-2002 Jens Axboe, axboe@suse.de */ -#ifndef _UAPI_LINUX_CDROM_H -#define _UAPI_LINUX_CDROM_H +#ifndef _LINUX_CDROM_H +#define _LINUX_CDROM_H #include <linux/types.h> #include <asm/byteorder.h> @@ -240,7 +240,7 @@ struct cdrom_read_audio union cdrom_addr addr; /* frame address */ __u8 addr_format; /* CDROM_LBA or CDROM_MSF */ int nframes; /* number of 2352-byte-frames to read at once */ - __u8 __user *buf; /* frame buffer (size: nframes*2352 bytes) */ + __u8 *buf; /* frame buffer (size: nframes*2352 bytes) */ }; /* This struct is used with the CDROMMULTISESSION ioctl */ @@ -281,14 +281,14 @@ struct cdrom_blk struct cdrom_generic_command { unsigned char cmd[CDROM_PACKET_SIZE]; - unsigned char __user *buffer; + unsigned char *buffer; unsigned int buflen; int stat; - struct request_sense __user *sense; + struct request_sense *sense; unsigned char data_direction; int quiet; int timeout; - void __user *reserved[1]; /* unused, actually */ + void *reserved[1]; /* unused, actually */ }; /* @@ -943,4 +943,4 @@ struct rm_feature_desc { __u8 reserved4; }; -#endif /* _UAPI_LINUX_CDROM_H */ +#endif /* _LINUX_CDROM_H */ diff --git a/include/uapi/linux/chio.h b/include/uapi/linux/chio.h index d9bac7f97282..e97cd98a5555 100644 --- a/include/uapi/linux/chio.h +++ b/include/uapi/linux/chio.h @@ -96,7 +96,7 @@ struct changer_position { */ struct changer_element_status { int ces_type; - unsigned char __user *ces_data; + unsigned char *ces_data; }; #define CESTATUS_FULL 0x01 /* full */ #define CESTATUS_IMPEXP 0x02 /* media was imported (inserted by sysop) */ diff --git a/include/uapi/linux/cm4000_cs.h b/include/uapi/linux/cm4000_cs.h index 1217f751a1bc..f912e7498a0c 100644 --- a/include/uapi/linux/cm4000_cs.h +++ b/include/uapi/linux/cm4000_cs.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_CM4000_H_ -#define _UAPI_CM4000_H_ +#ifndef _CM4000_H_ +#define _CM4000_H_ #include <linux/types.h> #include <linux/ioctl.h> @@ -60,4 +60,4 @@ typedef struct ptsreq { #define CM_BAD_CARD 0x20 -#endif /* _UAPI_CM4000_H_ */ +#endif /* _CM4000_H_ */ diff --git a/include/uapi/linux/cn_proc.h b/include/uapi/linux/cn_proc.h index f6c271035bbd..bf22f5caaa0f 100644 --- a/include/uapi/linux/cn_proc.h +++ b/include/uapi/linux/cn_proc.h @@ -15,8 +15,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef _UAPICN_PROC_H -#define _UAPICN_PROC_H +#ifndef CN_PROC_H +#define CN_PROC_H #include <linux/types.h> @@ -126,4 +126,4 @@ struct proc_event { } event_data; }; -#endif /* _UAPICN_PROC_H */ +#endif /* CN_PROC_H */ diff --git a/include/uapi/linux/coda.h b/include/uapi/linux/coda.h index 695fade33c64..a5e4b99e4376 100644 --- a/include/uapi/linux/coda.h +++ b/include/uapi/linux/coda.h @@ -56,8 +56,8 @@ Mellon the rights to redistribute these changes without encumbrance. * Peter Braam, Aug 1996 */ -#ifndef _UAPI_CODA_HEADER_ -#define _UAPI_CODA_HEADER_ +#ifndef _CODA_HEADER_ +#define _CODA_HEADER_ /* Catch new _KERNEL defn for NetBSD and DJGPP/__CYGWIN32__ */ @@ -84,7 +84,7 @@ typedef unsigned __int64 u_quad_t; typedef unsigned long long u_quad_t; #endif -#define inline +#define __inline__ struct timespec { long ts_sec; @@ -100,12 +100,10 @@ typedef unsigned long long u_quad_t; #if defined(__linux__) #include <linux/time.h> #define cdev_t u_quad_t -#ifndef __KERNEL__ #if !defined(_UQUAD_T_) && (!defined(__GLIBC__) || __GLIBC__ < 2) #define _UQUAD_T_ 1 typedef unsigned long long u_quad_t; #endif -#endif /* __KERNEL__ */ #else #define cdev_t dev_t #endif @@ -615,9 +613,6 @@ struct coda_open_by_fd_out { struct coda_out_hdr oh; int fd; -#ifdef __KERNEL__ - struct file *fh; /* not passed from userspace but used in-kernel only */ -#endif }; /* coda_open_by_path: */ @@ -713,14 +708,14 @@ union coda_downcalls { #define PIOCPARM_MASK 0x0000ffff struct ViceIoctl { - void __user *in; /* Data to be transferred in */ - void __user *out; /* Data to be transferred out */ + void *in; /* Data to be transferred in */ + void *out; /* Data to be transferred out */ u_short in_size; /* Size of input buffer <= 2K */ u_short out_size; /* Maximum size of output buffer, <= 2K */ }; struct PioctlData { - const char __user *path; + const char *path; int follow; struct ViceIoctl vi; }; @@ -738,4 +733,4 @@ struct coda_mount_data { int fd; /* Opened device */ }; -#endif /* _UAPI_CODA_HEADER_ */ +#endif /* _CODA_HEADER_ */ diff --git a/include/uapi/linux/coda_psdev.h b/include/uapi/linux/coda_psdev.h index 79d05981fc4b..46e12d8e02d0 100644 --- a/include/uapi/linux/coda_psdev.h +++ b/include/uapi/linux/coda_psdev.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__CODA_PSDEV_H -#define _UAPI__CODA_PSDEV_H +#ifndef __CODA_PSDEV_H +#define __CODA_PSDEV_H #include <linux/magic.h> @@ -24,4 +24,4 @@ struct upc_req { #define CODA_REQ_WRITE 0x4 #define CODA_REQ_ABORT 0x8 -#endif /* _UAPI__CODA_PSDEV_H */ +#endif /* __CODA_PSDEV_H */ diff --git a/include/uapi/linux/connector.h b/include/uapi/linux/connector.h index 4cb283505e45..caf94686b371 100644 --- a/include/uapi/linux/connector.h +++ b/include/uapi/linux/connector.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _UAPI__CONNECTOR_H -#define _UAPI__CONNECTOR_H +#ifndef __CONNECTOR_H +#define __CONNECTOR_H #include <linux/types.h> @@ -77,4 +77,4 @@ struct cn_msg { __u8 data[0]; }; -#endif /* _UAPI__CONNECTOR_H */ +#endif /* __CONNECTOR_H */ diff --git a/include/uapi/linux/cramfs_fs.h b/include/uapi/linux/cramfs_fs.h index e4611a9b9243..9cada1adbade 100644 --- a/include/uapi/linux/cramfs_fs.h +++ b/include/uapi/linux/cramfs_fs.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__CRAMFS_H -#define _UAPI__CRAMFS_H +#ifndef __CRAMFS_H +#define __CRAMFS_H #include <linux/types.h> #include <linux/magic.h> @@ -85,4 +85,4 @@ struct cramfs_super { | CRAMFS_FLAG_SHIFTED_ROOT_OFFSET ) -#endif /* _UAPI__CRAMFS_H */ +#endif /* __CRAMFS_H */ diff --git a/include/uapi/linux/cuda.h b/include/uapi/linux/cuda.h index 286f9f10fce8..83d9f932dcdc 100644 --- a/include/uapi/linux/cuda.h +++ b/include/uapi/linux/cuda.h @@ -5,8 +5,8 @@ * Copyright (C) 1996 Paul Mackerras. */ -#ifndef _UAPI_LINUX_CUDA_H -#define _UAPI_LINUX_CUDA_H +#ifndef _LINUX_CUDA_H +#define _LINUX_CUDA_H /* CUDA commands (2nd byte) */ #define CUDA_WARM_START 0 @@ -30,4 +30,4 @@ #define CUDA_GET_SET_IIC 0x22 -#endif /* _UAPI_LINUX_CUDA_H */ +#endif /* _LINUX_CUDA_H */ diff --git a/include/uapi/linux/cyclades.h b/include/uapi/linux/cyclades.h index 12b587aa361c..145e3c8b8335 100644 --- a/include/uapi/linux/cyclades.h +++ b/include/uapi/linux/cyclades.h @@ -64,8 +64,8 @@ * */ -#ifndef _UAPI_LINUX_CYCLADES_H -#define _UAPI_LINUX_CYCLADES_H +#ifndef _LINUX_CYCLADES_H +#define _LINUX_CYCLADES_H #include <linux/types.h> @@ -490,4 +490,4 @@ struct ZFW_CTRL { /****************** ****************** *******************/ #endif -#endif /* _UAPI_LINUX_CYCLADES_H */ +#endif /* _LINUX_CYCLADES_H */ diff --git a/include/uapi/linux/dccp.h b/include/uapi/linux/dccp.h index 52a9cd7307e7..d0e22260eb1d 100644 --- a/include/uapi/linux/dccp.h +++ b/include/uapi/linux/dccp.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_DCCP_H -#define _UAPI_LINUX_DCCP_H +#ifndef _LINUX_DCCP_H +#define _LINUX_DCCP_H #include <linux/types.h> #include <asm/byteorder.h> @@ -114,7 +114,7 @@ enum dccp_pkt_type { #define DCCP_NR_PKT_TYPES DCCP_PKT_INVALID -static inline unsigned int dccp_packet_hdr_len(const __u8 type) +static __inline__ unsigned int dccp_packet_hdr_len(const __u8 type) { if (type == DCCP_PKT_DATA) return 0; @@ -234,4 +234,4 @@ enum dccp_packet_dequeueing_policy { #define DCCP_SERVICE_LIST_MAX_LEN 32 -#endif /* _UAPI_LINUX_DCCP_H */ +#endif /* _LINUX_DCCP_H */ diff --git a/include/uapi/linux/dlm.h b/include/uapi/linux/dlm.h index 1f73cc06168f..6120d505d9cf 100644 --- a/include/uapi/linux/dlm.h +++ b/include/uapi/linux/dlm.h @@ -11,8 +11,8 @@ ******************************************************************************* ******************************************************************************/ -#ifndef _UAPI__DLM_DOT_H__ -#define _UAPI__DLM_DOT_H__ +#ifndef __DLM_DOT_H__ +#define __DLM_DOT_H__ /* * Interface to Distributed Lock Manager (DLM) @@ -72,4 +72,4 @@ struct dlm_lksb { #define DLM_LSFL_NEWEXCL 0x00000008 -#endif /* _UAPI__DLM_DOT_H__ */ +#endif /* __DLM_DOT_H__ */ diff --git a/include/uapi/linux/dlm_device.h b/include/uapi/linux/dlm_device.h index 3060783c4191..62d9ebf185e2 100644 --- a/include/uapi/linux/dlm_device.h +++ b/include/uapi/linux/dlm_device.h @@ -38,11 +38,11 @@ struct dlm_lock_params { __u32 parent; __u64 xid; __u64 timeout; - void __user *castparam; - void __user *castaddr; - void __user *bastparam; - void __user *bastaddr; - struct dlm_lksb __user *lksb; + void *castparam; + void *castaddr; + void *bastparam; + void *bastaddr; + struct dlm_lksb *lksb; char lvb[DLM_USER_LVB_LEN]; char name[0]; }; @@ -81,9 +81,9 @@ struct dlm_device_version { struct dlm_lock_result { __u32 version[3]; __u32 length; - void __user * user_astaddr; - void __user * user_astparam; - struct dlm_lksb __user * user_lksb; + void * user_astaddr; + void * user_astparam; + struct dlm_lksb * user_lksb; struct dlm_lksb lksb; __u8 bast_mode; __u8 unused[3]; diff --git a/include/uapi/linux/dlm_plock.h b/include/uapi/linux/dlm_plock.h index 6ae692c909cb..6403ea26bbe4 100644 --- a/include/uapi/linux/dlm_plock.h +++ b/include/uapi/linux/dlm_plock.h @@ -6,8 +6,8 @@ * of the GNU General Public License v.2. */ -#ifndef _UAPI__DLM_PLOCK_DOT_H__ -#define _UAPI__DLM_PLOCK_DOT_H__ +#ifndef __DLM_PLOCK_DOT_H__ +#define __DLM_PLOCK_DOT_H__ #include <linux/types.h> @@ -42,4 +42,4 @@ struct dlm_plock_info { }; -#endif /* _UAPI__DLM_PLOCK_DOT_H__ */ +#endif /* __DLM_PLOCK_DOT_H__ */ diff --git a/include/uapi/linux/dvb/dmx.h b/include/uapi/linux/dvb/dmx.h index b4fb650d9d4f..4ed210aa7ccd 100644 --- a/include/uapi/linux/dvb/dmx.h +++ b/include/uapi/linux/dvb/dmx.h @@ -21,13 +21,11 @@ * */ -#ifndef _UAPI_DVBDMX_H_ -#define _UAPI_DVBDMX_H_ +#ifndef _DVBDMX_H_ +#define _DVBDMX_H_ #include <linux/types.h> -#ifndef __KERNEL__ #include <time.h> -#endif #define DMX_FILTER_SIZE 16 @@ -152,4 +150,4 @@ struct dmx_stc { #define DMX_ADD_PID _IOW('o', 51, __u16) #define DMX_REMOVE_PID _IOW('o', 52, __u16) -#endif /* _UAPI_DVBDMX_H_ */ +#endif /* _DVBDMX_H_ */ diff --git a/include/uapi/linux/dvb/frontend.h b/include/uapi/linux/dvb/frontend.h index c56d77c496a5..5cb498d8f476 100644 --- a/include/uapi/linux/dvb/frontend.h +++ b/include/uapi/linux/dvb/frontend.h @@ -197,7 +197,6 @@ typedef enum fe_transmit_mode { TRANSMISSION_MODE_C3780, } fe_transmit_mode_t; -#if defined(__DVB_CORE__) || !defined (__KERNEL__) typedef enum fe_bandwidth { BANDWIDTH_8_MHZ, BANDWIDTH_7_MHZ, @@ -207,7 +206,6 @@ typedef enum fe_bandwidth { BANDWIDTH_10_MHZ, BANDWIDTH_1_712_MHZ, } fe_bandwidth_t; -#endif typedef enum fe_guard_interval { GUARD_INTERVAL_1_32, @@ -239,7 +237,6 @@ enum fe_interleaving { INTERLEAVING_720, }; -#if defined(__DVB_CORE__) || !defined (__KERNEL__) struct dvb_qpsk_parameters { __u32 symbol_rate; /* symbol rate in Symbols per second */ fe_code_rate_t fec_inner; /* forward error correction (see above) */ @@ -282,7 +279,6 @@ struct dvb_frontend_event { fe_status_t status; struct dvb_frontend_parameters parameters; }; -#endif /* S2API Commands */ #define DTV_UNDEFINED 0 diff --git a/include/uapi/linux/dvb/osd.h b/include/uapi/linux/dvb/osd.h index 880e68435832..f28c7cbc2b2a 100644 --- a/include/uapi/linux/dvb/osd.h +++ b/include/uapi/linux/dvb/osd.h @@ -24,7 +24,7 @@ #ifndef _DVBOSD_H_ #define _DVBOSD_H_ -#include <linux/compiler.h> + typedef enum { // All functions return -2 on "not open" @@ -104,7 +104,7 @@ typedef struct osd_cmd_s { int x1; int y1; int color; - void __user *data; + void *data; } osd_cmd_t; /* OSD_OpenRaw: set 'color' to desired window type */ diff --git a/include/uapi/linux/dvb/video.h b/include/uapi/linux/dvb/video.h index d3d14a59d2d5..4bb276c1cff5 100644 --- a/include/uapi/linux/dvb/video.h +++ b/include/uapi/linux/dvb/video.h @@ -21,14 +21,12 @@ * */ -#ifndef _UAPI_DVBVIDEO_H_ -#define _UAPI_DVBVIDEO_H_ +#ifndef _DVBVIDEO_H_ +#define _DVBVIDEO_H_ #include <linux/types.h> -#ifndef __KERNEL__ #include <stdint.h> #include <time.h> -#endif typedef enum { VIDEO_FORMAT_4_3, /* Select 4:3 format */ @@ -154,7 +152,7 @@ struct video_status { struct video_still_picture { - char __user *iFrame; /* pointer to a single iframe in memory */ + char *iFrame; /* pointer to a single iframe in memory */ __s32 size; }; @@ -187,7 +185,7 @@ typedef struct video_spu { typedef struct video_spu_palette { /* SPU Palette information */ int length; - __u8 __user *palette; + __u8 *palette; } video_spu_palette_t; @@ -271,4 +269,4 @@ typedef __u16 video_attributes_t; #define VIDEO_COMMAND _IOWR('o', 59, struct video_command) #define VIDEO_TRY_COMMAND _IOWR('o', 60, struct video_command) -#endif /* _UAPI_DVBVIDEO_H_ */ +#endif /* _DVBVIDEO_H_ */ diff --git a/include/uapi/linux/edd.h b/include/uapi/linux/edd.h index 89240a04e4c8..190815dd48d7 100644 --- a/include/uapi/linux/edd.h +++ b/include/uapi/linux/edd.h @@ -27,8 +27,8 @@ * GNU General Public License for more details. * */ -#ifndef _UAPI_LINUX_EDD_H -#define _UAPI_LINUX_EDD_H +#ifndef _LINUX_EDD_H +#define _LINUX_EDD_H #include <linux/types.h> @@ -188,4 +188,4 @@ struct edd { #endif /*!__ASSEMBLY__ */ -#endif /* _UAPI_LINUX_EDD_H */ +#endif /* _LINUX_EDD_H */ diff --git a/include/uapi/linux/elf-fdpic.h b/include/uapi/linux/elf-fdpic.h index 3921e33aec8e..5748a4648146 100644 --- a/include/uapi/linux/elf-fdpic.h +++ b/include/uapi/linux/elf-fdpic.h @@ -9,8 +9,8 @@ * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI_LINUX_ELF_FDPIC_H -#define _UAPI_LINUX_ELF_FDPIC_H +#ifndef _LINUX_ELF_FDPIC_H +#define _LINUX_ELF_FDPIC_H #include <linux/elf.h> @@ -31,4 +31,4 @@ struct elf32_fdpic_loadmap { #define ELF32_FDPIC_LOADMAP_VERSION 0x0000 -#endif /* _UAPI_LINUX_ELF_FDPIC_H */ +#endif /* _LINUX_ELF_FDPIC_H */ diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h index ef6103bf1f9b..1a95967c9943 100644 --- a/include/uapi/linux/elf.h +++ b/include/uapi/linux/elf.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_ELF_H -#define _UAPI_LINUX_ELF_H +#ifndef _LINUX_ELF_H +#define _LINUX_ELF_H #include <linux/types.h> #include <linux/elf-em.h> @@ -414,4 +414,4 @@ typedef struct elf64_note { Elf64_Word n_type; /* Content type */ } Elf64_Nhdr; -#endif /* _UAPI_LINUX_ELF_H */ +#endif /* _LINUX_ELF_H */ diff --git a/include/uapi/linux/elfcore.h b/include/uapi/linux/elfcore.h index 569737cfb557..9dd784c08d48 100644 --- a/include/uapi/linux/elfcore.h +++ b/include/uapi/linux/elfcore.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_ELFCORE_H -#define _UAPI_LINUX_ELFCORE_H +#ifndef _LINUX_ELFCORE_H +#define _LINUX_ELFCORE_H #include <linux/types.h> #include <linux/signal.h> @@ -16,13 +16,11 @@ struct elf_siginfo }; -#ifndef __KERNEL__ typedef elf_greg_t greg_t; typedef elf_gregset_t gregset_t; typedef elf_fpregset_t fpregset_t; typedef elf_fpxregset_t fpxregset_t; #define NGREG ELF_NGREG -#endif /* * Definitions to generate Intel SVR4-like core files. @@ -90,11 +88,9 @@ struct elf_prpsinfo char pr_psargs[ELF_PRARGSZ]; /* initial part of arg list */ }; -#ifndef __KERNEL__ typedef struct elf_prstatus prstatus_t; typedef struct elf_prpsinfo prpsinfo_t; #define PRARGSZ ELF_PRARGSZ -#endif -#endif /* _UAPI_LINUX_ELFCORE_H */ +#endif /* _LINUX_ELFCORE_H */ diff --git a/include/uapi/linux/errqueue.h b/include/uapi/linux/errqueue.h index aacd4fb7102a..12e2eae15188 100644 --- a/include/uapi/linux/errqueue.h +++ b/include/uapi/linux/errqueue.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_ERRQUEUE_H -#define _UAPI_LINUX_ERRQUEUE_H +#ifndef _LINUX_ERRQUEUE_H +#define _LINUX_ERRQUEUE_H #include <linux/types.h> @@ -23,4 +23,4 @@ struct sock_extended_err { #define SO_EE_OFFENDER(ee) ((struct sockaddr*)((ee)+1)) -#endif /* _UAPI_LINUX_ERRQUEUE_H */ +#endif /* _LINUX_ERRQUEUE_H */ diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h index 38dbafaa5341..ef05f8ed0d1d 100644 --- a/include/uapi/linux/ethtool.h +++ b/include/uapi/linux/ethtool.h @@ -10,8 +10,8 @@ * Portions Copyright (C) Sun Microsystems 2008 */ -#ifndef _UAPI_LINUX_ETHTOOL_H -#define _UAPI_LINUX_ETHTOOL_H +#ifndef _LINUX_ETHTOOL_H +#define _LINUX_ETHTOOL_H #include <linux/types.h> #include <linux/if_ether.h> @@ -50,7 +50,7 @@ struct ethtool_cmd { __u32 reserved[2]; }; -static inline void ethtool_cmd_speed_set(struct ethtool_cmd *ep, +static __inline__ void ethtool_cmd_speed_set(struct ethtool_cmd *ep, __u32 speed) { @@ -58,7 +58,7 @@ static inline void ethtool_cmd_speed_set(struct ethtool_cmd *ep, ep->speed_hi = (__u16)(speed >> 16); } -static inline __u32 ethtool_cmd_speed(const struct ethtool_cmd *ep) +static __inline__ __u32 ethtool_cmd_speed(const struct ethtool_cmd *ep) { return (ep->speed_hi << 16) | ep->speed; } @@ -1097,4 +1097,4 @@ enum ethtool_reset_flags { }; #define ETH_RESET_SHARED_SHIFT 16 -#endif /* _UAPI_LINUX_ETHTOOL_H */ +#endif /* _LINUX_ETHTOOL_H */ diff --git a/include/uapi/linux/eventpoll.h b/include/uapi/linux/eventpoll.h index 2c267bcbb85c..998e3b200346 100644 --- a/include/uapi/linux/eventpoll.h +++ b/include/uapi/linux/eventpoll.h @@ -11,8 +11,8 @@ * */ -#ifndef _UAPI_LINUX_EVENTPOLL_H -#define _UAPI_LINUX_EVENTPOLL_H +#ifndef _LINUX_EVENTPOLL_H +#define _LINUX_EVENTPOLL_H /* For O_CLOEXEC */ #include <linux/fcntl.h> @@ -62,4 +62,4 @@ struct epoll_event { } EPOLL_PACKED; -#endif /* _UAPI_LINUX_EVENTPOLL_H */ +#endif /* _LINUX_EVENTPOLL_H */ diff --git a/include/uapi/linux/falloc.h b/include/uapi/linux/falloc.h index 990c4ccf8b61..49c4602f3a91 100644 --- a/include/uapi/linux/falloc.h +++ b/include/uapi/linux/falloc.h @@ -1,9 +1,9 @@ -#ifndef _UAPI_FALLOC_H_ -#define _UAPI_FALLOC_H_ +#ifndef _FALLOC_H_ +#define _FALLOC_H_ #define FALLOC_FL_KEEP_SIZE 0x01 /* default is extend size */ #define FALLOC_FL_PUNCH_HOLE 0x02 /* de-allocates range */ #define FALLOC_FL_NO_HIDE_STALE 0x04 /* reserved codepoint */ -#endif /* _UAPI_FALLOC_H_ */ +#endif /* _FALLOC_H_ */ diff --git a/include/uapi/linux/fanotify.h b/include/uapi/linux/fanotify.h index 030508d195d3..f780e5aedfdd 100644 --- a/include/uapi/linux/fanotify.h +++ b/include/uapi/linux/fanotify.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_FANOTIFY_H -#define _UAPI_LINUX_FANOTIFY_H +#ifndef _LINUX_FANOTIFY_H +#define _LINUX_FANOTIFY_H #include <linux/types.h> @@ -113,4 +113,4 @@ struct fanotify_response { (long)(meta)->event_len >= (long)FAN_EVENT_METADATA_LEN && \ (long)(meta)->event_len <= (long)(len)) -#endif /* _UAPI_LINUX_FANOTIFY_H */ +#endif /* _LINUX_FANOTIFY_H */ diff --git a/include/uapi/linux/fb.h b/include/uapi/linux/fb.h index fb795c3b3c17..1b3b239b67b3 100644 --- a/include/uapi/linux/fb.h +++ b/include/uapi/linux/fb.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_FB_H -#define _UAPI_LINUX_FB_H +#ifndef _LINUX_FB_H +#define _LINUX_FB_H #include <linux/types.h> #include <linux/i2c.h> @@ -16,9 +16,7 @@ #define FBIOGETCMAP 0x4604 #define FBIOPUTCMAP 0x4605 #define FBIOPAN_DISPLAY 0x4606 -#ifndef __KERNEL__ #define FBIO_CURSOR _IOWR('F', 0x08, struct fb_cursor) -#endif /* 0x4607-0x460B are defined below */ /* #define FBIOGET_MONITORSPEC 0x460C */ /* #define FBIOPUT_MONITORSPEC 0x460D */ @@ -399,4 +397,4 @@ struct fb_cursor { #endif -#endif /* _UAPI_LINUX_FB_H */ +#endif /* _LINUX_FB_H */ diff --git a/include/uapi/linux/fcntl.h b/include/uapi/linux/fcntl.h index 074b886c6be0..08683ab2c19e 100644 --- a/include/uapi/linux/fcntl.h +++ b/include/uapi/linux/fcntl.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_FCNTL_H -#define _UAPI_LINUX_FCNTL_H +#ifndef _LINUX_FCNTL_H +#define _LINUX_FCNTL_H #include <asm/fcntl.h> @@ -49,4 +49,4 @@ #define AT_EMPTY_PATH 0x1000 /* Allow empty relative pathname */ -#endif /* _UAPI_LINUX_FCNTL_H */ +#endif /* _LINUX_FCNTL_H */ diff --git a/include/uapi/linux/fd.h b/include/uapi/linux/fd.h index f1f3dd5981b2..c43c4c874e48 100644 --- a/include/uapi/linux/fd.h +++ b/include/uapi/linux/fd.h @@ -1,8 +1,8 @@ -#ifndef _UAPI_LINUX_FD_H -#define _UAPI_LINUX_FD_H +#ifndef _LINUX_FD_H +#define _LINUX_FD_H #include <linux/ioctl.h> -#include <linux/compiler.h> + /* New file layout: Now the ioctl definitions immediately follow the * definitions of the structures that they use */ @@ -346,7 +346,7 @@ struct floppy_raw_cmd { #define FD_RAW_FAILURE 0x10000 /* command sent to fdc, fdc returned error */ #define FD_RAW_HARDFAILURE 0x20000 /* fdc had to be reset, or timed out */ - void __user *data; + void *data; char *kernel_data; /* location of data buffer in the kernel */ struct floppy_raw_cmd *next; /* used for chaining of raw cmd's * within the kernel */ @@ -379,4 +379,4 @@ struct floppy_raw_cmd { -#endif /* _UAPI_LINUX_FD_H */ +#endif /* _LINUX_FD_H */ diff --git a/include/uapi/linux/filter.h b/include/uapi/linux/filter.h index 8eb9ccaa5b48..9a46cb63ed6c 100644 --- a/include/uapi/linux/filter.h +++ b/include/uapi/linux/filter.h @@ -2,10 +2,10 @@ * Linux Socket Filter Data Structures */ -#ifndef _UAPI__LINUX_FILTER_H__ -#define _UAPI__LINUX_FILTER_H__ +#ifndef __LINUX_FILTER_H__ +#define __LINUX_FILTER_H__ + -#include <linux/compiler.h> #include <linux/types.h> @@ -29,7 +29,7 @@ struct sock_filter { /* Filter block */ struct sock_fprog { /* Required for SO_ATTACH_FILTER. */ unsigned short len; /* Number of filter blocks */ - struct sock_filter __user *filter; + struct sock_filter *filter; }; /* @@ -135,4 +135,4 @@ struct sock_fprog { /* Required for SO_ATTACH_FILTER. */ #define SKF_LL_OFF (-0x200000) -#endif /* _UAPI__LINUX_FILTER_H__ */ +#endif /* __LINUX_FILTER_H__ */ diff --git a/include/uapi/linux/flat.h b/include/uapi/linux/flat.h index 88cd6baba8f3..8351bc7afa87 100644 --- a/include/uapi/linux/flat.h +++ b/include/uapi/linux/flat.h @@ -7,8 +7,8 @@ * support uClinux flat-format executables. */ -#ifndef _UAPI_LINUX_FLAT_H -#define _UAPI_LINUX_FLAT_H +#ifndef _LINUX_FLAT_H +#define _LINUX_FLAT_H #define FLAT_VERSION 0x00000004L @@ -55,4 +55,4 @@ struct flat_hdr { -#endif /* _UAPI_LINUX_FLAT_H */ +#endif /* _LINUX_FLAT_H */ diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h index 6c28b61bb690..322d2d17b2d0 100644 --- a/include/uapi/linux/fs.h +++ b/include/uapi/linux/fs.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_FS_H -#define _UAPI_LINUX_FS_H +#ifndef _LINUX_FS_H +#define _LINUX_FS_H /* * This file has definitions for some important file table @@ -201,4 +201,4 @@ struct inodes_stat_t { #define SYNC_FILE_RANGE_WRITE 2 #define SYNC_FILE_RANGE_WAIT_AFTER 4 -#endif /* _UAPI_LINUX_FS_H */ +#endif /* _LINUX_FS_H */ diff --git a/include/uapi/linux/fsl_hypervisor.h b/include/uapi/linux/fsl_hypervisor.h index 1bf04967fec4..2f908defc0f9 100644 --- a/include/uapi/linux/fsl_hypervisor.h +++ b/include/uapi/linux/fsl_hypervisor.h @@ -37,8 +37,8 @@ * via the ioctl interface. */ -#ifndef _UAPIFSL_HYPERVISOR_H -#define _UAPIFSL_HYPERVISOR_H +#ifndef FSL_HYPERVISOR_H +#define FSL_HYPERVISOR_H #include <linux/types.h> @@ -217,4 +217,4 @@ struct fsl_hv_ioctl_prop { _IOWR(FSL_HV_IOCTL_TYPE, 8, struct fsl_hv_ioctl_prop) -#endif /* _UAPIFSL_HYPERVISOR_H */ +#endif /* FSL_HYPERVISOR_H */ diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h index 60bb2f9f7b74..d7bd86d9c96a 100644 --- a/include/uapi/linux/fuse.h +++ b/include/uapi/linux/fuse.h @@ -98,11 +98,7 @@ #ifndef _LINUX_FUSE_H #define _LINUX_FUSE_H -#ifdef __KERNEL__ -#include <linux/types.h> -#else #include <stdint.h> -#endif /* * Version negotiation: diff --git a/include/uapi/linux/futex.h b/include/uapi/linux/futex.h index 0b1f716373c7..7a46ab98ea9e 100644 --- a/include/uapi/linux/futex.h +++ b/include/uapi/linux/futex.h @@ -1,7 +1,7 @@ -#ifndef _UAPI_LINUX_FUTEX_H -#define _UAPI_LINUX_FUTEX_H +#ifndef _LINUX_FUTEX_H +#define _LINUX_FUTEX_H + -#include <linux/compiler.h> #include <linux/types.h> /* Second argument to futex syscall */ @@ -55,7 +55,7 @@ * changed. */ struct robust_list { - struct robust_list __user *next; + struct robust_list *next; }; /* @@ -90,7 +90,7 @@ struct robust_list_head { * _might_ have taken. We check the owner TID in any case, * so only truly owned locks will be handled. */ - struct robust_list __user *list_op_pending; + struct robust_list *list_op_pending; }; /* @@ -149,4 +149,4 @@ struct robust_list_head { (((op & 0xf) << 28) | ((cmp & 0xf) << 24) \ | ((oparg & 0xfff) << 12) | (cmparg & 0xfff)) -#endif /* _UAPI_LINUX_FUTEX_H */ +#endif /* _LINUX_FUTEX_H */ diff --git a/include/uapi/linux/gameport.h b/include/uapi/linux/gameport.h index 49b29b068f40..34246b77543e 100644 --- a/include/uapi/linux/gameport.h +++ b/include/uapi/linux/gameport.h @@ -5,8 +5,8 @@ * under the terms of the GNU General Public License version 2 as published by * the Free Software Foundation. */ -#ifndef _UAPI_GAMEPORT_H -#define _UAPI_GAMEPORT_H +#ifndef _GAMEPORT_H +#define _GAMEPORT_H @@ -25,4 +25,4 @@ #define GAMEPORT_ID_VENDOR_GRAVIS 0x0009 #define GAMEPORT_ID_VENDOR_GUILLEMOT 0x000a -#endif /* _UAPI_GAMEPORT_H */ +#endif /* _GAMEPORT_H */ diff --git a/include/uapi/linux/genetlink.h b/include/uapi/linux/genetlink.h index c880a417d8a9..1f85a2769773 100644 --- a/include/uapi/linux/genetlink.h +++ b/include/uapi/linux/genetlink.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__LINUX_GENERIC_NETLINK_H -#define _UAPI__LINUX_GENERIC_NETLINK_H +#ifndef __LINUX_GENERIC_NETLINK_H +#define __LINUX_GENERIC_NETLINK_H #include <linux/types.h> #include <linux/netlink.h> @@ -81,4 +81,4 @@ enum { #define CTRL_ATTR_MCAST_GRP_MAX (__CTRL_ATTR_MCAST_GRP_MAX - 1) -#endif /* _UAPI__LINUX_GENERIC_NETLINK_H */ +#endif /* __LINUX_GENERIC_NETLINK_H */ diff --git a/include/uapi/linux/gfs2_ondisk.h b/include/uapi/linux/gfs2_ondisk.h index b2de1f9a88d6..9e7ca3b9a56c 100644 --- a/include/uapi/linux/gfs2_ondisk.h +++ b/include/uapi/linux/gfs2_ondisk.h @@ -328,7 +328,7 @@ struct gfs2_leaf { * This works in a similar way to dirents. There is a fixed size header * followed by a variable length section made up of the name and the * associated data. In the case of a "stuffed" entry, the value is - * inline directly after the name, the ea_num_ptrs entry will be + * __inline__ directly after the name, the ea_num_ptrs entry will be * zero in that case. For non-"stuffed" entries, there will be * a set of pointers (aligned to 8 byte boundary) to the block(s) * containing the value. diff --git a/include/uapi/linux/hdlc.h b/include/uapi/linux/hdlc.h index 2c5f0aff4cf9..89e484d50913 100644 --- a/include/uapi/linux/hdlc.h +++ b/include/uapi/linux/hdlc.h @@ -8,8 +8,8 @@ * as published by the Free Software Foundation. */ -#ifndef _UAPI__HDLC_H -#define _UAPI__HDLC_H +#ifndef __HDLC_H +#define __HDLC_H #define HDLC_MAX_MTU 1500 /* Ethernet 1500 bytes */ @@ -20,4 +20,4 @@ #endif -#endif /* _UAPI__HDLC_H */ +#endif /* __HDLC_H */ diff --git a/include/uapi/linux/hdlcdrv.h b/include/uapi/linux/hdlcdrv.h index ffc79c0b44a8..422d96553b3a 100644 --- a/include/uapi/linux/hdlcdrv.h +++ b/include/uapi/linux/hdlcdrv.h @@ -4,8 +4,8 @@ * (C) 1996-1998 by Thomas Sailer, HB9JNX/AE4WA */ -#ifndef _UAPI_HDLCDRV_H -#define _UAPI_HDLCDRV_H +#ifndef _HDLCDRV_H +#define _HDLCDRV_H /* -------------------------------------------------------------------- */ /* @@ -105,6 +105,6 @@ struct hdlcdrv_ioctl { /* -------------------------------------------------------------------- */ -#endif /* _UAPI_HDLCDRV_H */ +#endif /* _HDLCDRV_H */ /* -------------------------------------------------------------------- */ diff --git a/include/uapi/linux/hdreg.h b/include/uapi/linux/hdreg.h index 29ee2873f4a8..774173fa36cc 100644 --- a/include/uapi/linux/hdreg.h +++ b/include/uapi/linux/hdreg.h @@ -12,12 +12,10 @@ #define HDIO_DRIVE_TASK_HDR_SIZE (8 * sizeof(__u8)) #define IDE_DRIVE_TASK_NO_DATA 0 -#ifndef __KERNEL__ #define IDE_DRIVE_TASK_INVALID -1 #define IDE_DRIVE_TASK_SET_XFER 1 #define IDE_DRIVE_TASK_IN 2 #define IDE_DRIVE_TASK_OUT 3 -#endif #define IDE_DRIVE_TASK_RAW_WRITE 4 /* @@ -25,13 +23,11 @@ */ #define IDE_TASKFILE_STD_IN_FLAGS 0xFE #define IDE_HOB_STD_IN_FLAGS 0x3C -#ifndef __KERNEL__ #define IDE_TASKFILE_STD_OUT_FLAGS 0xFE #define IDE_HOB_STD_OUT_FLAGS 0x3C typedef unsigned char task_ioreg_t; typedef unsigned long sata_ioreg_t; -#endif typedef union ide_reg_valid_s { unsigned all : 16; @@ -80,7 +76,6 @@ struct hd_drive_cmd_hdr { __u8 sector_count; }; -#ifndef __KERNEL__ typedef struct hd_drive_task_hdr { __u8 data; __u8 feature; @@ -102,7 +97,6 @@ typedef struct hd_drive_hob_hdr { __u8 device_head; __u8 control; } hob_struct_t; -#endif #define TASKFILE_NO_DATA 0x0000 @@ -118,7 +112,6 @@ typedef struct hd_drive_hob_hdr { #define TASKFILE_IN_DMAQ 0x0080 #define TASKFILE_OUT_DMAQ 0x0100 -#ifndef __KERNEL__ #define TASKFILE_P_IN 0x0200 #define TASKFILE_P_OUT 0x0400 #define TASKFILE_P_IN_DMA 0x0800 @@ -127,9 +120,7 @@ typedef struct hd_drive_hob_hdr { #define TASKFILE_P_OUT_DMAQ 0x4000 #define TASKFILE_48 0x8000 #define TASKFILE_INVALID 0x7fff -#endif -#ifndef __KERNEL__ /* ATA/ATAPI Commands pre T13 Spec */ #define WIN_NOP 0x00 /* @@ -318,7 +309,6 @@ typedef struct hd_drive_hob_hdr { #define SECURITY_ERASE_UNIT 0xBD #define SECURITY_FREEZE_LOCK 0xBE #define SECURITY_DISABLE_PASSWORD 0xBF -#endif /* __KERNEL__ */ struct hd_geometry { unsigned char heads; @@ -362,10 +352,8 @@ struct hd_geometry { #define HDIO_SET_NOWERR 0x0325 /* change ignore-write-error flag */ #define HDIO_SET_DMA 0x0326 /* change use-dma flag */ #define HDIO_SET_PIO_MODE 0x0327 /* reconfig interface to new speed */ -#ifndef __KERNEL__ #define HDIO_SCAN_HWIF 0x0328 /* register and (re)scan interface */ #define HDIO_UNREGISTER_HWIF 0x032a /* unregister interface */ -#endif #define HDIO_SET_NICE 0x0329 /* set nice flags */ #define HDIO_SET_WCACHE 0x032b /* change write cache enable-disable */ #define HDIO_SET_ACOUSTIC 0x032c /* change acoustic behavior */ @@ -388,7 +376,6 @@ enum { #define __NEW_HD_DRIVE_ID -#ifndef __KERNEL__ /* * Structure returned by HDIO_GET_IDENTITY, as per ANSI NCITS ATA6 rev.1b spec. * @@ -640,7 +627,6 @@ struct hd_driveid { * 7:0 Signature */ }; -#endif /* __KERNEL__ */ /* * IDE "nice" flags. These are used on a per drive basis to determine @@ -650,9 +636,7 @@ struct hd_driveid { #define IDE_NICE_DSC_OVERLAP (0) /* per the DSC overlap protocol */ #define IDE_NICE_ATAPI_OVERLAP (1) /* not supported yet */ #define IDE_NICE_1 (3) /* when probably won't affect us much */ -#ifndef __KERNEL__ #define IDE_NICE_0 (2) /* when sure that it won't affect us */ #define IDE_NICE_2 (4) /* when we know it's on our expense */ -#endif #endif /* _LINUX_HDREG_H */ diff --git a/include/uapi/linux/hid.h b/include/uapi/linux/hid.h index b60f4842bd97..2c23ba61b7a1 100644 --- a/include/uapi/linux/hid.h +++ b/include/uapi/linux/hid.h @@ -22,8 +22,8 @@ * e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail: * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic */ -#ifndef _UAPI__HID_H -#define _UAPI__HID_H +#ifndef __HID_H +#define __HID_H @@ -63,4 +63,4 @@ #define HID_MAX_DESCRIPTOR_SIZE 4096 -#endif /* _UAPI__HID_H */ +#endif /* __HID_H */ diff --git a/include/uapi/linux/hiddev.h b/include/uapi/linux/hiddev.h index 7df7884bf5c4..e24ca194f741 100644 --- a/include/uapi/linux/hiddev.h +++ b/include/uapi/linux/hiddev.h @@ -22,8 +22,8 @@ * e-mail - mail your message to <vojtech@suse.cz>, or by paper mail: * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic */ -#ifndef _UAPI_HIDDEV_H -#define _UAPI_HIDDEV_H +#ifndef _HIDDEV_H +#define _HIDDEV_H @@ -209,4 +209,4 @@ struct hiddev_usage_ref_multi { */ -#endif /* _UAPI_HIDDEV_H */ +#endif /* _HIDDEV_H */ diff --git a/include/uapi/linux/hidraw.h b/include/uapi/linux/hidraw.h index f5b732979a7c..e781b0eadb05 100644 --- a/include/uapi/linux/hidraw.h +++ b/include/uapi/linux/hidraw.h @@ -10,8 +10,8 @@ * this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef _UAPI_HIDRAW_H -#define _UAPI_HIDRAW_H +#ifndef _HIDRAW_H +#define _HIDRAW_H @@ -47,4 +47,4 @@ struct hidraw_devinfo { /* kernel-only API declarations */ -#endif /* _UAPI_HIDRAW_H */ +#endif /* _HIDRAW_H */ diff --git a/include/uapi/linux/hpet.h b/include/uapi/linux/hpet.h index 8af3c70abc8c..031f16f418de 100644 --- a/include/uapi/linux/hpet.h +++ b/include/uapi/linux/hpet.h @@ -1,7 +1,7 @@ -#ifndef _UAPI__HPET__ -#define _UAPI__HPET__ +#ifndef __HPET__ +#define __HPET__ + -#include <linux/compiler.h> struct hpet_info { @@ -22,4 +22,4 @@ struct hpet_info { #define MAX_HPET_TBS 8 /* maximum hpet timer blocks */ -#endif /* _UAPI__HPET__ */ +#endif /* __HPET__ */ diff --git a/include/uapi/linux/hw_breakpoint.h b/include/uapi/linux/hw_breakpoint.h index b04000a2296a..32486ee2f067 100644 --- a/include/uapi/linux/hw_breakpoint.h +++ b/include/uapi/linux/hw_breakpoint.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_HW_BREAKPOINT_H -#define _UAPI_LINUX_HW_BREAKPOINT_H +#ifndef _LINUX_HW_BREAKPOINT_H +#define _LINUX_HW_BREAKPOINT_H enum { HW_BREAKPOINT_LEN_1 = 1, @@ -27,4 +27,4 @@ enum bp_type_idx { TYPE_MAX }; -#endif /* _UAPI_LINUX_HW_BREAKPOINT_H */ +#endif /* _LINUX_HW_BREAKPOINT_H */ diff --git a/include/uapi/linux/i2c-dev.h b/include/uapi/linux/i2c-dev.h index 3f311551795d..839d25add7a5 100644 --- a/include/uapi/linux/i2c-dev.h +++ b/include/uapi/linux/i2c-dev.h @@ -20,11 +20,11 @@ MA 02110-1301 USA. */ -#ifndef _UAPI_LINUX_I2C_DEV_H -#define _UAPI_LINUX_I2C_DEV_H +#ifndef _LINUX_I2C_DEV_H +#define _LINUX_I2C_DEV_H #include <linux/types.h> -#include <linux/compiler.h> + /* /dev/i2c-X ioctl commands. The ioctl's parameter is always an * unsigned long, except for: @@ -57,16 +57,16 @@ struct i2c_smbus_ioctl_data { __u8 read_write; __u8 command; __u32 size; - union i2c_smbus_data __user *data; + union i2c_smbus_data *data; }; /* This is the structure as used in the I2C_RDWR ioctl call */ struct i2c_rdwr_ioctl_data { - struct i2c_msg __user *msgs; /* pointers to i2c_msgs */ + struct i2c_msg *msgs; /* pointers to i2c_msgs */ __u32 nmsgs; /* number of i2c_msgs */ }; #define I2C_RDRW_IOCTL_MAX_MSGS 42 -#endif /* _UAPI_LINUX_I2C_DEV_H */ +#endif /* _LINUX_I2C_DEV_H */ diff --git a/include/uapi/linux/i2c.h b/include/uapi/linux/i2c.h index 0e949cbfd333..0f2f95bae7a5 100644 --- a/include/uapi/linux/i2c.h +++ b/include/uapi/linux/i2c.h @@ -24,8 +24,8 @@ /* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and Frodo Looijaard <frodol@dds.nl> */ -#ifndef _UAPI_LINUX_I2C_H -#define _UAPI_LINUX_I2C_H +#ifndef _LINUX_I2C_H +#define _LINUX_I2C_H #include <linux/types.h> @@ -148,4 +148,4 @@ union i2c_smbus_data { #define I2C_SMBUS_BLOCK_PROC_CALL 7 /* SMBus 2.0 */ #define I2C_SMBUS_I2C_BLOCK_DATA 8 -#endif /* _UAPI_LINUX_I2C_H */ +#endif /* _LINUX_I2C_H */ diff --git a/include/uapi/linux/i2o-dev.h b/include/uapi/linux/i2o-dev.h index a8093bfec3a6..4fb30a43d9a4 100644 --- a/include/uapi/linux/i2o-dev.h +++ b/include/uapi/linux/i2o-dev.h @@ -52,22 +52,22 @@ struct i2o_cmd_passthru32 { struct i2o_cmd_passthru { unsigned int iop; /* IOP unit number */ - void __user *msg; /* message */ + void *msg; /* message */ }; struct i2o_cmd_hrtlct { unsigned int iop; /* IOP unit number */ - void __user *resbuf; /* Buffer for result */ - unsigned int __user *reslen; /* Buffer length in bytes */ + void *resbuf; /* Buffer for result */ + unsigned int *reslen; /* Buffer length in bytes */ }; struct i2o_cmd_psetget { unsigned int iop; /* IOP unit number */ unsigned int tid; /* Target device TID */ - void __user *opbuf; /* Operation List buffer */ + void *opbuf; /* Operation List buffer */ unsigned int oplen; /* Operation List buffer length in bytes */ - void __user *resbuf; /* Result List buffer */ - unsigned int __user *reslen; /* Result List buffer length in bytes */ + void *resbuf; /* Result List buffer */ + unsigned int *reslen; /* Result List buffer length in bytes */ }; struct i2o_sw_xfer { @@ -75,19 +75,19 @@ struct i2o_sw_xfer { unsigned char flags; /* Flags field */ unsigned char sw_type; /* Software type */ unsigned int sw_id; /* Software ID */ - void __user *buf; /* Pointer to software buffer */ - unsigned int __user *swlen; /* Length of software data */ - unsigned int __user *maxfrag; /* Maximum fragment count */ - unsigned int __user *curfrag; /* Current fragment count */ + void *buf; /* Pointer to software buffer */ + unsigned int *swlen; /* Length of software data */ + unsigned int *maxfrag; /* Maximum fragment count */ + unsigned int *curfrag; /* Current fragment count */ }; struct i2o_html { unsigned int iop; /* IOP unit number */ unsigned int tid; /* Target device ID */ unsigned int page; /* HTML page */ - void __user *resbuf; /* Buffer for reply HTML page */ - unsigned int __user *reslen; /* Length in bytes of reply buffer */ - void __user *qbuf; /* Pointer to HTTP query string */ + void *resbuf; /* Buffer for reply HTML page */ + unsigned int *reslen; /* Length in bytes of reply buffer */ + void *qbuf; /* Pointer to HTTP query string */ unsigned int qlen; /* Length in bytes of query string buffer */ }; diff --git a/include/uapi/linux/icmp.h b/include/uapi/linux/icmp.h index 16fff055f734..ab58cee370ae 100644 --- a/include/uapi/linux/icmp.h +++ b/include/uapi/linux/icmp.h @@ -14,8 +14,8 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI_LINUX_ICMP_H -#define _UAPI_LINUX_ICMP_H +#ifndef _LINUX_ICMP_H +#define _LINUX_ICMP_H #include <linux/types.h> @@ -94,4 +94,4 @@ struct icmp_filter { }; -#endif /* _UAPI_LINUX_ICMP_H */ +#endif /* _LINUX_ICMP_H */ diff --git a/include/uapi/linux/icmpv6.h b/include/uapi/linux/icmpv6.h index 590beda78ea0..a2e839ee9648 100644 --- a/include/uapi/linux/icmpv6.h +++ b/include/uapi/linux/icmpv6.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_ICMPV6_H -#define _UAPI_LINUX_ICMPV6_H +#ifndef _LINUX_ICMPV6_H +#define _LINUX_ICMPV6_H #include <linux/types.h> #include <asm/byteorder.h> @@ -163,4 +163,4 @@ struct icmp6_filter { #define MLD2_ALL_MCR_INIT { { { 0xff,0x02,0,0,0,0,0,0,0,0,0,0,0,0,0,0x16 } } } -#endif /* _UAPI_LINUX_ICMPV6_H */ +#endif /* _LINUX_ICMPV6_H */ diff --git a/include/uapi/linux/if.h b/include/uapi/linux/if.h index 1ec407b01e46..7f261c08e816 100644 --- a/include/uapi/linux/if.h +++ b/include/uapi/linux/if.h @@ -21,7 +21,7 @@ #include <linux/types.h> /* for "__kernel_caddr_t" et al */ #include <linux/socket.h> /* for "struct sockaddr" et al */ -#include <linux/compiler.h> /* for "__user" et al */ + /* for "__user" et al */ #define IFNAMSIZ 16 #define IFALIASZ 256 @@ -154,15 +154,15 @@ struct if_settings { unsigned int size; /* Size of the data allocated by the caller */ union { /* {atm/eth/dsl}_settings anyone ? */ - raw_hdlc_proto __user *raw_hdlc; - cisco_proto __user *cisco; - fr_proto __user *fr; - fr_proto_pvc __user *fr_pvc; - fr_proto_pvc_info __user *fr_pvc_info; + raw_hdlc_proto *raw_hdlc; + cisco_proto *cisco; + fr_proto *fr; + fr_proto_pvc *fr_pvc; + fr_proto_pvc_info *fr_pvc_info; /* interface settings */ - sync_serial_settings __user *sync; - te1_settings __user *te1; + sync_serial_settings *sync; + te1_settings *te1; } ifs_ifsu; }; @@ -192,7 +192,7 @@ struct ifreq { struct ifmap ifru_map; char ifru_slave[IFNAMSIZ]; /* Just fits the size */ char ifru_newname[IFNAMSIZ]; - void __user * ifru_data; + void * ifru_data; struct if_settings ifru_settings; } ifr_ifru; }; @@ -225,8 +225,8 @@ struct ifreq { struct ifconf { int ifc_len; /* size of buffer */ union { - char __user *ifcu_buf; - struct ifreq __user *ifcu_req; + char *ifcu_buf; + struct ifreq *ifcu_req; } ifc_ifcu; }; #define ifc_buf ifc_ifcu.ifcu_buf /* buffer address */ diff --git a/include/uapi/linux/if_addr.h b/include/uapi/linux/if_addr.h index 23357ab81a77..58b39f47ae67 100644 --- a/include/uapi/linux/if_addr.h +++ b/include/uapi/linux/if_addr.h @@ -53,9 +53,7 @@ struct ifa_cacheinfo { }; /* backwards compatibility for userspace */ -#ifndef __KERNEL__ #define IFA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg)))) #define IFA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifaddrmsg)) -#endif #endif diff --git a/include/uapi/linux/if_arp.h b/include/uapi/linux/if_arp.h index d7fea3496f32..0da6f5e70e92 100644 --- a/include/uapi/linux/if_arp.h +++ b/include/uapi/linux/if_arp.h @@ -20,8 +20,8 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI_LINUX_IF_ARP_H -#define _UAPI_LINUX_IF_ARP_H +#ifndef _LINUX_IF_ARP_H +#define _LINUX_IF_ARP_H #include <linux/netdevice.h> @@ -157,4 +157,4 @@ struct arphdr { }; -#endif /* _UAPI_LINUX_IF_ARP_H */ +#endif /* _LINUX_IF_ARP_H */ diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h index 39f621a9fe82..ed6868ecebac 100644 --- a/include/uapi/linux/if_bridge.h +++ b/include/uapi/linux/if_bridge.h @@ -10,11 +10,12 @@ * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI_LINUX_IF_BRIDGE_H -#define _UAPI_LINUX_IF_BRIDGE_H +#ifndef _LINUX_IF_BRIDGE_H +#define _LINUX_IF_BRIDGE_H #include <linux/types.h> #include <linux/if_ether.h> +#include <linux/in6.h> #define SYSFS_BRIDGE_ATTR "bridge" #define SYSFS_BRIDGE_FDB "brforward" @@ -194,4 +195,4 @@ enum { }; #define MDBA_SET_ENTRY_MAX (__MDBA_SET_ENTRY_MAX - 1) -#endif /* _UAPI_LINUX_IF_BRIDGE_H */ +#endif /* _LINUX_IF_BRIDGE_H */ diff --git a/include/uapi/linux/if_eql.h b/include/uapi/linux/if_eql.h index 06e818c9e7cb..3b489be26885 100644 --- a/include/uapi/linux/if_eql.h +++ b/include/uapi/linux/if_eql.h @@ -16,8 +16,8 @@ * Phone: 1-703-847-0040 ext 103 */ -#ifndef _UAPI_LINUX_IF_EQL_H -#define _UAPI_LINUX_IF_EQL_H +#ifndef _LINUX_IF_EQL_H +#define _LINUX_IF_EQL_H #define EQL_DEFAULT_SLAVE_PRIORITY 28800 #define EQL_DEFAULT_MAX_SLAVES 4 @@ -51,4 +51,4 @@ typedef struct slaving_request { } slaving_request_t; -#endif /* _UAPI_LINUX_IF_EQL_H */ +#endif /* _LINUX_IF_EQL_H */ diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h index ade07f1c491a..8873c0090373 100644 --- a/include/uapi/linux/if_ether.h +++ b/include/uapi/linux/if_ether.h @@ -18,10 +18,11 @@ * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI_LINUX_IF_ETHER_H -#define _UAPI_LINUX_IF_ETHER_H +#ifndef _LINUX_IF_ETHER_H +#define _LINUX_IF_ETHER_H #include <linux/types.h> +#include <linux/libc-compat.h> /* * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble @@ -130,11 +131,12 @@ * This is an Ethernet frame header. */ +#if __UAPI_DEF_ETHHDR struct ethhdr { unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ unsigned char h_source[ETH_ALEN]; /* source ether addr */ __be16 h_proto; /* packet type ID field */ } __attribute__((packed)); +#endif - -#endif /* _UAPI_LINUX_IF_ETHER_H */ +#endif /* _LINUX_IF_ETHER_H */ diff --git a/include/uapi/linux/if_fddi.h b/include/uapi/linux/if_fddi.h index 0d36909c3aef..e32cf70e439b 100644 --- a/include/uapi/linux/if_fddi.h +++ b/include/uapi/linux/if_fddi.h @@ -21,8 +21,8 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI_LINUX_IF_FDDI_H -#define _UAPI_LINUX_IF_FDDI_H +#ifndef _LINUX_IF_FDDI_H +#define _LINUX_IF_FDDI_H #include <linux/types.h> @@ -101,4 +101,4 @@ struct fddihdr { } __attribute__((packed)); -#endif /* _UAPI_LINUX_IF_FDDI_H */ +#endif /* _LINUX_IF_FDDI_H */ diff --git a/include/uapi/linux/if_frad.h b/include/uapi/linux/if_frad.h index f25b08d5eb6b..30361db41d05 100644 --- a/include/uapi/linux/if_frad.h +++ b/include/uapi/linux/if_frad.h @@ -21,8 +21,8 @@ * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI_FRAD_H_ -#define _UAPI_FRAD_H_ +#ifndef _FRAD_H_ +#define _FRAD_H_ #include <linux/if.h> @@ -119,4 +119,4 @@ struct frad_conf #define FRAD_CLOCK_EXT 0x0000 -#endif /* _UAPI_FRAD_H_ */ +#endif /* _FRAD_H_ */ diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h index 80394e8dc3a3..ee4f2ba95e42 100644 --- a/include/uapi/linux/if_link.h +++ b/include/uapi/linux/if_link.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_IF_LINK_H -#define _UAPI_LINUX_IF_LINK_H +#ifndef _LINUX_IF_LINK_H +#define _LINUX_IF_LINK_H #include <linux/types.h> #include <linux/netlink.h> @@ -151,10 +151,8 @@ enum { #define IFLA_MAX (__IFLA_MAX - 1) /* backwards compatibility for userspace */ -#ifndef __KERNEL__ #define IFLA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg)))) #define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifinfomsg)) -#endif enum { IFLA_INET_UNSPEC, @@ -470,4 +468,4 @@ enum { #define IFLA_IPOIB_MAX (__IFLA_IPOIB_MAX - 1) -#endif /* _UAPI_LINUX_IF_LINK_H */ +#endif /* _LINUX_IF_LINK_H */ diff --git a/include/uapi/linux/if_ltalk.h b/include/uapi/linux/if_ltalk.h index b92c1fb6ac16..1f83ba04379e 100644 --- a/include/uapi/linux/if_ltalk.h +++ b/include/uapi/linux/if_ltalk.h @@ -1,9 +1,9 @@ -#ifndef _UAPI__LINUX_LTALK_H -#define _UAPI__LINUX_LTALK_H +#ifndef __LINUX_LTALK_H +#define __LINUX_LTALK_H #define LTALK_HLEN 1 #define LTALK_MTU 600 #define LTALK_ALEN 1 -#endif /* _UAPI__LINUX_LTALK_H */ +#endif /* __LINUX_LTALK_H */ diff --git a/include/uapi/linux/if_phonet.h b/include/uapi/linux/if_phonet.h index f7ad9e24eb3d..63371bcb6198 100644 --- a/include/uapi/linux/if_phonet.h +++ b/include/uapi/linux/if_phonet.h @@ -5,12 +5,12 @@ * * Copyright (C) 2008 Nokia Corporation. All rights reserved. */ -#ifndef _UAPILINUX_IF_PHONET_H -#define _UAPILINUX_IF_PHONET_H +#ifndef LINUX_IF_PHONET_H +#define LINUX_IF_PHONET_H #define PHONET_MIN_MTU 6 /* pn_length = 0 */ #define PHONET_MAX_MTU 65541 /* pn_length = 0xffff */ #define PHONET_DEV_MTU PHONET_MAX_MTU -#endif /* _UAPILINUX_IF_PHONET_H */ +#endif /* LINUX_IF_PHONET_H */ diff --git a/include/uapi/linux/if_pppol2tp.h b/include/uapi/linux/if_pppol2tp.h index 163e8adac2d6..8e1221c851ae 100644 --- a/include/uapi/linux/if_pppol2tp.h +++ b/include/uapi/linux/if_pppol2tp.h @@ -12,8 +12,8 @@ * */ -#ifndef _UAPI__LINUX_IF_PPPOL2TP_H -#define _UAPI__LINUX_IF_PPPOL2TP_H +#ifndef __LINUX_IF_PPPOL2TP_H +#define __LINUX_IF_PPPOL2TP_H #include <linux/types.h> @@ -101,4 +101,4 @@ enum { -#endif /* _UAPI__LINUX_IF_PPPOL2TP_H */ +#endif /* __LINUX_IF_PPPOL2TP_H */ diff --git a/include/uapi/linux/if_pppox.h b/include/uapi/linux/if_pppox.h index e128769331b5..acd0a2c2dd83 100644 --- a/include/uapi/linux/if_pppox.h +++ b/include/uapi/linux/if_pppox.h @@ -13,8 +13,8 @@ * */ -#ifndef _UAPI__LINUX_IF_PPPOX_H -#define _UAPI__LINUX_IF_PPPOX_H +#ifndef __LINUX_IF_PPPOX_H +#define __LINUX_IF_PPPOX_H #include <linux/types.h> @@ -65,7 +65,7 @@ struct sockaddr_pppox { struct pppoe_addr pppoe; struct pptp_addr pptp; } sa_addr; -} __packed; +} __attribute__((packed)); /* The use of the above union isn't viable because the size of this * struct must stay fixed over time -- applications use sizeof(struct @@ -76,13 +76,13 @@ struct sockaddr_pppol2tp { __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */ unsigned int sa_protocol; /* protocol identifier */ struct pppol2tp_addr pppol2tp; -} __packed; +} __attribute__((packed)); struct sockaddr_pppol2tpin6 { __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */ unsigned int sa_protocol; /* protocol identifier */ struct pppol2tpin6_addr pppol2tp; -} __packed; +} __attribute__((packed)); /* The L2TPv3 protocol changes tunnel and session ids from 16 to 32 * bits. So we need a different sockaddr structure. @@ -91,13 +91,13 @@ struct sockaddr_pppol2tpv3 { __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */ unsigned int sa_protocol; /* protocol identifier */ struct pppol2tpv3_addr pppol2tp; -} __packed; +} __attribute__((packed)); struct sockaddr_pppol2tpv3in6 { __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */ unsigned int sa_protocol; /* protocol identifier */ struct pppol2tpv3in6_addr pppol2tp; -} __packed; +} __attribute__((packed)); /********************************************************************* * @@ -147,10 +147,10 @@ struct pppoe_hdr { __be16 sid; __be16 length; struct pppoe_tag tag[0]; -} __packed; +} __attribute__((packed)); /* Length of entire PPPoE + PPP header */ #define PPPOE_SES_HLEN 8 -#endif /* _UAPI__LINUX_IF_PPPOX_H */ +#endif /* __LINUX_IF_PPPOX_H */ diff --git a/include/uapi/linux/if_team.h b/include/uapi/linux/if_team.h index 7b8fa339de30..cb92efa626ac 100644 --- a/include/uapi/linux/if_team.h +++ b/include/uapi/linux/if_team.h @@ -8,8 +8,8 @@ * (at your option) any later version. */ -#ifndef _UAPI_LINUX_IF_TEAM_H_ -#define _UAPI_LINUX_IF_TEAM_H_ +#ifndef _LINUX_IF_TEAM_H_ +#define _LINUX_IF_TEAM_H_ #define TEAM_STRING_MAX_LEN 32 @@ -104,4 +104,4 @@ enum { #define TEAM_GENL_VERSION 0x1 #define TEAM_GENL_CHANGE_EVENT_MC_GRP_NAME "change_event" -#endif /* _UAPI_LINUX_IF_TEAM_H_ */ +#endif /* _LINUX_IF_TEAM_H_ */ diff --git a/include/uapi/linux/if_tun.h b/include/uapi/linux/if_tun.h index e9502dd1ee2c..75cc8ace8875 100644 --- a/include/uapi/linux/if_tun.h +++ b/include/uapi/linux/if_tun.h @@ -13,8 +13,8 @@ * GNU General Public License for more details. */ -#ifndef _UAPI__IF_TUN_H -#define _UAPI__IF_TUN_H +#ifndef __IF_TUN_H +#define __IF_TUN_H #include <linux/types.h> #include <linux/if_ether.h> @@ -106,4 +106,4 @@ struct tun_filter { __u8 addr[0][ETH_ALEN]; }; -#endif /* _UAPI__IF_TUN_H */ +#endif /* __IF_TUN_H */ diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h index aee73d0611fb..9f471ca1b2cd 100644 --- a/include/uapi/linux/if_tunnel.h +++ b/include/uapi/linux/if_tunnel.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_IF_TUNNEL_H_ -#define _UAPI_IF_TUNNEL_H_ +#ifndef _IF_TUNNEL_H_ +#define _IF_TUNNEL_H_ #include <linux/types.h> #include <asm/byteorder.h> @@ -113,4 +113,4 @@ enum { }; #define IFLA_VTI_MAX (__IFLA_VTI_MAX - 1) -#endif /* _UAPI_IF_TUNNEL_H_ */ +#endif /* _IF_TUNNEL_H_ */ diff --git a/include/uapi/linux/if_vlan.h b/include/uapi/linux/if_vlan.h index 7e5e6b397332..24ae007160a1 100644 --- a/include/uapi/linux/if_vlan.h +++ b/include/uapi/linux/if_vlan.h @@ -10,8 +10,8 @@ * */ -#ifndef _UAPI_LINUX_IF_VLAN_H_ -#define _UAPI_LINUX_IF_VLAN_H_ +#ifndef _LINUX_IF_VLAN_H_ +#define _LINUX_IF_VLAN_H_ /* VLAN IOCTLs are found in sockios.h */ @@ -61,4 +61,4 @@ struct vlan_ioctl_args { short vlan_qos; }; -#endif /* _UAPI_LINUX_IF_VLAN_H_ */ +#endif /* _LINUX_IF_VLAN_H_ */ diff --git a/include/uapi/linux/igmp.h b/include/uapi/linux/igmp.h index ccbb32aa6704..2ead5c5e9974 100644 --- a/include/uapi/linux/igmp.h +++ b/include/uapi/linux/igmp.h @@ -13,8 +13,8 @@ * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI_LINUX_IGMP_H -#define _UAPI_LINUX_IGMP_H +#ifndef _LINUX_IGMP_H +#define _LINUX_IGMP_H #include <linux/types.h> #include <asm/byteorder.h> @@ -125,4 +125,4 @@ struct igmpv3_query { * struct for keeping the multicast list in */ -#endif /* _UAPI_LINUX_IGMP_H */ +#endif /* _LINUX_IGMP_H */ diff --git a/include/uapi/linux/in.h b/include/uapi/linux/in.h index f9e8e496ae5d..8c65d3138258 100644 --- a/include/uapi/linux/in.h +++ b/include/uapi/linux/in.h @@ -15,8 +15,8 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI_LINUX_IN_H -#define _UAPI_LINUX_IN_H +#ifndef _LINUX_IN_H +#define _LINUX_IN_H #include <linux/types.h> #include <linux/socket.h> @@ -273,4 +273,4 @@ struct sockaddr_in { #include <asm/byteorder.h> -#endif /* _UAPI_LINUX_IN_H */ +#endif /* _LINUX_IN_H */ diff --git a/include/uapi/linux/in6.h b/include/uapi/linux/in6.h index 440d5c479145..cd4ccb34957b 100644 --- a/include/uapi/linux/in6.h +++ b/include/uapi/linux/in6.h @@ -18,8 +18,8 @@ * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI_LINUX_IN6_H -#define _UAPI_LINUX_IN6_H +#ifndef _LINUX_IN6_H +#define _LINUX_IN6_H #include <linux/types.h> #include <linux/libc-compat.h> @@ -126,22 +126,13 @@ struct in6_flowlabel_req { * IPV6 extension headers */ #if __UAPI_DEF_IPPROTO_V6 -enum { - IPPROTO_HOPOPTS = 0, /* IPv6 hop-by-hop options */ -#define IPPROTO_HOPOPTS IPPROTO_HOPOPTS - IPPROTO_ROUTING = 43, /* IPv6 routing header */ -#define IPPROTO_ROUTING IPPROTO_ROUTING - IPPROTO_FRAGMENT = 44, /* IPv6 fragmentation header */ -#define IPPROTO_FRAGMENT IPPROTO_FRAGMENT - IPPROTO_ICMPV6 = 58, /* ICMPv6 */ -#define IPPROTO_ICMPV6 IPPROTO_ICMPV6 - IPPROTO_NONE = 59, /* IPv6 no next header */ -#define IPPROTO_NONE IPPROTO_NONE - IPPROTO_DSTOPTS = 60, /* IPv6 destination options */ -#define IPPROTO_DSTOPTS IPPROTO_DSTOPTS - IPPROTO_MH = 135, /* IPv6 mobility header */ -#define IPPROTO_MH IPPROTO_MH -}; +#define IPPROTO_HOPOPTS 0 /* IPv6 hop-by-hop options */ +#define IPPROTO_ROUTING 43 /* IPv6 routing header */ +#define IPPROTO_FRAGMENT 44 /* IPv6 fragmentation header */ +#define IPPROTO_ICMPV6 58 /* ICMPv6 */ +#define IPPROTO_NONE 59 /* IPv6 no next header */ +#define IPPROTO_DSTOPTS 60 /* IPv6 destination options */ +#define IPPROTO_MH 135 /* IPv6 mobility header */ #endif /* __UAPI_DEF_IPPROTO_V6 */ /* @@ -287,4 +278,4 @@ enum { * ... * MRT6_MAX */ -#endif /* _UAPI_LINUX_IN6_H */ +#endif /* _LINUX_IN6_H */ diff --git a/include/uapi/linux/inet_diag.h b/include/uapi/linux/inet_diag.h index bbde90fa5838..e34f24774ee9 100644 --- a/include/uapi/linux/inet_diag.h +++ b/include/uapi/linux/inet_diag.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_INET_DIAG_H_ -#define _UAPI_INET_DIAG_H_ +#ifndef _INET_DIAG_H_ +#define _INET_DIAG_H_ #include <linux/types.h> @@ -134,4 +134,4 @@ struct tcpvegas_info { }; -#endif /* _UAPI_INET_DIAG_H_ */ +#endif /* _INET_DIAG_H_ */ diff --git a/include/uapi/linux/inotify.h b/include/uapi/linux/inotify.h index e6bf35b2dd34..44a1a27f5ca6 100644 --- a/include/uapi/linux/inotify.h +++ b/include/uapi/linux/inotify.h @@ -4,8 +4,8 @@ * Copyright (C) 2005 John McCutchan */ -#ifndef _UAPI_LINUX_INOTIFY_H -#define _UAPI_LINUX_INOTIFY_H +#ifndef _LINUX_INOTIFY_H +#define _LINUX_INOTIFY_H /* For O_CLOEXEC and O_NONBLOCK */ #include <linux/fcntl.h> @@ -71,4 +71,4 @@ struct inotify_event { #define IN_NONBLOCK O_NONBLOCK -#endif /* _UAPI_LINUX_INOTIFY_H */ +#endif /* _LINUX_INOTIFY_H */ diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h index a3726275876d..ba88cecb29aa 100644 --- a/include/uapi/linux/input.h +++ b/include/uapi/linux/input.h @@ -5,16 +5,14 @@ * under the terms of the GNU General Public License version 2 as published by * the Free Software Foundation. */ -#ifndef _UAPI_INPUT_H -#define _UAPI_INPUT_H +#ifndef _INPUT_H +#define _INPUT_H -#ifndef __KERNEL__ #include <sys/time.h> #include <sys/ioctl.h> #include <sys/types.h> #include <linux/types.h> -#endif /* @@ -1073,7 +1071,7 @@ struct ff_periodic_effect { struct ff_envelope envelope; __u32 custom_len; - __s16 __user *custom_data; + __s16 *custom_data; }; /** @@ -1168,4 +1166,4 @@ struct ff_effect { #define FF_MAX 0x7f #define FF_CNT (FF_MAX+1) -#endif /* _UAPI_INPUT_H */ +#endif /* _INPUT_H */ diff --git a/include/uapi/linux/ip.h b/include/uapi/linux/ip.h index 411959405ab6..e0dbbc3a9cf9 100644 --- a/include/uapi/linux/ip.h +++ b/include/uapi/linux/ip.h @@ -14,8 +14,8 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI_LINUX_IP_H -#define _UAPI_LINUX_IP_H +#ifndef _LINUX_IP_H +#define _LINUX_IP_H #include <linux/types.h> #include <asm/byteorder.h> @@ -169,4 +169,4 @@ enum #define IPV4_DEVCONF_MAX (__IPV4_DEVCONF_MAX - 1) -#endif /* _UAPI_LINUX_IP_H */ +#endif /* _LINUX_IP_H */ diff --git a/include/uapi/linux/ipc.h b/include/uapi/linux/ipc.h index de08dd46ddae..98a53a1b82ea 100644 --- a/include/uapi/linux/ipc.h +++ b/include/uapi/linux/ipc.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_IPC_H -#define _UAPI_LINUX_IPC_H +#ifndef _LINUX_IPC_H +#define _LINUX_IPC_H #include <linux/types.h> @@ -55,7 +55,7 @@ struct ipc_perm * See architecture code for ugly details.. */ struct ipc_kludge { - struct msgbuf __user *msgp; + struct msgbuf *msgp; long msgtyp; }; @@ -78,4 +78,4 @@ struct ipc_kludge { #define IPCCALL(version,op) ((version)<<16 | (op)) -#endif /* _UAPI_LINUX_IPC_H */ +#endif /* _LINUX_IPC_H */ diff --git a/include/uapi/linux/ipmi.h b/include/uapi/linux/ipmi.h index 7b26a62e5707..9077549eb66d 100644 --- a/include/uapi/linux/ipmi.h +++ b/include/uapi/linux/ipmi.h @@ -31,11 +31,11 @@ * 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _UAPI__LINUX_IPMI_H -#define _UAPI__LINUX_IPMI_H +#ifndef __LINUX_IPMI_H +#define __LINUX_IPMI_H #include <linux/ipmi_msgdefs.h> -#include <linux/compiler.h> + /* * This file describes an interface to an IPMI driver. You have to @@ -154,7 +154,7 @@ struct ipmi_msg { unsigned char netfn; unsigned char cmd; unsigned short data_len; - unsigned char __user *data; + unsigned char *data; }; struct kernel_ipmi_msg { @@ -250,7 +250,7 @@ struct kernel_ipmi_msg { /* Messages sent to the interface are this format. */ struct ipmi_req { - unsigned char __user *addr; /* Address to send the message to. */ + unsigned char *addr; /* Address to send the message to. */ unsigned int addr_len; long msgid; /* The sequence number for the message. This @@ -299,7 +299,7 @@ struct ipmi_recv { int recv_type; /* Is this a command, response or an asyncronous event. */ - unsigned char __user *addr; /* Address the message was from is put + unsigned char *addr; /* Address the message was from is put here. The caller must supply the memory. */ unsigned int addr_len; /* The size of the address buffer. @@ -445,4 +445,4 @@ struct ipmi_timing_parms { #define IPMICTL_GET_MAINTENANCE_MODE_CMD _IOR(IPMI_IOC_MAGIC, 30, int) #define IPMICTL_SET_MAINTENANCE_MODE_CMD _IOW(IPMI_IOC_MAGIC, 31, int) -#endif /* _UAPI__LINUX_IPMI_H */ +#endif /* __LINUX_IPMI_H */ diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h index 593b0e32d956..4113a27e2650 100644 --- a/include/uapi/linux/ipv6.h +++ b/include/uapi/linux/ipv6.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_IPV6_H -#define _UAPI_IPV6_H +#ifndef _IPV6_H +#define _IPV6_H #include <linux/types.h> #include <linux/in6.h> @@ -167,4 +167,4 @@ enum { }; -#endif /* _UAPI_IPV6_H */ +#endif /* _IPV6_H */ diff --git a/include/uapi/linux/ipv6_route.h b/include/uapi/linux/ipv6_route.h index 2be7bd174751..40490f3d91c5 100644 --- a/include/uapi/linux/ipv6_route.h +++ b/include/uapi/linux/ipv6_route.h @@ -10,8 +10,8 @@ * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI_LINUX_IPV6_ROUTE_H -#define _UAPI_LINUX_IPV6_ROUTE_H +#ifndef _LINUX_IPV6_ROUTE_H +#define _LINUX_IPV6_ROUTE_H #include <linux/types.h> @@ -58,4 +58,4 @@ struct in6_rtmsg { #define IP6_RT_PRIO_USER 1024 #define IP6_RT_PRIO_ADDRCONF 256 -#endif /* _UAPI_LINUX_IPV6_ROUTE_H */ +#endif /* _LINUX_IPV6_ROUTE_H */ diff --git a/include/uapi/linux/isdn.h b/include/uapi/linux/isdn.h index eb1995fffc39..55c0a1e6a3de 100644 --- a/include/uapi/linux/isdn.h +++ b/include/uapi/linux/isdn.h @@ -11,8 +11,8 @@ * */ -#ifndef _UAPI__ISDN_H__ -#define _UAPI__ISDN_H__ +#ifndef __ISDN_H__ +#define __ISDN_H__ #include <linux/ioctl.h> #include <linux/tty.h> @@ -140,4 +140,4 @@ typedef struct { #define ISDN_NET_DIALMODE(x) ((&(x))->flags & ISDN_NET_DIALMODE_MASK) -#endif /* _UAPI__ISDN_H__ */ +#endif /* __ISDN_H__ */ diff --git a/include/uapi/linux/isdn_divertif.h b/include/uapi/linux/isdn_divertif.h index 3e3c2d898416..67575ba305e4 100644 --- a/include/uapi/linux/isdn_divertif.h +++ b/include/uapi/linux/isdn_divertif.h @@ -10,8 +10,8 @@ * */ -#ifndef _UAPI_LINUX_ISDN_DIVERTIF_H -#define _UAPI_LINUX_ISDN_DIVERTIF_H +#ifndef _LINUX_ISDN_DIVERTIF_H +#define _LINUX_ISDN_DIVERTIF_H /***********************************************************/ /* magic value is also used to control version information */ @@ -27,4 +27,4 @@ #define DIVERT_REG_NAME isdn_register_divert -#endif /* _UAPI_LINUX_ISDN_DIVERTIF_H */ +#endif /* _LINUX_ISDN_DIVERTIF_H */ diff --git a/include/uapi/linux/isdn_ppp.h b/include/uapi/linux/isdn_ppp.h index e7d7bd2aed3f..aabb015349f4 100644 --- a/include/uapi/linux/isdn_ppp.h +++ b/include/uapi/linux/isdn_ppp.h @@ -10,8 +10,8 @@ * */ -#ifndef _UAPI_LINUX_ISDN_PPP_H -#define _UAPI_LINUX_ISDN_PPP_H +#ifndef _LINUX_ISDN_PPP_H +#define _LINUX_ISDN_PPP_H #define CALLTYPE_INCOMING 0x1 #define CALLTYPE_OUTGOING 0x2 @@ -64,4 +64,4 @@ struct isdn_ppp_comp_data { int flags; }; -#endif /* _UAPI_LINUX_ISDN_PPP_H */ +#endif /* _LINUX_ISDN_PPP_H */ diff --git a/include/uapi/linux/isdnif.h b/include/uapi/linux/isdnif.h index 246138c01c4d..1db1b0bd5ab0 100644 --- a/include/uapi/linux/isdnif.h +++ b/include/uapi/linux/isdnif.h @@ -11,8 +11,8 @@ * */ -#ifndef _UAPI__ISDNIF_H__ -#define _UAPI__ISDNIF_H__ +#ifndef __ISDNIF_H__ +#define __ISDNIF_H__ /* @@ -53,4 +53,4 @@ #define ISDN_PROTO_L3_MAX 7 /* Max. 8 Protocols */ -#endif /* _UAPI__ISDNIF_H__ */ +#endif /* __ISDNIF_H__ */ diff --git a/include/uapi/linux/ivtv.h b/include/uapi/linux/ivtv.h index 42bf725751af..120e82cac7d3 100644 --- a/include/uapi/linux/ivtv.h +++ b/include/uapi/linux/ivtv.h @@ -21,7 +21,7 @@ #ifndef __LINUX_IVTV_H__ #define __LINUX_IVTV_H__ -#include <linux/compiler.h> + #include <linux/types.h> #include <linux/videodev2.h> @@ -49,9 +49,9 @@ struct ivtv_dma_frame { enum v4l2_buf_type type; /* V4L2_BUF_TYPE_VIDEO_OUTPUT */ __u32 pixelformat; /* 0 == same as destination */ - void __user *y_source; /* if NULL and type == V4L2_BUF_TYPE_VIDEO_OUTPUT, + void *y_source; /* if NULL and type == V4L2_BUF_TYPE_VIDEO_OUTPUT, then just switch to user DMA YUV output mode */ - void __user *uv_source; /* Unused for RGB pixelformats */ + void *uv_source; /* Unused for RGB pixelformats */ struct v4l2_rect src; struct v4l2_rect dst; __u32 src_width; diff --git a/include/uapi/linux/ivtvfb.h b/include/uapi/linux/ivtvfb.h index e8b92f67f10d..97eaf4ea7fe6 100644 --- a/include/uapi/linux/ivtvfb.h +++ b/include/uapi/linux/ivtvfb.h @@ -21,13 +21,13 @@ #ifndef __LINUX_IVTVFB_H__ #define __LINUX_IVTVFB_H__ -#include <linux/compiler.h> + #include <linux/types.h> /* Framebuffer external API */ struct ivtvfb_dma_frame { - void __user *source; + void *source; unsigned long dest_offset; int count; }; diff --git a/include/uapi/linux/ixjuser.h b/include/uapi/linux/ixjuser.h index 94ab5e942e53..0b829f90c81c 100644 --- a/include/uapi/linux/ixjuser.h +++ b/include/uapi/linux/ixjuser.h @@ -348,7 +348,7 @@ typedef enum { typedef struct { int elements_used; IXJ_CADENCE_TERM termination; - IXJ_CADENCE_ELEMENT __user *ce; + IXJ_CADENCE_ELEMENT *ce; } IXJ_CADENCE; #define IXJCTL_TONE_CADENCE _IOW ('q', 0xCA, IXJ_CADENCE *) diff --git a/include/uapi/linux/joystick.h b/include/uapi/linux/joystick.h index b856fd11c70e..141a6d5a1133 100644 --- a/include/uapi/linux/joystick.h +++ b/include/uapi/linux/joystick.h @@ -22,8 +22,8 @@ * e-mail - mail your message to <vojtech@suse.cz>, or by paper mail: * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic */ -#ifndef _UAPI_LINUX_JOYSTICK_H -#define _UAPI_LINUX_JOYSTICK_H +#ifndef _LINUX_JOYSTICK_H +#define _LINUX_JOYSTICK_H @@ -133,4 +133,4 @@ struct JS_DATA_SAVE_TYPE_64 { }; -#endif /* _UAPI_LINUX_JOYSTICK_H */ +#endif /* _LINUX_JOYSTICK_H */ diff --git a/include/uapi/linux/kd.h b/include/uapi/linux/kd.h index 87b7cc439d7c..3286a3f437f0 100644 --- a/include/uapi/linux/kd.h +++ b/include/uapi/linux/kd.h @@ -1,7 +1,7 @@ -#ifndef _UAPI_LINUX_KD_H -#define _UAPI_LINUX_KD_H +#ifndef _LINUX_KD_H +#define _LINUX_KD_H #include <linux/types.h> -#include <linux/compiler.h> + /* 0x4B is 'K', to avoid collision with termios and vt */ @@ -13,7 +13,7 @@ struct consolefontdesc { unsigned short charcount; /* characters in font (256 or 512) */ unsigned short charheight; /* scan lines per character (1-32) */ - char __user *chardata; /* font data in expanded form */ + char *chardata; /* font data in expanded form */ }; #define PIO_FONTRESET 0x4B6D /* reset to default font */ @@ -64,7 +64,7 @@ struct unipair { }; struct unimapdesc { unsigned short entry_ct; - struct unipair __user *entries; + struct unipair *entries; }; #define PIO_UNIMAP 0x4B67 /* put unicode-to-font mapping in kernel */ #define PIO_UNIMAPCLR 0x4B68 /* clear table, possibly advise hash algorithm */ @@ -160,7 +160,7 @@ struct console_font_op { unsigned int flags; /* KD_FONT_FLAG_* */ unsigned int width, height; /* font size */ unsigned int charcount; - unsigned char __user *data; /* font data with height fixed to 32 */ + unsigned char *data; /* font data with height fixed to 32 */ }; struct console_font { @@ -180,4 +180,4 @@ struct console_font { don't reuse for the time being */ /* note: 0x4B60-0x4B6D, 0x4B70-0x4B72 used above */ -#endif /* _UAPI_LINUX_KD_H */ +#endif /* _LINUX_KD_H */ diff --git a/include/uapi/linux/kdev_t.h b/include/uapi/linux/kdev_t.h index 0d881fa7eb9c..3f100174d47a 100644 --- a/include/uapi/linux/kdev_t.h +++ b/include/uapi/linux/kdev_t.h @@ -1,6 +1,5 @@ -#ifndef _UAPI_LINUX_KDEV_T_H -#define _UAPI_LINUX_KDEV_T_H -#ifndef __KERNEL__ +#ifndef _LINUX_KDEV_T_H +#define _LINUX_KDEV_T_H /* Some programs want their definitions of MAJOR and MINOR and MKDEV @@ -9,5 +8,4 @@ from the kernel sources. These must be the externally visible ones. #define MAJOR(dev) ((dev)>>8) #define MINOR(dev) ((dev) & 0xff) #define MKDEV(ma,mi) ((ma)<<8 | (mi)) -#endif /* __KERNEL__ */ -#endif /* _UAPI_LINUX_KDEV_T_H */ +#endif /* _LINUX_KDEV_T_H */ diff --git a/include/uapi/linux/kernel-page-flags.h b/include/uapi/linux/kernel-page-flags.h index 5116a0e48172..9adddde3886d 100644 --- a/include/uapi/linux/kernel-page-flags.h +++ b/include/uapi/linux/kernel-page-flags.h @@ -1,5 +1,5 @@ -#ifndef _UAPILINUX_KERNEL_PAGE_FLAGS_H -#define _UAPILINUX_KERNEL_PAGE_FLAGS_H +#ifndef LINUX_KERNEL_PAGE_FLAGS_H +#define LINUX_KERNEL_PAGE_FLAGS_H /* * Stable page flag bits exported to user space @@ -33,4 +33,4 @@ #define KPF_THP 22 -#endif /* _UAPILINUX_KERNEL_PAGE_FLAGS_H */ +#endif /* LINUX_KERNEL_PAGE_FLAGS_H */ diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h index 321e399457f5..9fe3cff8fa1d 100644 --- a/include/uapi/linux/kernel.h +++ b/include/uapi/linux/kernel.h @@ -1,7 +1,5 @@ -#ifndef _UAPI_LINUX_KERNEL_H -#define _UAPI_LINUX_KERNEL_H - -#include <linux/sysinfo.h> +#ifndef _LINUX_KERNEL_H +#define _LINUX_KERNEL_H /* * 'kernel.h' contains some often-used function prototypes etc @@ -10,4 +8,4 @@ #define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) -#endif /* _UAPI_LINUX_KERNEL_H */ +#endif /* _LINUX_KERNEL_H */ diff --git a/include/uapi/linux/kernelcapi.h b/include/uapi/linux/kernelcapi.h index 89bf40d36d2a..7b6e7b160d39 100644 --- a/include/uapi/linux/kernelcapi.h +++ b/include/uapi/linux/kernelcapi.h @@ -7,8 +7,8 @@ * */ -#ifndef _UAPI__KERNELCAPI_H__ -#define _UAPI__KERNELCAPI_H__ +#ifndef __KERNELCAPI_H__ +#define __KERNELCAPI_H__ #define CAPI_MAXAPPL 240 /* maximum number of applications */ #define CAPI_MAXCONTR 32 /* maximum number of controller */ @@ -44,4 +44,4 @@ typedef struct kcapi_carddef { -#endif /* _UAPI__KERNELCAPI_H__ */ +#endif /* __KERNELCAPI_H__ */ diff --git a/include/uapi/linux/kexec.h b/include/uapi/linux/kexec.h index 104838f65bc1..5ebc302740b1 100644 --- a/include/uapi/linux/kexec.h +++ b/include/uapi/linux/kexec.h @@ -1,5 +1,5 @@ -#ifndef _UAPILINUX_KEXEC_H -#define _UAPILINUX_KEXEC_H +#ifndef LINUX_KEXEC_H +#define LINUX_KEXEC_H /* kexec system call - It loads the new kernel to boot into. * kexec does not sync, or unmount filesystems so if you need @@ -31,7 +31,6 @@ /* The artificial cap on the number of segments passed to kexec_load. */ #define KEXEC_SEGMENT_MAX 16 -#ifndef __KERNEL__ /* * This structure is used to hold the arguments that are used when * loading kernel binaries. @@ -49,6 +48,5 @@ struct kexec_segment { */ extern int kexec_load(void *, size_t, struct kexec_segment *, unsigned long int); -#endif /* __KERNEL__ */ -#endif /* _UAPILINUX_KEXEC_H */ +#endif /* LINUX_KEXEC_H */ diff --git a/include/uapi/linux/keyboard.h b/include/uapi/linux/keyboard.h index 5a6849721ab6..b4be860f64ab 100644 --- a/include/uapi/linux/keyboard.h +++ b/include/uapi/linux/keyboard.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__LINUX_KEYBOARD_H -#define _UAPI__LINUX_KEYBOARD_H +#ifndef __LINUX_KEYBOARD_H +#define __LINUX_KEYBOARD_H #include <linux/wait.h> @@ -440,4 +440,4 @@ #define NR_BRL 11 #define MAX_DIACR 256 -#endif /* _UAPI__LINUX_KEYBOARD_H */ +#endif /* __LINUX_KEYBOARD_H */ diff --git a/include/uapi/linux/l2tp.h b/include/uapi/linux/l2tp.h index 8adb68160327..c4bec82302a1 100644 --- a/include/uapi/linux/l2tp.h +++ b/include/uapi/linux/l2tp.h @@ -4,14 +4,12 @@ * Author: James Chapman <jchapman@katalix.com> */ -#ifndef _UAPI_LINUX_L2TP_H_ -#define _UAPI_LINUX_L2TP_H_ +#ifndef _LINUX_L2TP_H_ +#define _LINUX_L2TP_H_ #include <linux/types.h> #include <linux/socket.h> -#ifndef __KERNEL__ #include <netinet/in.h> -#endif #define IPPROTO_L2TP 115 @@ -177,4 +175,4 @@ enum l2tp_seqmode { #define L2TP_GENL_NAME "l2tp" #define L2TP_GENL_VERSION 0x1 -#endif /* _UAPI_LINUX_L2TP_H_ */ +#endif /* _LINUX_L2TP_H_ */ diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h index 335e8a7cad39..6eb3d36cf715 100644 --- a/include/uapi/linux/libc-compat.h +++ b/include/uapi/linux/libc-compat.h @@ -45,38 +45,41 @@ * * This prevents the redefinition of a construct already defined by the kernel. */ -#ifndef _UAPI_LIBC_COMPAT_H -#define _UAPI_LIBC_COMPAT_H +#ifndef _LIBC_COMPAT_H +#define _LIBC_COMPAT_H -/* We have included glibc headers... */ -#if defined(__GLIBC__) +#ifndef __KERNEL__ /* we're used from userspace */ -/* Coordinate with glibc netinet/in.h header. */ +#ifdef _NETINET_IF_ETHER_H /* musl */ +#define __UAPI_DEF_ETHHDR 0 +#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */ +#define __UAPI_DEF_ETHHDR 1 +#endif + +#ifdef _NETINET_TCP_H /* musl */ +#define __UAPI_DEF_TCPHDR 0 +#else +#define __UAPI_DEF_TCPHDR 1 +#endif + +/* Coordinate with libc netinet/in.h header. */ #if defined(_NETINET_IN_H) /* GLIBC headers included first so don't define anything * that would already be defined. */ #define __UAPI_DEF_IN6_ADDR 0 -/* The exception is the in6_addr macros which must be defined - * if the glibc code didn't define them. This guard matches - * the guard in glibc/inet/netinet/in.h which defines the - * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */ -#if defined(__USE_MISC) || defined (__USE_GNU) #define __UAPI_DEF_IN6_ADDR_ALT 0 -#else -#define __UAPI_DEF_IN6_ADDR_ALT 1 -#endif #define __UAPI_DEF_SOCKADDR_IN6 0 #define __UAPI_DEF_IPV6_MREQ 0 #define __UAPI_DEF_IPPROTO_V6 0 -#else +#else /* defined(_NETINET_IN_H) */ /* Linux headers included first, and we must define everything - * we need. The expectation is that glibc will check the + * we need. The expectation is that the libc will check the * __UAPI_DEF_* defines and adjust appropriately. */ #define __UAPI_DEF_IN6_ADDR 1 -/* We unconditionally define the in6_addr macros and glibc must +/* We unconditionally define the in6_addr macros and libc must * coordinate. */ #define __UAPI_DEF_IN6_ADDR_ALT 1 #define __UAPI_DEF_SOCKADDR_IN6 1 @@ -89,7 +92,7 @@ /* If we did not see any headers from any supported C libraries, * or we are being included in the kernel, then define everything * that we need. */ -#else /* !defined(__GLIBC__) */ +#else /* __KERNEL__ */ /* Definitions for in6.h */ #define __UAPI_DEF_IN6_ADDR 1 @@ -98,6 +101,6 @@ #define __UAPI_DEF_IPV6_MREQ 1 #define __UAPI_DEF_IPPROTO_V6 1 -#endif /* __GLIBC__ */ +#endif /* __KERNEL__ */ -#endif /* _UAPI_LIBC_COMPAT_H */ +#endif /* _LIBC_COMPAT_H */ diff --git a/include/uapi/linux/llc.h b/include/uapi/linux/llc.h index 9c987a402473..ff895d13e30e 100644 --- a/include/uapi/linux/llc.h +++ b/include/uapi/linux/llc.h @@ -10,8 +10,8 @@ * * See the GNU General Public License for more details. */ -#ifndef _UAPI__LINUX_LLC_H -#define _UAPI__LINUX_LLC_H +#ifndef __LINUX_LLC_H +#define __LINUX_LLC_H #include <linux/socket.h> @@ -81,4 +81,4 @@ struct llc_pktinfo { unsigned char lpi_mac[IFHWADDRLEN]; }; -#endif /* _UAPI__LINUX_LLC_H */ +#endif /* __LINUX_LLC_H */ diff --git a/include/uapi/linux/loop.h b/include/uapi/linux/loop.h index e0cecd2eabdc..adbd3c8baddb 100644 --- a/include/uapi/linux/loop.h +++ b/include/uapi/linux/loop.h @@ -6,8 +6,8 @@ * Copyright 1993 by Theodore Ts'o. Redistribution of this file is * permitted under the GNU General Public License. */ -#ifndef _UAPI_LINUX_LOOP_H -#define _UAPI_LINUX_LOOP_H +#ifndef _LINUX_LOOP_H +#define _LINUX_LOOP_H #define LO_NAME_SIZE 64 @@ -91,4 +91,4 @@ struct loop_info64 { #define LOOP_CTL_ADD 0x4C80 #define LOOP_CTL_REMOVE 0x4C81 #define LOOP_CTL_GET_FREE 0x4C82 -#endif /* _UAPI_LINUX_LOOP_H */ +#endif /* _LINUX_LOOP_H */ diff --git a/include/uapi/linux/lp.h b/include/uapi/linux/lp.h index a3406a51f196..3226e653db0d 100644 --- a/include/uapi/linux/lp.h +++ b/include/uapi/linux/lp.h @@ -4,8 +4,8 @@ * Interrupt support added 1993 Nigel Gamble * Removed 8255 status defines from inside __KERNEL__ Marcelo Tosatti */ -#ifndef _UAPI_LINUX_LP_H -#define _UAPI_LINUX_LP_H +#ifndef _LINUX_LP_H +#define _LINUX_LP_H /* @@ -97,4 +97,4 @@ #define LP_TIMEOUT_POLLED (10 * HZ) -#endif /* _UAPI_LINUX_LP_H */ +#endif /* _LINUX_LP_H */ diff --git a/include/uapi/linux/mdio.h b/include/uapi/linux/mdio.h index c94a510a577e..57672ddb3ba4 100644 --- a/include/uapi/linux/mdio.h +++ b/include/uapi/linux/mdio.h @@ -7,8 +7,8 @@ * by the Free Software Foundation, incorporated herein by reference. */ -#ifndef _UAPI__LINUX_MDIO_H__ -#define _UAPI__LINUX_MDIO_H__ +#ifndef __LINUX_MDIO_H__ +#define __LINUX_MDIO_H__ #include <linux/types.h> #include <linux/mii.h> @@ -289,9 +289,9 @@ #define MDIO_PHY_ID_C45_MASK \ (MDIO_PHY_ID_C45 | MDIO_PHY_ID_PRTAD | MDIO_PHY_ID_DEVAD) -static inline __u16 mdio_phy_id_c45(int prtad, int devad) +static __inline__ __u16 mdio_phy_id_c45(int prtad, int devad) { return MDIO_PHY_ID_C45 | (prtad << 5) | devad; } -#endif /* _UAPI__LINUX_MDIO_H__ */ +#endif /* __LINUX_MDIO_H__ */ diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h index ed49574ad757..e3036395cf21 100644 --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h @@ -120,9 +120,9 @@ struct media_link_desc { struct media_links_enum { __u32 entity; /* Should have enough room for pads elements */ - struct media_pad_desc __user *pads; + struct media_pad_desc *pads; /* Should have enough room for links elements */ - struct media_link_desc __user *links; + struct media_link_desc *links; __u32 reserved[4]; }; diff --git a/include/uapi/linux/mempolicy.h b/include/uapi/linux/mempolicy.h index 0d11c3dcd3a1..3bcdcc931ae8 100644 --- a/include/uapi/linux/mempolicy.h +++ b/include/uapi/linux/mempolicy.h @@ -2,8 +2,8 @@ * NUMA memory policies for Linux. * Copyright 2003,2004 Andi Kleen SuSE Labs */ -#ifndef _UAPI_LINUX_MEMPOLICY_H -#define _UAPI_LINUX_MEMPOLICY_H +#ifndef _LINUX_MEMPOLICY_H +#define _LINUX_MEMPOLICY_H #include <linux/errno.h> @@ -70,4 +70,4 @@ enum mpol_rebind_step { #define MPOL_F_MORON (1 << 4) /* Migrate On pte_numa Reference On Node */ -#endif /* _UAPI_LINUX_MEMPOLICY_H */ +#endif /* _LINUX_MEMPOLICY_H */ diff --git a/include/uapi/linux/mii.h b/include/uapi/linux/mii.h index 237fac4bc17b..c75eea1f55a2 100644 --- a/include/uapi/linux/mii.h +++ b/include/uapi/linux/mii.h @@ -5,8 +5,8 @@ * Copyright (C) 1996, 1999, 2001 David S. Miller (davem@redhat.com) */ -#ifndef _UAPI__LINUX_MII_H__ -#define _UAPI__LINUX_MII_H__ +#ifndef __LINUX_MII_H__ +#define __LINUX_MII_H__ #include <linux/types.h> #include <linux/ethtool.h> @@ -158,4 +158,4 @@ struct mii_ioctl_data { __u16 val_out; }; -#endif /* _UAPI__LINUX_MII_H__ */ +#endif /* __LINUX_MII_H__ */ diff --git a/include/uapi/linux/mman.h b/include/uapi/linux/mman.h index ade4acd3a90c..36b300419cb9 100644 --- a/include/uapi/linux/mman.h +++ b/include/uapi/linux/mman.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_MMAN_H -#define _UAPI_LINUX_MMAN_H +#ifndef _LINUX_MMAN_H +#define _LINUX_MMAN_H #include <asm/mman.h> @@ -10,4 +10,4 @@ #define OVERCOMMIT_ALWAYS 1 #define OVERCOMMIT_NEVER 2 -#endif /* _UAPI_LINUX_MMAN_H */ +#endif /* _LINUX_MMAN_H */ diff --git a/include/uapi/linux/mroute.h b/include/uapi/linux/mroute.h index a382d2c04a42..ef12aa4bd8ab 100644 --- a/include/uapi/linux/mroute.h +++ b/include/uapi/linux/mroute.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__LINUX_MROUTE_H -#define _UAPI__LINUX_MROUTE_H +#ifndef __LINUX_MROUTE_H +#define __LINUX_MROUTE_H #include <linux/sockios.h> #include <linux/types.h> @@ -143,4 +143,4 @@ struct igmpmsg { #define IGMPMSG_WHOLEPKT 3 /* For PIM Register processing */ -#endif /* _UAPI__LINUX_MROUTE_H */ +#endif /* __LINUX_MROUTE_H */ diff --git a/include/uapi/linux/mroute6.h b/include/uapi/linux/mroute6.h index ce91215cf7e6..72bcfa9bc427 100644 --- a/include/uapi/linux/mroute6.h +++ b/include/uapi/linux/mroute6.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__LINUX_MROUTE6_H -#define _UAPI__LINUX_MROUTE6_H +#ifndef __LINUX_MROUTE6_H +#define __LINUX_MROUTE6_H #include <linux/types.h> #include <linux/sockios.h> @@ -46,11 +46,9 @@ typedef unsigned short mifi_t; typedef __u32 if_mask; #define NIFBITS (sizeof(if_mask) * 8) /* bits per mask */ -#if !defined(__KERNEL__) #if !defined(DIV_ROUND_UP) #define DIV_ROUND_UP(x,y) (((x) + ((y) - 1)) / (y)) #endif -#endif typedef struct if_set { if_mask ifs_bits[DIV_ROUND_UP(IF_SETSIZE, NIFBITS)]; @@ -137,4 +135,4 @@ struct mrt6msg { struct in6_addr im6_src, im6_dst; }; -#endif /* _UAPI__LINUX_MROUTE6_H */ +#endif /* __LINUX_MROUTE6_H */ diff --git a/include/uapi/linux/msdos_fs.h b/include/uapi/linux/msdos_fs.h index e284ff919d6e..604042d739fc 100644 --- a/include/uapi/linux/msdos_fs.h +++ b/include/uapi/linux/msdos_fs.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_MSDOS_FS_H -#define _UAPI_LINUX_MSDOS_FS_H +#ifndef _LINUX_MSDOS_FS_H +#define _LINUX_MSDOS_FS_H #include <linux/types.h> #include <linux/magic.h> @@ -196,4 +196,4 @@ struct msdos_dir_slot { __u8 name11_12[4]; /* last 2 characters in name */ }; -#endif /* _UAPI_LINUX_MSDOS_FS_H */ +#endif /* _LINUX_MSDOS_FS_H */ diff --git a/include/uapi/linux/msg.h b/include/uapi/linux/msg.h index 22d95c6854e0..0a5029cc038b 100644 --- a/include/uapi/linux/msg.h +++ b/include/uapi/linux/msg.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_MSG_H -#define _UAPI_LINUX_MSG_H +#ifndef _LINUX_MSG_H +#define _LINUX_MSG_H #include <linux/ipc.h> @@ -73,4 +73,4 @@ struct msginfo { #define MSGSEG (__MSGSEG <= 0xffff ? __MSGSEG : 0xffff) -#endif /* _UAPI_LINUX_MSG_H */ +#endif /* _LINUX_MSG_H */ diff --git a/include/uapi/linux/n_r3964.h b/include/uapi/linux/n_r3964.h index 81337cbf40b7..168a0f997457 100644 --- a/include/uapi/linux/n_r3964.h +++ b/include/uapi/linux/n_r3964.h @@ -44,8 +44,8 @@ * */ -#ifndef _UAPI__LINUX_N_R3964_H__ -#define _UAPI__LINUX_N_R3964_H__ +#ifndef __LINUX_N_R3964_H__ +#define __LINUX_N_R3964_H__ /* line disciplines for r3964 protocol */ @@ -95,4 +95,4 @@ struct r3964_client_message { -#endif /* _UAPI__LINUX_N_R3964_H__ */ +#endif /* __LINUX_N_R3964_H__ */ diff --git a/include/uapi/linux/nbd.h b/include/uapi/linux/nbd.h index 4f52549b23ff..e2c80255adbb 100644 --- a/include/uapi/linux/nbd.h +++ b/include/uapi/linux/nbd.h @@ -12,8 +12,8 @@ * Removed PARANOIA, plus various cleanup and comments */ -#ifndef _UAPILINUX_NBD_H -#define _UAPILINUX_NBD_H +#ifndef LINUX_NBD_H +#define LINUX_NBD_H #include <linux/types.h> @@ -75,4 +75,4 @@ struct nbd_reply { __be32 error; /* 0 = ok, else error */ char handle[8]; /* handle you got from request */ }; -#endif /* _UAPILINUX_NBD_H */ +#endif /* LINUX_NBD_H */ diff --git a/include/uapi/linux/ncp.h b/include/uapi/linux/ncp.h index 99f0adeeb3f3..4482ad7acc8a 100644 --- a/include/uapi/linux/ncp.h +++ b/include/uapi/linux/ncp.h @@ -155,9 +155,6 @@ struct nw_info_struct { __u8 nameLen; __u8 entryName[256]; /* libncp may depend on there being nothing after entryName */ -#ifdef __KERNEL__ - struct nw_nfs_info nfs; -#endif } __attribute__((packed)); /* modify mask - use with MODIFY_DOS_INFO structure */ diff --git a/include/uapi/linux/ncp_fs.h b/include/uapi/linux/ncp_fs.h index e13eefef0653..9b844691d9f3 100644 --- a/include/uapi/linux/ncp_fs.h +++ b/include/uapi/linux/ncp_fs.h @@ -23,7 +23,7 @@ struct ncp_ioctl_request { unsigned int function; unsigned int size; - char __user *data; + char *data; }; struct ncp_fs_info { @@ -87,13 +87,13 @@ struct ncp_objectname_ioctl #define NCP_AUTH_NDS 0x32 int auth_type; size_t object_name_len; - void __user * object_name; /* a userspace data, in most cases user name */ + void * object_name; /* a userspace data, in most cases user name */ }; struct ncp_privatedata_ioctl { size_t len; - void __user * data; /* ~1000 for NDS */ + void * data; /* ~1000 for NDS */ }; /* NLS charsets by ioctl */ diff --git a/include/uapi/linux/net.h b/include/uapi/linux/net.h index 9457239ed219..24eaec3805bc 100644 --- a/include/uapi/linux/net.h +++ b/include/uapi/linux/net.h @@ -15,8 +15,8 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI_LINUX_NET_H -#define _UAPI_LINUX_NET_H +#ifndef _LINUX_NET_H +#define _LINUX_NET_H #include <linux/socket.h> #include <asm/socket.h> @@ -54,4 +54,4 @@ typedef enum { #define __SO_ACCEPTCON (1 << 16) /* performed a listen */ -#endif /* _UAPI_LINUX_NET_H */ +#endif /* _LINUX_NET_H */ diff --git a/include/uapi/linux/netconf.h b/include/uapi/linux/netconf.h index 64804a798b0c..52c44244e056 100644 --- a/include/uapi/linux/netconf.h +++ b/include/uapi/linux/netconf.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_NETCONF_H_ -#define _UAPI_LINUX_NETCONF_H_ +#ifndef _LINUX_NETCONF_H_ +#define _LINUX_NETCONF_H_ #include <linux/types.h> #include <linux/netlink.h> @@ -21,4 +21,4 @@ enum { #define NETCONFA_IFINDEX_ALL -1 #define NETCONFA_IFINDEX_DEFAULT -2 -#endif /* _UAPI_LINUX_NETCONF_H_ */ +#endif /* _LINUX_NETCONF_H_ */ diff --git a/include/uapi/linux/netdevice.h b/include/uapi/linux/netdevice.h index 6b9500bc2d56..adc726075b12 100644 --- a/include/uapi/linux/netdevice.h +++ b/include/uapi/linux/netdevice.h @@ -22,8 +22,8 @@ * * Moved to /usr/include/linux for NET3 */ -#ifndef _UAPI_LINUX_NETDEVICE_H -#define _UAPI_LINUX_NETDEVICE_H +#ifndef _LINUX_NETDEVICE_H +#define _LINUX_NETDEVICE_H #include <linux/if.h> #include <linux/if_ether.h> @@ -50,4 +50,4 @@ enum { }; -#endif /* _UAPI_LINUX_NETDEVICE_H */ +#endif /* _LINUX_NETDEVICE_H */ diff --git a/include/uapi/linux/netfilter.h b/include/uapi/linux/netfilter.h index f7dc0ebeeba5..f05c3d92eb12 100644 --- a/include/uapi/linux/netfilter.h +++ b/include/uapi/linux/netfilter.h @@ -1,8 +1,8 @@ -#ifndef _UAPI__LINUX_NETFILTER_H -#define _UAPI__LINUX_NETFILTER_H +#ifndef __LINUX_NETFILTER_H +#define __LINUX_NETFILTER_H #include <linux/types.h> -#include <linux/compiler.h> + #include <linux/sysctl.h> @@ -32,7 +32,6 @@ #define NF_DROP_ERR(x) (((-x) << 16) | NF_DROP) /* only for userspace compatibility */ -#ifndef __KERNEL__ /* Generic cache responses from hook functions. <= 0x2000 is used for protocol-flags. */ #define NFC_UNKNOWN 0x4000 @@ -40,7 +39,6 @@ /* NF_VERDICT_BITS should be 8 now, but userspace might break if this changes */ #define NF_VERDICT_BITS 16 -#endif enum nf_inet_hooks { NF_INET_PRE_ROUTING, @@ -69,4 +67,4 @@ union nf_inet_addr { struct in6_addr in6; }; -#endif /* _UAPI__LINUX_NETFILTER_H */ +#endif /* __LINUX_NETFILTER_H */ diff --git a/include/uapi/linux/netfilter/ipset/ip_set.h b/include/uapi/linux/netfilter/ipset/ip_set.h index 8024cdf13b70..412c645235bb 100644 --- a/include/uapi/linux/netfilter/ipset/ip_set.h +++ b/include/uapi/linux/netfilter/ipset/ip_set.h @@ -7,8 +7,8 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#ifndef _UAPI_IP_SET_H -#define _UAPI_IP_SET_H +#ifndef _IP_SET_H +#define _IP_SET_H #include <linux/types.h> @@ -256,4 +256,4 @@ struct ip_set_req_version { unsigned int version; }; -#endif /* _UAPI_IP_SET_H */ +#endif /* _IP_SET_H */ diff --git a/include/uapi/linux/netfilter/ipset/ip_set_bitmap.h b/include/uapi/linux/netfilter/ipset/ip_set_bitmap.h index 6a2c038d1888..061a28e5c876 100644 --- a/include/uapi/linux/netfilter/ipset/ip_set_bitmap.h +++ b/include/uapi/linux/netfilter/ipset/ip_set_bitmap.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__IP_SET_BITMAP_H -#define _UAPI__IP_SET_BITMAP_H +#ifndef __IP_SET_BITMAP_H +#define __IP_SET_BITMAP_H /* Bitmap type specific error codes */ enum { @@ -10,4 +10,4 @@ enum { }; -#endif /* _UAPI__IP_SET_BITMAP_H */ +#endif /* __IP_SET_BITMAP_H */ diff --git a/include/uapi/linux/netfilter/ipset/ip_set_hash.h b/include/uapi/linux/netfilter/ipset/ip_set_hash.h index 352eeccdc7f2..34ac6cee5665 100644 --- a/include/uapi/linux/netfilter/ipset/ip_set_hash.h +++ b/include/uapi/linux/netfilter/ipset/ip_set_hash.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__IP_SET_HASH_H -#define _UAPI__IP_SET_HASH_H +#ifndef __IP_SET_HASH_H +#define __IP_SET_HASH_H /* Hash type specific error codes */ enum { @@ -18,4 +18,4 @@ enum { }; -#endif /* _UAPI__IP_SET_HASH_H */ +#endif /* __IP_SET_HASH_H */ diff --git a/include/uapi/linux/netfilter/ipset/ip_set_list.h b/include/uapi/linux/netfilter/ipset/ip_set_list.h index a44efaa98213..75e6175255f8 100644 --- a/include/uapi/linux/netfilter/ipset/ip_set_list.h +++ b/include/uapi/linux/netfilter/ipset/ip_set_list.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__IP_SET_LIST_H -#define _UAPI__IP_SET_LIST_H +#ifndef __IP_SET_LIST_H +#define __IP_SET_LIST_H /* List type specific error codes */ enum { @@ -18,4 +18,4 @@ enum { }; -#endif /* _UAPI__IP_SET_LIST_H */ +#endif /* __IP_SET_LIST_H */ diff --git a/include/uapi/linux/netfilter/nf_conntrack_common.h b/include/uapi/linux/netfilter/nf_conntrack_common.h index 8dd803818ebe..18044df5aec5 100644 --- a/include/uapi/linux/netfilter/nf_conntrack_common.h +++ b/include/uapi/linux/netfilter/nf_conntrack_common.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_NF_CONNTRACK_COMMON_H -#define _UAPI_NF_CONNTRACK_COMMON_H +#ifndef _NF_CONNTRACK_COMMON_H +#define _NF_CONNTRACK_COMMON_H /* Connection state tracking for netfilter. This is separated from, but required by, the NAT layer; it can also be used by an iptables extension. */ @@ -116,4 +116,4 @@ enum ip_conntrack_expect_events { #define NF_CT_EXPECT_USERSPACE 0x4 -#endif /* _UAPI_NF_CONNTRACK_COMMON_H */ +#endif /* _NF_CONNTRACK_COMMON_H */ diff --git a/include/uapi/linux/netfilter/nf_conntrack_ftp.h b/include/uapi/linux/netfilter/nf_conntrack_ftp.h index 1030315a41b5..a222fac6df5a 100644 --- a/include/uapi/linux/netfilter/nf_conntrack_ftp.h +++ b/include/uapi/linux/netfilter/nf_conntrack_ftp.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_NF_CONNTRACK_FTP_H -#define _UAPI_NF_CONNTRACK_FTP_H +#ifndef _NF_CONNTRACK_FTP_H +#define _NF_CONNTRACK_FTP_H /* FTP tracking. */ /* This enum is exposed to userspace */ @@ -15,4 +15,4 @@ enum nf_ct_ftp_type { }; -#endif /* _UAPI_NF_CONNTRACK_FTP_H */ +#endif /* _NF_CONNTRACK_FTP_H */ diff --git a/include/uapi/linux/netfilter/nf_conntrack_tcp.h b/include/uapi/linux/netfilter/nf_conntrack_tcp.h index 9993a421201c..08c2fb35ce12 100644 --- a/include/uapi/linux/netfilter/nf_conntrack_tcp.h +++ b/include/uapi/linux/netfilter/nf_conntrack_tcp.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_NF_CONNTRACK_TCP_H -#define _UAPI_NF_CONNTRACK_TCP_H +#ifndef _NF_CONNTRACK_TCP_H +#define _NF_CONNTRACK_TCP_H /* TCP tracking. */ #include <linux/types.h> @@ -48,4 +48,4 @@ struct nf_ct_tcp_flags { }; -#endif /* _UAPI_NF_CONNTRACK_TCP_H */ +#endif /* _NF_CONNTRACK_TCP_H */ diff --git a/include/uapi/linux/netfilter/nfnetlink.h b/include/uapi/linux/netfilter/nfnetlink.h index 4a4efafad5f4..9cd235b6f2fb 100644 --- a/include/uapi/linux/netfilter/nfnetlink.h +++ b/include/uapi/linux/netfilter/nfnetlink.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_NFNETLINK_H -#define _UAPI_NFNETLINK_H +#ifndef _NFNETLINK_H +#define _NFNETLINK_H #include <linux/types.h> #include <linux/netfilter/nfnetlink_compat.h> @@ -53,4 +53,4 @@ struct nfgenmsg { #define NFNL_SUBSYS_CTHELPER 9 #define NFNL_SUBSYS_COUNT 10 -#endif /* _UAPI_NFNETLINK_H */ +#endif /* _NFNETLINK_H */ diff --git a/include/uapi/linux/netfilter/nfnetlink_acct.h b/include/uapi/linux/netfilter/nfnetlink_acct.h index c7b6269e760b..e09d8bec9557 100644 --- a/include/uapi/linux/netfilter/nfnetlink_acct.h +++ b/include/uapi/linux/netfilter/nfnetlink_acct.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_NFNL_ACCT_H_ -#define _UAPI_NFNL_ACCT_H_ +#ifndef _NFNL_ACCT_H_ +#define _NFNL_ACCT_H_ #ifndef NFACCT_NAME_MAX #define NFACCT_NAME_MAX 32 @@ -24,4 +24,4 @@ enum nfnl_acct_type { #define NFACCT_MAX (__NFACCT_MAX - 1) -#endif /* _UAPI_NFNL_ACCT_H_ */ +#endif /* _NFNL_ACCT_H_ */ diff --git a/include/uapi/linux/netfilter/nfnetlink_compat.h b/include/uapi/linux/netfilter/nfnetlink_compat.h index ffb95036bbd4..74b9e55a4fca 100644 --- a/include/uapi/linux/netfilter/nfnetlink_compat.h +++ b/include/uapi/linux/netfilter/nfnetlink_compat.h @@ -3,7 +3,6 @@ #include <linux/types.h> -#ifndef __KERNEL__ /* Old nfnetlink macros for userspace */ /* nfnetlink groups: Up to 32 maximum */ @@ -59,5 +58,4 @@ struct nfattr { + NLMSG_ALIGN(sizeof(struct nfgenmsg)))) #define NFM_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct nfgenmsg)) -#endif /* ! __KERNEL__ */ #endif /* _NFNETLINK_COMPAT_H */ diff --git a/include/uapi/linux/netfilter/x_tables.h b/include/uapi/linux/netfilter/x_tables.h index c36969b91533..412097007277 100644 --- a/include/uapi/linux/netfilter/x_tables.h +++ b/include/uapi/linux/netfilter/x_tables.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_X_TABLES_H -#define _UAPI_X_TABLES_H +#ifndef _X_TABLES_H +#define _X_TABLES_H #include <linux/kernel.h> #include <linux/types.h> @@ -123,7 +123,6 @@ struct xt_counters_info { #define XT_INV_PROTO 0x40 /* Invert the sense of PROTO. */ -#ifndef __KERNEL__ /* fn returns 0 to continue iteration */ #define XT_MATCH_ITERATE(type, e, fn, args...) \ ({ \ @@ -167,7 +166,6 @@ struct xt_counters_info { #define XT_ENTRY_ITERATE(type, entries, size, fn, args...) \ XT_ENTRY_ITERATE_CONTINUE(type, entries, size, 0, fn, args) -#endif /* !__KERNEL__ */ /* pos is normally a struct ipt_entry/ip6t_entry/etc. */ #define xt_entry_foreach(pos, ehead, esize) \ @@ -184,4 +182,4 @@ struct xt_counters_info { (pos)->u.match_size)) -#endif /* _UAPI_X_TABLES_H */ +#endif /* _X_TABLES_H */ diff --git a/include/uapi/linux/netfilter/xt_connlimit.h b/include/uapi/linux/netfilter/xt_connlimit.h index f1656096121e..cdcc117f5385 100644 --- a/include/uapi/linux/netfilter/xt_connlimit.h +++ b/include/uapi/linux/netfilter/xt_connlimit.h @@ -14,12 +14,10 @@ enum { struct xt_connlimit_info { union { union nf_inet_addr mask; -#ifndef __KERNEL__ union { __be32 v4_mask; __be32 v6_mask[4]; }; -#endif }; unsigned int limit; /* revision 1 */ diff --git a/include/uapi/linux/netfilter/xt_hashlimit.h b/include/uapi/linux/netfilter/xt_hashlimit.h index cbfc43d1af68..33511b734cda 100644 --- a/include/uapi/linux/netfilter/xt_hashlimit.h +++ b/include/uapi/linux/netfilter/xt_hashlimit.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_XT_HASHLIMIT_H -#define _UAPI_XT_HASHLIMIT_H +#ifndef _XT_HASHLIMIT_H +#define _XT_HASHLIMIT_H #include <linux/types.h> @@ -70,4 +70,4 @@ struct xt_hashlimit_mtinfo1 { struct xt_hashlimit_htable *hinfo __attribute__((aligned(8))); }; -#endif /* _UAPI_XT_HASHLIMIT_H */ +#endif /* _XT_HASHLIMIT_H */ diff --git a/include/uapi/linux/netfilter/xt_physdev.h b/include/uapi/linux/netfilter/xt_physdev.h index db7a2982e9c0..8ab7eb719b49 100644 --- a/include/uapi/linux/netfilter/xt_physdev.h +++ b/include/uapi/linux/netfilter/xt_physdev.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_XT_PHYSDEV_H -#define _UAPI_XT_PHYSDEV_H +#ifndef _XT_PHYSDEV_H +#define _XT_PHYSDEV_H #include <linux/types.h> @@ -20,4 +20,4 @@ struct xt_physdev_info { __u8 bitmask; }; -#endif /* _UAPI_XT_PHYSDEV_H */ +#endif /* _XT_PHYSDEV_H */ diff --git a/include/uapi/linux/netfilter/xt_policy.h b/include/uapi/linux/netfilter/xt_policy.h index be8ead05c316..d246eac81f8d 100644 --- a/include/uapi/linux/netfilter/xt_policy.h +++ b/include/uapi/linux/netfilter/xt_policy.h @@ -26,30 +26,19 @@ struct xt_policy_spec { reqid:1; }; -#ifndef __KERNEL__ union xt_policy_addr { struct in_addr a4; struct in6_addr a6; }; -#endif struct xt_policy_elem { union { -#ifdef __KERNEL__ - struct { - union nf_inet_addr saddr; - union nf_inet_addr smask; - union nf_inet_addr daddr; - union nf_inet_addr dmask; - }; -#else struct { union xt_policy_addr saddr; union xt_policy_addr smask; union xt_policy_addr daddr; union xt_policy_addr dmask; }; -#endif }; __be32 spi; __u32 reqid; diff --git a/include/uapi/linux/netfilter/xt_rpfilter.h b/include/uapi/linux/netfilter/xt_rpfilter.h index 8358d4f71952..672b60516c9a 100644 --- a/include/uapi/linux/netfilter/xt_rpfilter.h +++ b/include/uapi/linux/netfilter/xt_rpfilter.h @@ -8,12 +8,6 @@ enum { XT_RPFILTER_VALID_MARK = 1 << 1, XT_RPFILTER_ACCEPT_LOCAL = 1 << 2, XT_RPFILTER_INVERT = 1 << 3, -#ifdef __KERNEL__ - XT_RPFILTER_OPTION_MASK = XT_RPFILTER_LOOSE | - XT_RPFILTER_VALID_MARK | - XT_RPFILTER_ACCEPT_LOCAL | - XT_RPFILTER_INVERT, -#endif }; struct xt_rpfilter_info { diff --git a/include/uapi/linux/netfilter/xt_sctp.h b/include/uapi/linux/netfilter/xt_sctp.h index 29287be696a2..a501e6196905 100644 --- a/include/uapi/linux/netfilter/xt_sctp.h +++ b/include/uapi/linux/netfilter/xt_sctp.h @@ -66,7 +66,7 @@ struct xt_sctp_info { #define SCTP_CHUNKMAP_IS_CLEAR(chunkmap) \ __sctp_chunkmap_is_clear((chunkmap), ARRAY_SIZE(chunkmap)) -static inline bool +static __inline__ bool __sctp_chunkmap_is_clear(const __u32 *chunkmap, unsigned int n) { unsigned int i; @@ -78,7 +78,7 @@ __sctp_chunkmap_is_clear(const __u32 *chunkmap, unsigned int n) #define SCTP_CHUNKMAP_IS_ALL_SET(chunkmap) \ __sctp_chunkmap_is_all_set((chunkmap), ARRAY_SIZE(chunkmap)) -static inline bool +static __inline__ bool __sctp_chunkmap_is_all_set(const __u32 *chunkmap, unsigned int n) { unsigned int i; diff --git a/include/uapi/linux/netfilter_arp/arp_tables.h b/include/uapi/linux/netfilter_arp/arp_tables.h index a5a86a4db6b3..bb1ec648af25 100644 --- a/include/uapi/linux/netfilter_arp/arp_tables.h +++ b/include/uapi/linux/netfilter_arp/arp_tables.h @@ -6,16 +6,15 @@ * flags are stored in host byte order (of course). */ -#ifndef _UAPI_ARPTABLES_H -#define _UAPI_ARPTABLES_H +#ifndef _ARPTABLES_H +#define _ARPTABLES_H #include <linux/types.h> -#include <linux/compiler.h> + #include <linux/netfilter_arp.h> #include <linux/netfilter/x_tables.h> -#ifndef __KERNEL__ #define ARPT_FUNCTION_MAXNAMELEN XT_FUNCTION_MAXNAMELEN #define ARPT_TABLE_MAXNAMELEN XT_TABLE_MAXNAMELEN #define arpt_entry_target xt_entry_target @@ -29,7 +28,6 @@ #define ARPT_ERROR_TARGET XT_ERROR_TARGET #define ARPT_ENTRY_ITERATE(entries, size, fn, args...) \ XT_ENTRY_ITERATE(struct arpt_entry, entries, size, fn, ## args) -#endif #define ARPT_DEV_ADDR_LEN_MAX 16 @@ -176,7 +174,7 @@ struct arpt_replace { /* Number of counters (must be equal to current number of entries). */ unsigned int num_counters; /* The old entries' counters. */ - struct xt_counters __user *counters; + struct xt_counters *counters; /* The entries (hang off end: not really an array). */ struct arpt_entry entries[0]; @@ -203,4 +201,4 @@ static __inline__ struct xt_entry_target *arpt_get_target(struct arpt_entry *e) /* * Main firewall chains definitions and global var's definitions. */ -#endif /* _UAPI_ARPTABLES_H */ +#endif /* _ARPTABLES_H */ diff --git a/include/uapi/linux/netfilter_bridge.h b/include/uapi/linux/netfilter_bridge.h index a5eda6db8d79..c4dbfd91a17b 100644 --- a/include/uapi/linux/netfilter_bridge.h +++ b/include/uapi/linux/netfilter_bridge.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__LINUX_BRIDGE_NETFILTER_H -#define _UAPI__LINUX_BRIDGE_NETFILTER_H +#ifndef __LINUX_BRIDGE_NETFILTER_H +#define __LINUX_BRIDGE_NETFILTER_H /* bridge-specific defines for netfilter. */ @@ -24,4 +24,4 @@ #define NF_BR_BROUTING 5 #define NF_BR_NUMHOOKS 6 -#endif /* _UAPI__LINUX_BRIDGE_NETFILTER_H */ +#endif /* __LINUX_BRIDGE_NETFILTER_H */ diff --git a/include/uapi/linux/netfilter_bridge/ebt_802_3.h b/include/uapi/linux/netfilter_bridge/ebt_802_3.h index f37522aade24..70028c152316 100644 --- a/include/uapi/linux/netfilter_bridge/ebt_802_3.h +++ b/include/uapi/linux/netfilter_bridge/ebt_802_3.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__LINUX_BRIDGE_EBT_802_3_H -#define _UAPI__LINUX_BRIDGE_EBT_802_3_H +#ifndef __LINUX_BRIDGE_EBT_802_3_H +#define __LINUX_BRIDGE_EBT_802_3_H #include <linux/types.h> #include <linux/if_ether.h> @@ -60,4 +60,4 @@ struct ebt_802_3_info { __u8 invflags; }; -#endif /* _UAPI__LINUX_BRIDGE_EBT_802_3_H */ +#endif /* __LINUX_BRIDGE_EBT_802_3_H */ diff --git a/include/uapi/linux/netfilter_bridge/ebtables.h b/include/uapi/linux/netfilter_bridge/ebtables.h index ba993360dbe9..fb627f9c7071 100644 --- a/include/uapi/linux/netfilter_bridge/ebtables.h +++ b/include/uapi/linux/netfilter_bridge/ebtables.h @@ -10,8 +10,8 @@ * Copyright (C) 1999 Paul `Rusty' Russell & Michael J. Neuling */ -#ifndef _UAPI__LINUX_BRIDGE_EFF_H -#define _UAPI__LINUX_BRIDGE_EFF_H +#ifndef __LINUX_BRIDGE_EFF_H +#define __LINUX_BRIDGE_EFF_H #include <linux/if.h> #include <linux/netfilter_bridge.h> #include <linux/if_ether.h> @@ -47,12 +47,12 @@ struct ebt_replace { /* total size of the entries */ unsigned int entries_size; /* start of the chains */ - struct ebt_entries __user *hook_entry[NF_BR_NUMHOOKS]; + struct ebt_entries *hook_entry[NF_BR_NUMHOOKS]; /* nr of counters userspace expects back */ unsigned int num_counters; /* where the kernel will put the old counters */ - struct ebt_counter __user *counters; - char __user *entries; + struct ebt_counter *counters; + char *entries; }; struct ebt_replace_kernel { @@ -265,4 +265,4 @@ struct ebt_entry { __ret; \ }) -#endif /* _UAPI__LINUX_BRIDGE_EFF_H */ +#endif /* __LINUX_BRIDGE_EFF_H */ diff --git a/include/uapi/linux/netfilter_decnet.h b/include/uapi/linux/netfilter_decnet.h index 0b09732aacd5..f1e80a9a3f04 100644 --- a/include/uapi/linux/netfilter_decnet.h +++ b/include/uapi/linux/netfilter_decnet.h @@ -10,7 +10,6 @@ #include <linux/netfilter.h> /* only for userspace compatibility */ -#ifndef __KERNEL__ #include <limits.h> /* for INT_MIN, INT_MAX */ @@ -23,7 +22,6 @@ #define NFC_DN_IF_IN 0x0004 /* Output device. */ #define NFC_DN_IF_OUT 0x0008 -#endif /* ! __KERNEL__ */ /* DECnet Hooks */ /* After promisc drops, checksum checks. */ @@ -59,11 +57,9 @@ struct nf_dn_rtmsg { #define NFDN_RTMSG(r) ((unsigned char *)(r) + NLMSG_ALIGN(sizeof(struct nf_dn_rtmsg))) -#ifndef __KERNEL__ /* backwards compatibility for userspace */ #define DNRMG_L1_GROUP 0x01 #define DNRMG_L2_GROUP 0x02 -#endif enum { DNRNG_NLGRP_NONE, diff --git a/include/uapi/linux/netfilter_ipv4.h b/include/uapi/linux/netfilter_ipv4.h index 91ddd1f6fd4b..a5f4dc784baa 100644 --- a/include/uapi/linux/netfilter_ipv4.h +++ b/include/uapi/linux/netfilter_ipv4.h @@ -1,14 +1,13 @@ /* IPv4-specific defines for netfilter. * (C)1998 Rusty Russell -- This code is GPL. */ -#ifndef _UAPI__LINUX_IP_NETFILTER_H -#define _UAPI__LINUX_IP_NETFILTER_H +#ifndef __LINUX_IP_NETFILTER_H +#define __LINUX_IP_NETFILTER_H #include <linux/netfilter.h> /* only for userspace compatibility */ -#ifndef __KERNEL__ #include <limits.h> /* for INT_MIN, INT_MAX */ @@ -52,7 +51,6 @@ /* Packets about to hit the wire. */ #define NF_IP_POST_ROUTING 4 #define NF_IP_NUMHOOKS 5 -#endif /* ! __KERNEL__ */ enum nf_ip_hook_priorities { NF_IP_PRI_FIRST = INT_MIN, @@ -78,4 +76,4 @@ enum nf_ip_hook_priorities { #define SO_ORIGINAL_DST 80 -#endif /* _UAPI__LINUX_IP_NETFILTER_H */ +#endif /* __LINUX_IP_NETFILTER_H */ diff --git a/include/uapi/linux/netfilter_ipv4/ip_tables.h b/include/uapi/linux/netfilter_ipv4/ip_tables.h index f1e6ef256034..38542b4f721c 100644 --- a/include/uapi/linux/netfilter_ipv4/ip_tables.h +++ b/include/uapi/linux/netfilter_ipv4/ip_tables.h @@ -12,16 +12,15 @@ * Port numbers are stored in HOST byte order. */ -#ifndef _UAPI_IPTABLES_H -#define _UAPI_IPTABLES_H +#ifndef _IPTABLES_H +#define _IPTABLES_H #include <linux/types.h> -#include <linux/compiler.h> + #include <linux/netfilter_ipv4.h> #include <linux/netfilter/x_tables.h> -#ifndef __KERNEL__ #define IPT_FUNCTION_MAXNAMELEN XT_FUNCTION_MAXNAMELEN #define IPT_TABLE_MAXNAMELEN XT_TABLE_MAXNAMELEN #define ipt_match xt_match @@ -63,7 +62,6 @@ /* fn returns 0 to continue iteration */ #define IPT_ENTRY_ITERATE(entries, size, fn, args...) \ XT_ENTRY_ITERATE(struct ipt_entry, entries, size, fn, ## args) -#endif /* Yes, Virginia, you have to zero the padding. */ struct ipt_ip { @@ -198,7 +196,7 @@ struct ipt_replace { /* Number of counters (must be equal to current number of entries). */ unsigned int num_counters; /* The old entries' counters. */ - struct xt_counters __user *counters; + struct xt_counters *counters; /* The entries (hang off end: not really an array). */ struct ipt_entry entries[0]; @@ -226,4 +224,4 @@ ipt_get_target(struct ipt_entry *e) /* * Main firewall chains definitions and global var's definitions. */ -#endif /* _UAPI_IPTABLES_H */ +#endif /* _IPTABLES_H */ diff --git a/include/uapi/linux/netfilter_ipv6.h b/include/uapi/linux/netfilter_ipv6.h index 12497c6c7949..8483d1d41519 100644 --- a/include/uapi/linux/netfilter_ipv6.h +++ b/include/uapi/linux/netfilter_ipv6.h @@ -4,14 +4,13 @@ * this header was blatantly ripped from netfilter_ipv4.h * it's amazing what adding a bunch of 6s can do =8^) */ -#ifndef _UAPI__LINUX_IP6_NETFILTER_H -#define _UAPI__LINUX_IP6_NETFILTER_H +#ifndef __LINUX_IP6_NETFILTER_H +#define __LINUX_IP6_NETFILTER_H #include <linux/netfilter.h> /* only for userspace compatibility */ -#ifndef __KERNEL__ #include <limits.h> /* for INT_MIN, INT_MAX */ @@ -56,7 +55,6 @@ /* Packets about to hit the wire. */ #define NF_IP6_POST_ROUTING 4 #define NF_IP6_NUMHOOKS 5 -#endif /* ! __KERNEL__ */ enum nf_ip6_hook_priorities { @@ -76,4 +74,4 @@ enum nf_ip6_hook_priorities { }; -#endif /* _UAPI__LINUX_IP6_NETFILTER_H */ +#endif /* __LINUX_IP6_NETFILTER_H */ diff --git a/include/uapi/linux/netfilter_ipv6/ip6_tables.h b/include/uapi/linux/netfilter_ipv6/ip6_tables.h index 649c68062dca..640a1d09690c 100644 --- a/include/uapi/linux/netfilter_ipv6/ip6_tables.h +++ b/include/uapi/linux/netfilter_ipv6/ip6_tables.h @@ -12,16 +12,15 @@ * Port numbers are stored in HOST byte order. */ -#ifndef _UAPI_IP6_TABLES_H -#define _UAPI_IP6_TABLES_H +#ifndef _IP6_TABLES_H +#define _IP6_TABLES_H #include <linux/types.h> -#include <linux/compiler.h> + #include <linux/netfilter_ipv6.h> #include <linux/netfilter/x_tables.h> -#ifndef __KERNEL__ #define IP6T_FUNCTION_MAXNAMELEN XT_FUNCTION_MAXNAMELEN #define IP6T_TABLE_MAXNAMELEN XT_TABLE_MAXNAMELEN #define ip6t_match xt_match @@ -56,7 +55,6 @@ XT_MATCH_ITERATE(struct ip6t_entry, e, fn, ## args) #define IP6T_ENTRY_ITERATE(entries, size, fn, args...) \ XT_ENTRY_ITERATE(struct ip6t_entry, entries, size, fn, ## args) -#endif /* Yes, Virginia, you have to zero the padding. */ struct ip6t_ip6 { @@ -238,7 +236,7 @@ struct ip6t_replace { /* Number of counters (must be equal to current number of entries). */ unsigned int num_counters; /* The old entries' counters. */ - struct xt_counters __user *counters; + struct xt_counters *counters; /* The entries (hang off end: not really an array). */ struct ip6t_entry entries[0]; @@ -267,4 +265,4 @@ ip6t_get_target(struct ip6t_entry *e) * Main firewall chains definitions and global var's definitions. */ -#endif /* _UAPI_IP6_TABLES_H */ +#endif /* _IP6_TABLES_H */ diff --git a/include/uapi/linux/netlink.h b/include/uapi/linux/netlink.h index 1a85940f8ab7..e0a09df1a687 100644 --- a/include/uapi/linux/netlink.h +++ b/include/uapi/linux/netlink.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__LINUX_NETLINK_H -#define _UAPI__LINUX_NETLINK_H +#ifndef __LINUX_NETLINK_H +#define __LINUX_NETLINK_H #include <linux/kernel.h> #include <linux/socket.h> /* for __kernel_sa_family_t */ @@ -182,4 +182,4 @@ struct nlattr { #define NLA_HDRLEN ((int) NLA_ALIGN(sizeof(struct nlattr))) -#endif /* _UAPI__LINUX_NETLINK_H */ +#endif /* __LINUX_NETLINK_H */ diff --git a/include/uapi/linux/nfs.h b/include/uapi/linux/nfs.h index 5199a36dd574..eb98d3a127a9 100644 --- a/include/uapi/linux/nfs.h +++ b/include/uapi/linux/nfs.h @@ -4,8 +4,8 @@ * This file contains constants mostly for Version 2 of the protocol, * but also has a couple of NFSv3 bits in (notably the error codes). */ -#ifndef _UAPI_LINUX_NFS_H -#define _UAPI_LINUX_NFS_H +#ifndef _LINUX_NFS_H +#define _LINUX_NFS_H #define NFS_PROGRAM 100003 #define NFS_PORT 2049 @@ -128,4 +128,4 @@ enum nfs_ftype { NFFIFO = 8 }; -#endif /* _UAPI_LINUX_NFS_H */ +#endif /* _LINUX_NFS_H */ diff --git a/include/uapi/linux/nfs3.h b/include/uapi/linux/nfs3.h index 231ef4e69829..bacfe41f0573 100644 --- a/include/uapi/linux/nfs3.h +++ b/include/uapi/linux/nfs3.h @@ -1,8 +1,8 @@ /* * NFSv3 protocol definitions */ -#ifndef _UAPI_LINUX_NFS3_H -#define _UAPI_LINUX_NFS3_H +#ifndef _LINUX_NFS3_H +#define _LINUX_NFS3_H #define NFS3_PORT 2049 #define NFS3_MAXDATA 32768 @@ -94,4 +94,4 @@ struct nfs3_fh { #define NFS_MNT3_VERSION 3 -#endif /* _UAPI_LINUX_NFS3_H */ +#endif /* _LINUX_NFS3_H */ diff --git a/include/uapi/linux/nfs4.h b/include/uapi/linux/nfs4.h index 788128ebac45..454cfe19fc1c 100644 --- a/include/uapi/linux/nfs4.h +++ b/include/uapi/linux/nfs4.h @@ -10,8 +10,8 @@ * Andy Adamson <andros@umich.edu> */ -#ifndef _UAPI_LINUX_NFS4_H -#define _UAPI_LINUX_NFS4_H +#ifndef _LINUX_NFS4_H +#define _LINUX_NFS4_H #include <linux/types.h> @@ -169,7 +169,7 @@ enum nfs4_acl_whotype { NFS4_ACL_WHO_EVERYONE, }; -#endif /* _UAPI_LINUX_NFS4_H */ +#endif /* _LINUX_NFS4_H */ /* * Local variables: diff --git a/include/uapi/linux/nfs4_mount.h b/include/uapi/linux/nfs4_mount.h index a0dcf6655657..f4ff32d9d4e6 100644 --- a/include/uapi/linux/nfs4_mount.h +++ b/include/uapi/linux/nfs4_mount.h @@ -20,7 +20,7 @@ struct nfs_string { unsigned int len; - const char __user * data; + const char * data; }; struct nfs4_mount_data { @@ -45,14 +45,14 @@ struct nfs4_mount_data { struct nfs_string hostname; /* 1 */ /* Server IP address */ unsigned int host_addrlen; /* 1 */ - struct sockaddr __user * host_addr; /* 1 */ + struct sockaddr * host_addr; /* 1 */ /* Transport protocol to use */ int proto; /* 1 */ /* Pseudo-flavours to use for authentication. See RFC2623 */ int auth_flavourlen; /* 1 */ - int __user *auth_flavours; /* 1 */ + int *auth_flavours; /* 1 */ }; /* bits in the flags field */ diff --git a/include/uapi/linux/nfs_fs.h b/include/uapi/linux/nfs_fs.h index 49142287999c..99e509a4a847 100644 --- a/include/uapi/linux/nfs_fs.h +++ b/include/uapi/linux/nfs_fs.h @@ -6,8 +6,8 @@ * OS-specific nfs filesystem definitions and declarations */ -#ifndef _UAPI_LINUX_NFS_FS_H -#define _UAPI_LINUX_NFS_FS_H +#ifndef _LINUX_NFS_FS_H +#define _LINUX_NFS_FS_H #include <linux/magic.h> @@ -58,4 +58,4 @@ #define NFSDBG_ALL 0xFFFF -#endif /* _UAPI_LINUX_NFS_FS_H */ +#endif /* _LINUX_NFS_FS_H */ diff --git a/include/uapi/linux/nfs_idmap.h b/include/uapi/linux/nfs_idmap.h index 8d4b1c7b24d4..05f843cfb53e 100644 --- a/include/uapi/linux/nfs_idmap.h +++ b/include/uapi/linux/nfs_idmap.h @@ -34,8 +34,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _UAPINFS_IDMAP_H -#define _UAPINFS_IDMAP_H +#ifndef NFS_IDMAP_H +#define NFS_IDMAP_H #include <linux/types.h> @@ -62,4 +62,4 @@ struct idmap_msg { }; -#endif /* _UAPINFS_IDMAP_H */ +#endif /* NFS_IDMAP_H */ diff --git a/include/uapi/linux/nfsacl.h b/include/uapi/linux/nfsacl.h index 9bb9771a107f..1b16be39e741 100644 --- a/include/uapi/linux/nfsacl.h +++ b/include/uapi/linux/nfsacl.h @@ -3,8 +3,8 @@ * * (C) 2003 Andreas Gruenbacher <agruen@suse.de> */ -#ifndef _UAPI__LINUX_NFSACL_H -#define _UAPI__LINUX_NFSACL_H +#ifndef __LINUX_NFSACL_H +#define __LINUX_NFSACL_H #define NFS_ACL_PROGRAM 100227 @@ -26,4 +26,4 @@ /* Flag for Default ACL entries */ #define NFS_ACL_DEFAULT 0x1000 -#endif /* _UAPI__LINUX_NFSACL_H */ +#endif /* __LINUX_NFSACL_H */ diff --git a/include/uapi/linux/nfsd/debug.h b/include/uapi/linux/nfsd/debug.h index a6f453c740b8..7d58c120b73d 100644 --- a/include/uapi/linux/nfsd/debug.h +++ b/include/uapi/linux/nfsd/debug.h @@ -6,8 +6,8 @@ * Copyright (C) 1995 Olaf Kirch <okir@monad.swb.de> */ -#ifndef _UAPILINUX_NFSD_DEBUG_H -#define _UAPILINUX_NFSD_DEBUG_H +#ifndef LINUX_NFSD_DEBUG_H +#define LINUX_NFSD_DEBUG_H #include <linux/sunrpc/debug.h> @@ -37,4 +37,4 @@ -#endif /* _UAPILINUX_NFSD_DEBUG_H */ +#endif /* LINUX_NFSD_DEBUG_H */ diff --git a/include/uapi/linux/nfsd/export.h b/include/uapi/linux/nfsd/export.h index cf47c313794e..44cdb2560baa 100644 --- a/include/uapi/linux/nfsd/export.h +++ b/include/uapi/linux/nfsd/export.h @@ -7,8 +7,8 @@ * Copyright (C) 1995-1997 Olaf Kirch <okir@monad.swb.de> */ -#ifndef _UAPINFSD_EXPORT_H -#define _UAPINFSD_EXPORT_H +#ifndef NFSD_EXPORT_H +#define NFSD_EXPORT_H # include <linux/types.h> @@ -55,4 +55,4 @@ | NFSEXP_INSECURE_PORT) -#endif /* _UAPINFSD_EXPORT_H */ +#endif /* NFSD_EXPORT_H */ diff --git a/include/uapi/linux/nfsd/nfsfh.h b/include/uapi/linux/nfsd/nfsfh.h index 616e3b396476..07f80e66f908 100644 --- a/include/uapi/linux/nfsd/nfsfh.h +++ b/include/uapi/linux/nfsd/nfsfh.h @@ -11,8 +11,8 @@ * Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de> */ -#ifndef _UAPI_LINUX_NFSD_FH_H -#define _UAPI_LINUX_NFSD_FH_H +#ifndef _LINUX_NFSD_FH_H +#define _LINUX_NFSD_FH_H #include <linux/types.h> #include <linux/nfs.h> @@ -119,4 +119,4 @@ struct knfsd_fh { -#endif /* _UAPI_LINUX_NFSD_FH_H */ +#endif /* _LINUX_NFSD_FH_H */ diff --git a/include/uapi/linux/nfsd/stats.h b/include/uapi/linux/nfsd/stats.h index 9fb7a0644263..b7024e8bec84 100644 --- a/include/uapi/linux/nfsd/stats.h +++ b/include/uapi/linux/nfsd/stats.h @@ -6,12 +6,12 @@ * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> */ -#ifndef _UAPILINUX_NFSD_STATS_H -#define _UAPILINUX_NFSD_STATS_H +#ifndef LINUX_NFSD_STATS_H +#define LINUX_NFSD_STATS_H #include <linux/nfs4.h> /* thread usage wraps very million seconds (approx one fortnight) */ #define NFSD_USAGE_WRAP (HZ*1000000) -#endif /* _UAPILINUX_NFSD_STATS_H */ +#endif /* LINUX_NFSD_STATS_H */ diff --git a/include/uapi/linux/nubus.h b/include/uapi/linux/nubus.h index 77513d2b5638..60b03e4e25ef 100644 --- a/include/uapi/linux/nubus.h +++ b/include/uapi/linux/nubus.h @@ -9,8 +9,8 @@ NetBSD/OpenBSD header file, by Allen Briggs. We figured out the rest of them on our own. */ -#ifndef _UAPILINUX_NUBUS_H -#define _UAPILINUX_NUBUS_H +#ifndef LINUX_NUBUS_H +#define LINUX_NUBUS_H #include <linux/types.h> @@ -236,9 +236,9 @@ struct nubus_dirent /* We'd like to get rid of this eventually. Only daynaport.c uses it now. */ -static inline void *nubus_slot_addr(int slot) +static __inline__ void *nubus_slot_addr(int slot) { return (void *)(0xF0000000|(slot<<24)); } -#endif /* _UAPILINUX_NUBUS_H */ +#endif /* LINUX_NUBUS_H */ diff --git a/include/uapi/linux/nvme.h b/include/uapi/linux/nvme.h index 989c04e0c563..bc5ade5a69d1 100644 --- a/include/uapi/linux/nvme.h +++ b/include/uapi/linux/nvme.h @@ -16,8 +16,8 @@ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef _UAPI_LINUX_NVME_H -#define _UAPI_LINUX_NVME_H +#ifndef _LINUX_NVME_H +#define _LINUX_NVME_H #include <linux/types.h> @@ -474,4 +474,4 @@ struct nvme_admin_cmd { #define NVME_IOCTL_ADMIN_CMD _IOWR('N', 0x41, struct nvme_admin_cmd) #define NVME_IOCTL_SUBMIT_IO _IOW('N', 0x42, struct nvme_user_io) -#endif /* _UAPI_LINUX_NVME_H */ +#endif /* _LINUX_NVME_H */ diff --git a/include/uapi/linux/nvram.h b/include/uapi/linux/nvram.h index 0986c4337383..a05d28a26208 100644 --- a/include/uapi/linux/nvram.h +++ b/include/uapi/linux/nvram.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_NVRAM_H -#define _UAPI_LINUX_NVRAM_H +#ifndef _LINUX_NVRAM_H +#define _LINUX_NVRAM_H #include <linux/ioctl.h> @@ -13,4 +13,4 @@ #define NVRAM_OFFSET(x) ((x)-NVRAM_FIRST_BYTE) -#endif /* _UAPI_LINUX_NVRAM_H */ +#endif /* _LINUX_NVRAM_H */ diff --git a/include/uapi/linux/omap3isp.h b/include/uapi/linux/omap3isp.h index c090cf9249bb..cb3e8a535985 100644 --- a/include/uapi/linux/omap3isp.h +++ b/include/uapi/linux/omap3isp.h @@ -165,7 +165,7 @@ struct omap3isp_h3a_aewb_config { */ struct omap3isp_stat_data { struct timeval ts; - void __user *buf; + void *buf; __u32 buf_size; __u16 frame_number; __u16 cur_frame; @@ -408,12 +408,12 @@ struct omap3isp_ccdc_update_config { __u16 update; __u16 flag; enum omap3isp_alaw_ipwidth alawip; - struct omap3isp_ccdc_bclamp __user *bclamp; - struct omap3isp_ccdc_blcomp __user *blcomp; - struct omap3isp_ccdc_fpc __user *fpc; - struct omap3isp_ccdc_lsc_config __user *lsc_cfg; - struct omap3isp_ccdc_culling __user *cull; - __u8 __user *lsc; + struct omap3isp_ccdc_bclamp *bclamp; + struct omap3isp_ccdc_blcomp *blcomp; + struct omap3isp_ccdc_fpc *fpc; + struct omap3isp_ccdc_lsc_config *lsc_cfg; + struct omap3isp_ccdc_culling *cull; + __u8 *lsc; }; /* Preview configurations */ @@ -629,18 +629,18 @@ struct omap3isp_prev_update_config { __u32 update; __u32 flag; __u32 shading_shift; - struct omap3isp_prev_luma __user *luma; - struct omap3isp_prev_hmed __user *hmed; - struct omap3isp_prev_cfa __user *cfa; - struct omap3isp_prev_csup __user *csup; - struct omap3isp_prev_wbal __user *wbal; - struct omap3isp_prev_blkadj __user *blkadj; - struct omap3isp_prev_rgbtorgb __user *rgb2rgb; - struct omap3isp_prev_csc __user *csc; - struct omap3isp_prev_yclimit __user *yclimit; - struct omap3isp_prev_dcor __user *dcor; - struct omap3isp_prev_nf __user *nf; - struct omap3isp_prev_gtables __user *gamma; + struct omap3isp_prev_luma *luma; + struct omap3isp_prev_hmed *hmed; + struct omap3isp_prev_cfa *cfa; + struct omap3isp_prev_csup *csup; + struct omap3isp_prev_wbal *wbal; + struct omap3isp_prev_blkadj *blkadj; + struct omap3isp_prev_rgbtorgb *rgb2rgb; + struct omap3isp_prev_csc *csc; + struct omap3isp_prev_yclimit *yclimit; + struct omap3isp_prev_dcor *dcor; + struct omap3isp_prev_nf *nf; + struct omap3isp_prev_gtables *gamma; }; #endif /* OMAP3_ISP_USER_H */ diff --git a/include/uapi/linux/omapfb.h b/include/uapi/linux/omapfb.h index 7c97bc00ac6d..9563f61bab04 100644 --- a/include/uapi/linux/omapfb.h +++ b/include/uapi/linux/omapfb.h @@ -21,8 +21,8 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _UAPI__LINUX_OMAPFB_H__ -#define _UAPI__LINUX_OMAPFB_H__ +#ifndef __LINUX_OMAPFB_H__ +#define __LINUX_OMAPFB_H__ #include <linux/fb.h> #include <linux/ioctl.h> @@ -182,7 +182,7 @@ struct omapfb_memory_read { __u16 w; __u16 h; size_t buffer_size; - void __user *buffer; + void *buffer; }; struct omapfb_ovl_colormode { @@ -219,4 +219,4 @@ struct omapfb_display_info { }; -#endif /* _UAPI__LINUX_OMAPFB_H__ */ +#endif /* __LINUX_OMAPFB_H__ */ diff --git a/include/uapi/linux/oom.h b/include/uapi/linux/oom.h index b29272d621ce..ca6c46ea7957 100644 --- a/include/uapi/linux/oom.h +++ b/include/uapi/linux/oom.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__INCLUDE_LINUX_OOM_H -#define _UAPI__INCLUDE_LINUX_OOM_H +#ifndef __INCLUDE_LINUX_OOM_H +#define __INCLUDE_LINUX_OOM_H /* * /proc/<pid>/oom_score_adj set to OOM_SCORE_ADJ_MIN disables oom killing for @@ -17,4 +17,4 @@ #define OOM_ADJUST_MIN (-16) #define OOM_ADJUST_MAX 15 -#endif /* _UAPI__INCLUDE_LINUX_OOM_H */ +#endif /* __INCLUDE_LINUX_OOM_H */ diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h index a74d375b439b..9357dd4c09e3 100644 --- a/include/uapi/linux/openvswitch.h +++ b/include/uapi/linux/openvswitch.h @@ -17,8 +17,8 @@ * 02110-1301, USA */ -#ifndef _UAPI__LINUX_OPENVSWITCH_H -#define _UAPI__LINUX_OPENVSWITCH_H 1 +#ifndef __LINUX_OPENVSWITCH_H +#define __LINUX_OPENVSWITCH_H 1 #include <linux/types.h> #include <linux/if_ether.h> @@ -261,9 +261,6 @@ enum ovs_key_attr { OVS_KEY_ATTR_TUNNEL, /* Nested set of ovs_tunnel attributes */ OVS_KEY_ATTR_SCTP, /* struct ovs_key_sctp */ -#ifdef __KERNEL__ - OVS_KEY_ATTR_IPV4_TUNNEL, /* struct ovs_key_ipv4_tunnel */ -#endif __OVS_KEY_ATTR_MAX }; diff --git a/include/uapi/linux/parport.h b/include/uapi/linux/parport.h index f41388f88dc3..4cd4442730c2 100644 --- a/include/uapi/linux/parport.h +++ b/include/uapi/linux/parport.h @@ -4,8 +4,8 @@ * published by the Free Software Foundation. */ -#ifndef _UAPI_PARPORT_H_ -#define _UAPI_PARPORT_H_ +#ifndef _PARPORT_H_ +#define _PARPORT_H_ /* Start off with user-visible constants */ @@ -92,4 +92,4 @@ typedef enum { #define PARPORT_W91284PIC (1<<1) /* have a Warp9 w91284pic in the device */ /* The rest is for the kernel only */ -#endif /* _UAPI_PARPORT_H_ */ +#endif /* _PARPORT_H_ */ diff --git a/include/uapi/linux/patchkey.h b/include/uapi/linux/patchkey.h index 1bda0e56bc5e..bb2843098b2c 100644 --- a/include/uapi/linux/patchkey.h +++ b/include/uapi/linux/patchkey.h @@ -14,15 +14,12 @@ #error "patchkey.h included directly" #endif -#ifndef _UAPI_LINUX_PATCHKEY_H -#define _UAPI_LINUX_PATCHKEY_H +#ifndef _LINUX_PATCHKEY_H +#define _LINUX_PATCHKEY_H /* Endian macros. */ -#ifndef __KERNEL__ # include <endian.h> -#endif -#if !defined(__KERNEL__) #if defined(__BYTE_ORDER) # if __BYTE_ORDER == __BIG_ENDIAN # define _PATCHKEY(id) (0xfd00|id) @@ -32,6 +29,5 @@ # error "could not determine byte order" # endif #endif -#endif -#endif /* _UAPI_LINUX_PATCHKEY_H */ +#endif /* _LINUX_PATCHKEY_H */ diff --git a/include/uapi/linux/pci.h b/include/uapi/linux/pci.h index 3c292bc0d1c1..a5bb5c70599f 100644 --- a/include/uapi/linux/pci.h +++ b/include/uapi/linux/pci.h @@ -14,8 +14,8 @@ * PCI System Design Guide */ -#ifndef _UAPILINUX_PCI_H -#define _UAPILINUX_PCI_H +#ifndef LINUX_PCI_H +#define LINUX_PCI_H #include <linux/pci_regs.h> /* The pci register defines */ @@ -38,4 +38,4 @@ #define PCIIOC_MMAP_IS_MEM (PCIIOC_BASE | 0x02) /* Set mmap state to MEM space. */ #define PCIIOC_WRITE_COMBINE (PCIIOC_BASE | 0x03) /* Enable/disable write-combining. */ -#endif /* _UAPILINUX_PCI_H */ +#endif /* LINUX_PCI_H */ diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h index 2fc1602e23bb..e886c48cadf6 100644 --- a/include/uapi/linux/perf_event.h +++ b/include/uapi/linux/perf_event.h @@ -11,8 +11,8 @@ * * For licencing details see kernel-base/COPYING */ -#ifndef _UAPI_LINUX_PERF_EVENT_H -#define _UAPI_LINUX_PERF_EVENT_H +#ifndef _LINUX_PERF_EVENT_H +#define _LINUX_PERF_EVENT_H #include <linux/types.h> #include <linux/ioctl.h> @@ -789,4 +789,4 @@ struct perf_branch_entry { reserved:60; }; -#endif /* _UAPI_LINUX_PERF_EVENT_H */ +#endif /* _LINUX_PERF_EVENT_H */ diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h index aa169c4339d2..9971703ff114 100644 --- a/include/uapi/linux/personality.h +++ b/include/uapi/linux/personality.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_PERSONALITY_H -#define _UAPI_LINUX_PERSONALITY_H +#ifndef _LINUX_PERSONALITY_H +#define _LINUX_PERSONALITY_H /* @@ -66,4 +66,4 @@ enum { }; -#endif /* _UAPI_LINUX_PERSONALITY_H */ +#endif /* _LINUX_PERSONALITY_H */ diff --git a/include/uapi/linux/phonet.h b/include/uapi/linux/phonet.h index a3e1d65b3ed9..7d663d5e8e7f 100644 --- a/include/uapi/linux/phonet.h +++ b/include/uapi/linux/phonet.h @@ -20,8 +20,8 @@ * 02110-1301 USA */ -#ifndef _UAPILINUX_PHONET_H -#define _UAPILINUX_PHONET_H +#ifndef LINUX_PHONET_H +#define LINUX_PHONET_H #include <linux/types.h> #include <linux/socket.h> @@ -109,77 +109,77 @@ struct sockaddr_pn { /* Well known address */ #define PN_DEV_PC 0x10 -static inline __u16 pn_object(__u8 addr, __u16 port) +static __inline__ __u16 pn_object(__u8 addr, __u16 port) { return (addr << 8) | (port & 0x3ff); } -static inline __u8 pn_obj(__u16 handle) +static __inline__ __u8 pn_obj(__u16 handle) { return handle & 0xff; } -static inline __u8 pn_dev(__u16 handle) +static __inline__ __u8 pn_dev(__u16 handle) { return handle >> 8; } -static inline __u16 pn_port(__u16 handle) +static __inline__ __u16 pn_port(__u16 handle) { return handle & 0x3ff; } -static inline __u8 pn_addr(__u16 handle) +static __inline__ __u8 pn_addr(__u16 handle) { return (handle >> 8) & 0xfc; } -static inline void pn_sockaddr_set_addr(struct sockaddr_pn *spn, __u8 addr) +static __inline__ void pn_sockaddr_set_addr(struct sockaddr_pn *spn, __u8 addr) { spn->spn_dev &= 0x03; spn->spn_dev |= addr & 0xfc; } -static inline void pn_sockaddr_set_port(struct sockaddr_pn *spn, __u16 port) +static __inline__ void pn_sockaddr_set_port(struct sockaddr_pn *spn, __u16 port) { spn->spn_dev &= 0xfc; spn->spn_dev |= (port >> 8) & 0x03; spn->spn_obj = port & 0xff; } -static inline void pn_sockaddr_set_object(struct sockaddr_pn *spn, +static __inline__ void pn_sockaddr_set_object(struct sockaddr_pn *spn, __u16 handle) { spn->spn_dev = pn_dev(handle); spn->spn_obj = pn_obj(handle); } -static inline void pn_sockaddr_set_resource(struct sockaddr_pn *spn, +static __inline__ void pn_sockaddr_set_resource(struct sockaddr_pn *spn, __u8 resource) { spn->spn_resource = resource; } -static inline __u8 pn_sockaddr_get_addr(const struct sockaddr_pn *spn) +static __inline__ __u8 pn_sockaddr_get_addr(const struct sockaddr_pn *spn) { return spn->spn_dev & 0xfc; } -static inline __u16 pn_sockaddr_get_port(const struct sockaddr_pn *spn) +static __inline__ __u16 pn_sockaddr_get_port(const struct sockaddr_pn *spn) { return ((spn->spn_dev & 0x03) << 8) | spn->spn_obj; } -static inline __u16 pn_sockaddr_get_object(const struct sockaddr_pn *spn) +static __inline__ __u16 pn_sockaddr_get_object(const struct sockaddr_pn *spn) { return pn_object(spn->spn_dev, spn->spn_obj); } -static inline __u8 pn_sockaddr_get_resource(const struct sockaddr_pn *spn) +static __inline__ __u8 pn_sockaddr_get_resource(const struct sockaddr_pn *spn) { return spn->spn_resource; } /* Phonet device ioctl requests */ -#endif /* _UAPILINUX_PHONET_H */ +#endif /* LINUX_PHONET_H */ diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h index 9b829134d422..66f925d3c07b 100644 --- a/include/uapi/linux/pkt_sched.h +++ b/include/uapi/linux/pkt_sched.h @@ -759,13 +759,14 @@ enum { TCA_FQ_RATE_ENABLE, /* enable/disable rate limiting */ - TCA_FQ_FLOW_DEFAULT_RATE,/* for sockets with unspecified sk_rate, - * use the following rate - */ + TCA_FQ_FLOW_DEFAULT_RATE,/* obsolete, do not use */ TCA_FQ_FLOW_MAX_RATE, /* per flow max rate */ TCA_FQ_BUCKETS_LOG, /* log2(number of buckets) */ + + TCA_FQ_FLOW_REFILL_DELAY, /* flow credit refill delay in usec */ + __TCA_FQ_MAX }; diff --git a/include/uapi/linux/pktcdvd.h b/include/uapi/linux/pktcdvd.h index 2640b9d4e243..7c31eb760f24 100644 --- a/include/uapi/linux/pktcdvd.h +++ b/include/uapi/linux/pktcdvd.h @@ -9,8 +9,8 @@ * DVD-RW devices. * */ -#ifndef _UAPI__PKTCDVD_H -#define _UAPI__PKTCDVD_H +#ifndef __PKTCDVD_H +#define __PKTCDVD_H #include <linux/types.h> @@ -108,4 +108,4 @@ struct pkt_ctrl_command { #define PACKET_CTRL_CMD _IOWR(PACKET_IOCTL_MAGIC, 1, struct pkt_ctrl_command) -#endif /* _UAPI__PKTCDVD_H */ +#endif /* __PKTCDVD_H */ diff --git a/include/uapi/linux/pmu.h b/include/uapi/linux/pmu.h index caead364b6eb..12eccb49a630 100644 --- a/include/uapi/linux/pmu.h +++ b/include/uapi/linux/pmu.h @@ -6,8 +6,8 @@ * Copyright (C) 1998 Paul Mackerras. */ -#ifndef _UAPI_LINUX_PMU_H -#define _UAPI_LINUX_PMU_H +#ifndef _LINUX_PMU_H +#define _LINUX_PMU_H #define PMU_DRIVER_VERSION 2 @@ -136,4 +136,4 @@ enum { #define PMU_IOC_GRAB_BACKLIGHT _IOR('B', 6, size_t) -#endif /* _UAPI_LINUX_PMU_H */ +#endif /* _LINUX_PMU_H */ diff --git a/include/uapi/linux/ppp-comp.h b/include/uapi/linux/ppp-comp.h index 0a15bbb04e19..e16dead540b1 100644 --- a/include/uapi/linux/ppp-comp.h +++ b/include/uapi/linux/ppp-comp.h @@ -7,8 +7,8 @@ * modify it under the terms of the GNU General Public License * version 2 as published by the Free Software Foundation. */ -#ifndef _UAPI_NET_PPP_COMP_H -#define _UAPI_NET_PPP_COMP_H +#ifndef _NET_PPP_COMP_H +#define _NET_PPP_COMP_H /* @@ -90,4 +90,4 @@ #define CILEN_PREDICTOR_2 2 /* length of its config option */ -#endif /* _UAPI_NET_PPP_COMP_H */ +#endif /* _NET_PPP_COMP_H */ diff --git a/include/uapi/linux/ppp-ioctl.h b/include/uapi/linux/ppp-ioctl.h index 2d9a8859550a..e24483a5673d 100644 --- a/include/uapi/linux/ppp-ioctl.h +++ b/include/uapi/linux/ppp-ioctl.h @@ -11,7 +11,7 @@ #define _PPP_IOCTL_H #include <linux/types.h> -#include <linux/compiler.h> + /* * Bit definitions for flags argument to PPPIOCGFLAGS/PPPIOCSFLAGS. @@ -57,7 +57,7 @@ struct npioctl { /* Structure describing a CCP configuration option, for PPPIOCSCOMPRESS */ struct ppp_option_data { - __u8 __user *ptr; + __u8 *ptr; __u32 length; int transmit; }; diff --git a/include/uapi/linux/ppp_defs.h b/include/uapi/linux/ppp_defs.h index 283fc05dbbda..096dd5cb7cdd 100644 --- a/include/uapi/linux/ppp_defs.h +++ b/include/uapi/linux/ppp_defs.h @@ -9,8 +9,8 @@ */ #include <linux/types.h> -#ifndef _UAPI_PPP_DEFS_H_ -#define _UAPI_PPP_DEFS_H_ +#ifndef _PPP_DEFS_H_ +#define _PPP_DEFS_H_ /* * The basic PPP frame. @@ -147,4 +147,4 @@ struct ppp_idle { __kernel_time_t recv_idle; /* time since last NP packet received */ }; -#endif /* _UAPI_PPP_DEFS_H_ */ +#endif /* _PPP_DEFS_H_ */ diff --git a/include/uapi/linux/ptrace.h b/include/uapi/linux/ptrace.h index cf1019e15f5b..0f21dc2073ad 100644 --- a/include/uapi/linux/ptrace.h +++ b/include/uapi/linux/ptrace.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_PTRACE_H -#define _UAPI_LINUX_PTRACE_H +#ifndef _LINUX_PTRACE_H +#define _LINUX_PTRACE_H /* ptrace.h */ /* structs and defines to help the user use the ptrace system call. */ @@ -96,4 +96,4 @@ struct ptrace_peeksiginfo_args { #include <asm/ptrace.h> -#endif /* _UAPI_LINUX_PTRACE_H */ +#endif /* _LINUX_PTRACE_H */ diff --git a/include/uapi/linux/quota.h b/include/uapi/linux/quota.h index 3b6cfbeb086d..1cb88d5fd6a3 100644 --- a/include/uapi/linux/quota.h +++ b/include/uapi/linux/quota.h @@ -30,8 +30,8 @@ * SUCH DAMAGE. */ -#ifndef _UAPI_LINUX_QUOTA_ -#define _UAPI_LINUX_QUOTA_ +#ifndef _LINUX_QUOTA_ +#define _LINUX_QUOTA_ #include <linux/errno.h> #include <linux/types.h> @@ -168,4 +168,4 @@ enum { #define QUOTA_NL_A_MAX (__QUOTA_NL_A_MAX - 1) -#endif /* _UAPI_LINUX_QUOTA_ */ +#endif /* _LINUX_QUOTA_ */ diff --git a/include/uapi/linux/raid/md_p.h b/include/uapi/linux/raid/md_p.h index fe1a5406d4d9..843769aaeeb4 100644 --- a/include/uapi/linux/raid/md_p.h +++ b/include/uapi/linux/raid/md_p.h @@ -193,7 +193,7 @@ typedef struct mdp_superblock_s { } mdp_super_t; -static inline __u64 md_event(mdp_super_t *sb) { +static __inline__ __u64 md_event(mdp_super_t *sb) { __u64 ev = sb->events_hi; return (ev<<32)| sb->events_lo; } diff --git a/include/uapi/linux/raid/md_u.h b/include/uapi/linux/raid/md_u.h index 4133e744e4e6..0e1fe949bd74 100644 --- a/include/uapi/linux/raid/md_u.h +++ b/include/uapi/linux/raid/md_u.h @@ -12,8 +12,8 @@ Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _UAPI_MD_U_H -#define _UAPI_MD_U_H +#ifndef _MD_U_H +#define _MD_U_H /* * Different major versions are not compatible. @@ -152,4 +152,4 @@ typedef struct mdu_param_s int max_fault; /* unused for now */ } mdu_param_t; -#endif /* _UAPI_MD_U_H */ +#endif /* _MD_U_H */ diff --git a/include/uapi/linux/random.h b/include/uapi/linux/random.h index 7471b5b3b8ba..80e644558892 100644 --- a/include/uapi/linux/random.h +++ b/include/uapi/linux/random.h @@ -4,8 +4,8 @@ * Include file for the random number generator. */ -#ifndef _UAPI_LINUX_RANDOM_H -#define _UAPI_LINUX_RANDOM_H +#ifndef _LINUX_RANDOM_H +#define _LINUX_RANDOM_H #include <linux/types.h> #include <linux/ioctl.h> @@ -47,4 +47,4 @@ struct rnd_state { /* Exported functions */ -#endif /* _UAPI_LINUX_RANDOM_H */ +#endif /* _LINUX_RANDOM_H */ diff --git a/include/uapi/linux/reboot.h b/include/uapi/linux/reboot.h index 09d056d4fc50..aa336741bbf1 100644 --- a/include/uapi/linux/reboot.h +++ b/include/uapi/linux/reboot.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_REBOOT_H -#define _UAPI_LINUX_REBOOT_H +#ifndef _LINUX_REBOOT_H +#define _LINUX_REBOOT_H /* * Magic values required to use _reboot() system call. @@ -36,4 +36,4 @@ -#endif /* _UAPI_LINUX_REBOOT_H */ +#endif /* _LINUX_REBOOT_H */ diff --git a/include/uapi/linux/resource.h b/include/uapi/linux/resource.h index e0ed28477f48..bde52af11032 100644 --- a/include/uapi/linux/resource.h +++ b/include/uapi/linux/resource.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_RESOURCE_H -#define _UAPI_LINUX_RESOURCE_H +#ifndef _LINUX_RESOURCE_H +#define _LINUX_RESOURCE_H #include <linux/time.h> #include <linux/types.h> @@ -77,4 +77,4 @@ struct rlimit64 { #include <asm/resource.h> -#endif /* _UAPI_LINUX_RESOURCE_H */ +#endif /* _LINUX_RESOURCE_H */ diff --git a/include/uapi/linux/rfkill.h b/include/uapi/linux/rfkill.h index 058757f7a733..557cde23586e 100644 --- a/include/uapi/linux/rfkill.h +++ b/include/uapi/linux/rfkill.h @@ -15,8 +15,8 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef _UAPI__RFKILL_H -#define _UAPI__RFKILL_H +#ifndef __RFKILL_H +#define __RFKILL_H #include <linux/types.h> @@ -106,4 +106,4 @@ struct rfkill_event { /* and that's all userspace gets */ -#endif /* _UAPI__RFKILL_H */ +#endif /* __RFKILL_H */ diff --git a/include/uapi/linux/route.h b/include/uapi/linux/route.h index 6600708311c8..11abf5439f90 100644 --- a/include/uapi/linux/route.h +++ b/include/uapi/linux/route.h @@ -24,7 +24,7 @@ #define _LINUX_ROUTE_H #include <linux/if.h> -#include <linux/compiler.h> + /* This structure gets passed by the SIOCADDRT and SIOCDELRT calls. */ struct rtentry { @@ -37,11 +37,9 @@ struct rtentry { unsigned long rt_pad3; void *rt_pad4; short rt_metric; /* +1 for binary compatibility! */ - char __user *rt_dev; /* forcing the device at add */ + char *rt_dev; /* forcing the device at add */ unsigned long rt_mtu; /* per route MTU/Window */ -#ifndef __KERNEL__ #define rt_mss rt_mtu /* Compatibility :-( */ -#endif unsigned long rt_window; /* Window clamping */ unsigned short rt_irtt; /* Initial RTT */ }; diff --git a/include/uapi/linux/rtc.h b/include/uapi/linux/rtc.h index f8c82e6f25d5..cebd1720d8ac 100644 --- a/include/uapi/linux/rtc.h +++ b/include/uapi/linux/rtc.h @@ -8,8 +8,8 @@ * Copyright (C) 1999 Hewlett-Packard Co. * Copyright (C) 1999 Stephane Eranian <eranian@hpl.hp.com> */ -#ifndef _UAPI_LINUX_RTC_H_ -#define _UAPI_LINUX_RTC_H_ +#ifndef _LINUX_RTC_H_ +#define _LINUX_RTC_H_ /* * The struct used to pass data via the following ioctl. Similar to the @@ -104,4 +104,4 @@ struct rtc_pll_info { #define RTC_MAX_FREQ 8192 -#endif /* _UAPI_LINUX_RTC_H_ */ +#endif /* _LINUX_RTC_H_ */ diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h index eb0f1a554d7b..248fdd3f6ad4 100644 --- a/include/uapi/linux/rtnetlink.h +++ b/include/uapi/linux/rtnetlink.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__LINUX_RTNETLINK_H -#define _UAPI__LINUX_RTNETLINK_H +#ifndef __LINUX_RTNETLINK_H +#define __LINUX_RTNETLINK_H #include <linux/types.h> #include <linux/netlink.h> @@ -538,7 +538,6 @@ enum { #define NDUSEROPT_MAX (__NDUSEROPT_MAX - 1) -#ifndef __KERNEL__ /* RTnetlink multicast groups - backwards compatibility for userspace */ #define RTMGRP_LINK 1 #define RTMGRP_NOTIFY 2 @@ -559,7 +558,6 @@ enum { #define RTMGRP_DECnet_ROUTE 0x4000 #define RTMGRP_IPV6_PREFIX 0x20000 -#endif /* RTnetlink multicast groups */ enum rtnetlink_groups { @@ -638,4 +636,4 @@ struct tcamsg { -#endif /* _UAPI__LINUX_RTNETLINK_H */ +#endif /* __LINUX_RTNETLINK_H */ diff --git a/include/uapi/linux/scc.h b/include/uapi/linux/scc.h index 72b6b8153374..73c0cb2b3c66 100644 --- a/include/uapi/linux/scc.h +++ b/include/uapi/linux/scc.h @@ -1,7 +1,7 @@ /* $Id: scc.h,v 1.29 1997/04/02 14:56:45 jreuter Exp jreuter $ */ -#ifndef _UAPI_SCC_H -#define _UAPI_SCC_H +#ifndef _SCC_H +#define _SCC_H /* selection of hardware types */ @@ -169,4 +169,4 @@ struct scc_calibrate { unsigned char pattern; }; -#endif /* _UAPI_SCC_H */ +#endif /* _SCC_H */ diff --git a/include/uapi/linux/sched.h b/include/uapi/linux/sched.h index 5a0f945927ac..605dc535f408 100644 --- a/include/uapi/linux/sched.h +++ b/include/uapi/linux/sched.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_SCHED_H -#define _UAPI_LINUX_SCHED_H +#ifndef _LINUX_SCHED_H +#define _LINUX_SCHED_H /* * cloning flags: @@ -43,4 +43,4 @@ #define SCHED_RESET_ON_FORK 0x40000000 -#endif /* _UAPI_LINUX_SCHED_H */ +#endif /* _LINUX_SCHED_H */ diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h index 7530e7447620..c5c4d201860e 100644 --- a/include/uapi/linux/screen_info.h +++ b/include/uapi/linux/screen_info.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_SCREEN_INFO_H -#define _UAPI_SCREEN_INFO_H +#ifndef _SCREEN_INFO_H +#define _SCREEN_INFO_H #include <linux/types.h> @@ -71,4 +71,4 @@ struct screen_info { #define VIDEO_CAPABILITY_SKIP_QUIRKS (1 << 0) -#endif /* _UAPI_SCREEN_INFO_H */ +#endif /* _SCREEN_INFO_H */ diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h index ca451e99b28b..d571af37a9ac 100644 --- a/include/uapi/linux/sctp.h +++ b/include/uapi/linux/sctp.h @@ -51,8 +51,8 @@ * be incorporated into the next SCTP release. */ -#ifndef _UAPI_SCTP_H -#define _UAPI_SCTP_H +#ifndef _SCTP_H +#define _SCTP_H #include <linux/types.h> #include <linux/socket.h> @@ -590,7 +590,6 @@ struct sctp_authchunk { * This option gets or sets the list of HMAC algorithms that the local * endpoint requires the peer to use. */ -#ifndef __KERNEL__ /* This here is only used by user space as is. It might not be a good idea * to export/reveal the whole structure with reserved fields etc. */ @@ -598,7 +597,6 @@ enum { SCTP_AUTH_HMAC_ID_SHA1 = 1, SCTP_AUTH_HMAC_ID_SHA256 = 3, }; -#endif struct sctp_hmacalgo { __u32 shmac_num_idents; @@ -770,11 +768,7 @@ struct sctp_assoc_ids { struct sctp_getaddrs_old { sctp_assoc_t assoc_id; int addr_num; -#ifdef __KERNEL__ - struct sockaddr __user *addrs; -#else struct sockaddr *addrs; -#endif }; struct sctp_getaddrs { @@ -843,4 +837,4 @@ struct sctp_paddrthlds { __u16 spt_pathpfthld; }; -#endif /* _UAPI_SCTP_H */ +#endif /* _SCTP_H */ diff --git a/include/uapi/linux/sdla.h b/include/uapi/linux/sdla.h index 95eaff9c9e49..0760ba4ac577 100644 --- a/include/uapi/linux/sdla.h +++ b/include/uapi/linux/sdla.h @@ -20,8 +20,8 @@ * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPISDLA_H -#define _UAPISDLA_H +#ifndef SDLA_H +#define SDLA_H /* adapter type */ #define SDLA_TYPES @@ -58,7 +58,7 @@ struct sdla_mem { int addr; int len; - void __user *data; + void *data; }; #define SDLA_START (FRAD_LAST_IOCTL + 7) @@ -113,4 +113,4 @@ struct sdla_dlci_conf { }; -#endif /* _UAPISDLA_H */ +#endif /* SDLA_H */ diff --git a/include/uapi/linux/seccomp.h b/include/uapi/linux/seccomp.h index ac2dc9f72973..9c03683fa006 100644 --- a/include/uapi/linux/seccomp.h +++ b/include/uapi/linux/seccomp.h @@ -1,7 +1,7 @@ -#ifndef _UAPI_LINUX_SECCOMP_H -#define _UAPI_LINUX_SECCOMP_H +#ifndef _LINUX_SECCOMP_H +#define _LINUX_SECCOMP_H + -#include <linux/compiler.h> #include <linux/types.h> @@ -44,4 +44,4 @@ struct seccomp_data { __u64 args[6]; }; -#endif /* _UAPI_LINUX_SECCOMP_H */ +#endif /* _LINUX_SECCOMP_H */ diff --git a/include/uapi/linux/securebits.h b/include/uapi/linux/securebits.h index 985aac9e6bf8..fa1a9f5de794 100644 --- a/include/uapi/linux/securebits.h +++ b/include/uapi/linux/securebits.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_SECUREBITS_H -#define _UAPI_LINUX_SECUREBITS_H +#ifndef _LINUX_SECUREBITS_H +#define _LINUX_SECUREBITS_H /* Each securesetting is implemented using two bits. One bit specifies whether the setting is on or off. The other bit specify whether the @@ -48,4 +48,4 @@ issecure_mask(SECURE_KEEP_CAPS)) #define SECURE_ALL_LOCKS (SECURE_ALL_BITS << 1) -#endif /* _UAPI_LINUX_SECUREBITS_H */ +#endif /* _LINUX_SECUREBITS_H */ diff --git a/include/uapi/linux/selinux_netlink.h b/include/uapi/linux/selinux_netlink.h index d239797785cf..7a9bf6a5d911 100644 --- a/include/uapi/linux/selinux_netlink.h +++ b/include/uapi/linux/selinux_netlink.h @@ -22,12 +22,10 @@ enum { SELNL_MSG_MAX }; -#ifndef __KERNEL__ /* Multicast groups - backwards compatiblility for userspace */ #define SELNL_GRP_NONE 0x00000000 #define SELNL_GRP_AVC 0x00000001 /* AVC notifications */ #define SELNL_GRP_ALL 0xffffffff -#endif enum selinux_nlgroups { SELNLGRP_NONE, diff --git a/include/uapi/linux/sem.h b/include/uapi/linux/sem.h index 541fce03b50c..9f1974c72e85 100644 --- a/include/uapi/linux/sem.h +++ b/include/uapi/linux/sem.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_SEM_H -#define _UAPI_LINUX_SEM_H +#ifndef _LINUX_SEM_H +#define _LINUX_SEM_H #include <linux/ipc.h> @@ -44,10 +44,10 @@ struct sembuf { /* arg for semctl system calls. */ union semun { int val; /* value for SETVAL */ - struct semid_ds __user *buf; /* buffer for IPC_STAT & IPC_SET */ - unsigned short __user *array; /* array for GETALL & SETALL */ - struct seminfo __user *__buf; /* buffer for IPC_INFO */ - void __user *__pad; + struct semid_ds *buf; /* buffer for IPC_STAT & IPC_SET */ + unsigned short *array; /* array for GETALL & SETALL */ + struct seminfo *__buf; /* buffer for IPC_INFO */ + void *__pad; }; struct seminfo { @@ -77,4 +77,4 @@ struct seminfo { #define SEMUSZ 20 /* sizeof struct sem_undo */ -#endif /* _UAPI_LINUX_SEM_H */ +#endif /* _LINUX_SEM_H */ diff --git a/include/uapi/linux/serial.h b/include/uapi/linux/serial.h index 5e0d0ed61cf3..4d0411540a32 100644 --- a/include/uapi/linux/serial.h +++ b/include/uapi/linux/serial.h @@ -7,8 +7,8 @@ * Public License (GPL) */ -#ifndef _UAPI_LINUX_SERIAL_H -#define _UAPI_LINUX_SERIAL_H +#ifndef _LINUX_SERIAL_H +#define _LINUX_SERIAL_H #include <linux/types.h> @@ -123,4 +123,4 @@ struct serial_rs485 { are a royal PITA .. */ }; -#endif /* _UAPI_LINUX_SERIAL_H */ +#endif /* _LINUX_SERIAL_H */ diff --git a/include/uapi/linux/serial_core.h b/include/uapi/linux/serial_core.h index b47dba2c1e6f..03100b387dbf 100644 --- a/include/uapi/linux/serial_core.h +++ b/include/uapi/linux/serial_core.h @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _UAPILINUX_SERIAL_CORE_H -#define _UAPILINUX_SERIAL_CORE_H +#ifndef LINUX_SERIAL_CORE_H +#define LINUX_SERIAL_CORE_H #include <linux/serial.h> @@ -238,4 +238,4 @@ /* Tilera TILE-Gx UART */ #define PORT_TILEGX 106 -#endif /* _UAPILINUX_SERIAL_CORE_H */ +#endif /* LINUX_SERIAL_CORE_H */ diff --git a/include/uapi/linux/serio.h b/include/uapi/linux/serio.h index 9f53fa7fc132..e73ba8df5c45 100644 --- a/include/uapi/linux/serio.h +++ b/include/uapi/linux/serio.h @@ -5,8 +5,8 @@ * under the terms of the GNU General Public License version 2 as published by * the Free Software Foundation. */ -#ifndef _UAPI_SERIO_H -#define _UAPI_SERIO_H +#ifndef _SERIO_H +#define _SERIO_H #include <linux/ioctl.h> @@ -77,4 +77,4 @@ #define SERIO_PS2MULT 0x3c #define SERIO_TSC40 0x3d -#endif /* _UAPI_SERIO_H */ +#endif /* _SERIO_H */ diff --git a/include/uapi/linux/shm.h b/include/uapi/linux/shm.h index ec36fa1a83a4..c99cef0ed7ab 100644 --- a/include/uapi/linux/shm.h +++ b/include/uapi/linux/shm.h @@ -1,11 +1,9 @@ -#ifndef _UAPI_LINUX_SHM_H_ -#define _UAPI_LINUX_SHM_H_ +#ifndef _LINUX_SHM_H_ +#define _LINUX_SHM_H_ #include <linux/ipc.h> #include <linux/errno.h> -#ifndef __KERNEL__ #include <unistd.h> -#endif /* * SHMMAX, SHMMNI and SHMALL are upper limits are defaults which can @@ -15,9 +13,7 @@ #define SHMMAX 0x2000000 /* max shared seg size (bytes) */ #define SHMMIN 1 /* min shared seg size (bytes) */ #define SHMMNI 4096 /* max num of segs system wide */ -#ifndef __KERNEL__ #define SHMALL (SHMMAX/getpagesize()*(SHMMNI/16)) -#endif #define SHMSEG SHMMNI /* max shared segs per process */ @@ -76,4 +72,4 @@ struct shm_info { }; -#endif /* _UAPI_LINUX_SHM_H_ */ +#endif /* _LINUX_SHM_H_ */ diff --git a/include/uapi/linux/signal.h b/include/uapi/linux/signal.h index e1bd50c29ded..94dc2e60362c 100644 --- a/include/uapi/linux/signal.h +++ b/include/uapi/linux/signal.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_SIGNAL_H -#define _UAPI_LINUX_SIGNAL_H +#ifndef _LINUX_SIGNAL_H +#define _LINUX_SIGNAL_H #include <asm/signal.h> #include <asm/siginfo.h> @@ -7,4 +7,4 @@ #define SS_ONSTACK 1 #define SS_DISABLE 2 -#endif /* _UAPI_LINUX_SIGNAL_H */ +#endif /* _LINUX_SIGNAL_H */ diff --git a/include/uapi/linux/signalfd.h b/include/uapi/linux/signalfd.h index 492c6def340d..90e689a2f8c6 100644 --- a/include/uapi/linux/signalfd.h +++ b/include/uapi/linux/signalfd.h @@ -5,8 +5,8 @@ * */ -#ifndef _UAPI_LINUX_SIGNALFD_H -#define _UAPI_LINUX_SIGNALFD_H +#ifndef _LINUX_SIGNALFD_H +#define _LINUX_SIGNALFD_H #include <linux/types.h> /* For O_CLOEXEC and O_NONBLOCK */ @@ -49,4 +49,4 @@ struct signalfd_siginfo { -#endif /* _UAPI_LINUX_SIGNALFD_H */ +#endif /* _LINUX_SIGNALFD_H */ diff --git a/include/uapi/linux/sock_diag.h b/include/uapi/linux/sock_diag.h index b00e29efb161..78996e23852c 100644 --- a/include/uapi/linux/sock_diag.h +++ b/include/uapi/linux/sock_diag.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__SOCK_DIAG_H__ -#define _UAPI__SOCK_DIAG_H__ +#ifndef __SOCK_DIAG_H__ +#define __SOCK_DIAG_H__ #include <linux/types.h> @@ -23,4 +23,4 @@ enum { SK_MEMINFO_VARS, }; -#endif /* _UAPI__SOCK_DIAG_H__ */ +#endif /* __SOCK_DIAG_H__ */ diff --git a/include/uapi/linux/socket.h b/include/uapi/linux/socket.h index 76ab0c68561e..8c1e5017741d 100644 --- a/include/uapi/linux/socket.h +++ b/include/uapi/linux/socket.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_SOCKET_H -#define _UAPI_LINUX_SOCKET_H +#ifndef _LINUX_SOCKET_H +#define _LINUX_SOCKET_H /* * Desired design of maximum size and alignment (see RFC2553) @@ -18,4 +18,4 @@ struct __kernel_sockaddr_storage { /* _SS_MAXSIZE value minus size of ss_family */ } __attribute__ ((aligned(_K_SS_ALIGNSIZE))); /* force desired alignment */ -#endif /* _UAPI_LINUX_SOCKET_H */ +#endif /* _LINUX_SOCKET_H */ diff --git a/include/uapi/linux/sonet.h b/include/uapi/linux/sonet.h index cc54acee81ba..77c834a103a3 100644 --- a/include/uapi/linux/sonet.h +++ b/include/uapi/linux/sonet.h @@ -3,8 +3,8 @@ /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ -#ifndef _UAPILINUX_SONET_H -#define _UAPILINUX_SONET_H +#ifndef LINUX_SONET_H +#define LINUX_SONET_H #define __SONET_ITEMS \ __HANDLE_ITEM(section_bip); /* section parity errors (B1) */ \ @@ -57,4 +57,4 @@ struct sonet_stats { -#endif /* _UAPILINUX_SONET_H */ +#endif /* LINUX_SONET_H */ diff --git a/include/uapi/linux/sonypi.h b/include/uapi/linux/sonypi.h index 85078a283573..1c0a25f8eea2 100644 --- a/include/uapi/linux/sonypi.h +++ b/include/uapi/linux/sonypi.h @@ -33,8 +33,8 @@ * */ -#ifndef _UAPI_SONYPI_H_ -#define _UAPI_SONYPI_H_ +#ifndef _SONYPI_H_ +#define _SONYPI_H_ #include <linux/types.h> @@ -143,4 +143,4 @@ #define SONYPI_IOCGTEMP _IOR('v', 12, __u8) -#endif /* _UAPI_SONYPI_H_ */ +#endif /* _SONYPI_H_ */ diff --git a/include/uapi/linux/sound.h b/include/uapi/linux/sound.h index 014c9117c224..a1d0682ed138 100644 --- a/include/uapi/linux/sound.h +++ b/include/uapi/linux/sound.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_SOUND_H -#define _UAPI_LINUX_SOUND_H +#ifndef _LINUX_SOUND_H +#define _LINUX_SOUND_H /* * Minor numbers for the sound driver. @@ -28,4 +28,4 @@ #define SND_DEV_ADMMIDI 14 /* Like /dev/dmmidi (onsolete) */ -#endif /* _UAPI_LINUX_SOUND_H */ +#endif /* _LINUX_SOUND_H */ diff --git a/include/uapi/linux/soundcard.h b/include/uapi/linux/soundcard.h index f3b21f989872..c5abf865c853 100644 --- a/include/uapi/linux/soundcard.h +++ b/include/uapi/linux/soundcard.h @@ -21,8 +21,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#ifndef _UAPISOUNDCARD_H -#define _UAPISOUNDCARD_H +#ifndef SOUNDCARD_H +#define SOUNDCARD_H /* @@ -40,9 +40,7 @@ #include <linux/ioctl.h> /* Endian macros. */ -#ifndef __KERNEL__ # include <endian.h> -#endif /* * Supported card ID numbers (Should be somewhere else?) @@ -188,7 +186,6 @@ typedef struct seq_event_rec { #include <linux/patchkey.h> #undef _LINUX_PATCHKEY_H_INDIRECT -#if !defined(__KERNEL__) # if defined(__BYTE_ORDER) # if __BYTE_ORDER == __BIG_ENDIAN # define AFMT_S16_NE AFMT_S16_BE @@ -198,7 +195,6 @@ typedef struct seq_event_rec { # error "could not determine byte order" # endif # endif -#endif /* * Sample loading mechanism for internal synthesizers (/dev/sequencer) @@ -1037,7 +1033,6 @@ typedef struct mixer_vol_table { */ #define LOCL_STARTAUDIO 1 -#if !defined(__KERNEL__) || defined(USE_SEQ_MACROS) /* * Some convenience macros to simplify programming of the * /dev/sequencer interface @@ -1278,5 +1273,4 @@ void seqbuf_dump(void); /* This function must be provided by programs */ #define SEQ_WRPATCH2(patchx, len) \ (SEQ_DUMPBUF(), write(seqfd, (char*)(patchx), len)) -#endif -#endif /* _UAPISOUNDCARD_H */ +#endif /* SOUNDCARD_H */ diff --git a/include/uapi/linux/stat.h b/include/uapi/linux/stat.h index 7fec7e36d921..a5ce2184420f 100644 --- a/include/uapi/linux/stat.h +++ b/include/uapi/linux/stat.h @@ -1,9 +1,7 @@ -#ifndef _UAPI_LINUX_STAT_H -#define _UAPI_LINUX_STAT_H +#ifndef _LINUX_STAT_H +#define _LINUX_STAT_H -#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) - #define S_IFMT 00170000 #define S_IFSOCK 0140000 #define S_IFLNK 0120000 @@ -39,7 +37,5 @@ #define S_IWOTH 00002 #define S_IXOTH 00001 -#endif - -#endif /* _UAPI_LINUX_STAT_H */ +#endif /* _LINUX_STAT_H */ diff --git a/include/uapi/linux/string.h b/include/uapi/linux/string.h index e32e545cff5a..d7ed84468996 100644 --- a/include/uapi/linux/string.h +++ b/include/uapi/linux/string.h @@ -1,9 +1,7 @@ -#ifndef _UAPI_LINUX_STRING_H_ -#define _UAPI_LINUX_STRING_H_ +#ifndef _LINUX_STRING_H_ +#define _LINUX_STRING_H_ /* We don't want strings.h stuff being used by user stuff by accident */ -#ifndef __KERNEL__ #include <string.h> -#endif /* __KERNEL__ */ -#endif /* _UAPI_LINUX_STRING_H_ */ +#endif /* _LINUX_STRING_H_ */ diff --git a/include/uapi/linux/sunrpc/debug.h b/include/uapi/linux/sunrpc/debug.h index 830e34493a8c..4ead318b2747 100644 --- a/include/uapi/linux/sunrpc/debug.h +++ b/include/uapi/linux/sunrpc/debug.h @@ -6,8 +6,8 @@ * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de> */ -#ifndef _UAPI_LINUX_SUNRPC_DEBUG_H_ -#define _UAPI_LINUX_SUNRPC_DEBUG_H_ +#ifndef _LINUX_SUNRPC_DEBUG_H_ +#define _LINUX_SUNRPC_DEBUG_H_ /* * RPC debug facilities @@ -45,4 +45,4 @@ enum { CTL_MAX_RESVPORT, }; -#endif /* _UAPI_LINUX_SUNRPC_DEBUG_H_ */ +#endif /* _LINUX_SUNRPC_DEBUG_H_ */ diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h index 0e011eb91b5d..13a943c6077c 100644 --- a/include/uapi/linux/swab.h +++ b/include/uapi/linux/swab.h @@ -1,8 +1,8 @@ -#ifndef _UAPI_LINUX_SWAB_H -#define _UAPI_LINUX_SWAB_H +#ifndef _LINUX_SWAB_H +#define _LINUX_SWAB_H #include <linux/types.h> -#include <linux/compiler.h> + #include <asm/swab.h> /* @@ -43,7 +43,7 @@ * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32 */ -static inline __attribute_const__ __u16 __fswab16(__u16 val) +static __inline__ __u16 __fswab16(__u16 val) { #ifdef __HAVE_BUILTIN_BSWAP16__ return __builtin_bswap16(val); @@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val) #endif } -static inline __attribute_const__ __u32 __fswab32(__u32 val) +static __inline__ __u32 __fswab32(__u32 val) { #ifdef __HAVE_BUILTIN_BSWAP32__ return __builtin_bswap32(val); @@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val) #endif } -static inline __attribute_const__ __u64 __fswab64(__u64 val) +static __inline__ __u64 __fswab64(__u64 val) { #ifdef __HAVE_BUILTIN_BSWAP64__ return __builtin_bswap64(val); @@ -80,7 +80,7 @@ static inline __attribute_const__ __u64 __fswab64(__u64 val) #endif } -static inline __attribute_const__ __u32 __fswahw32(__u32 val) +static __inline__ __u32 __fswahw32(__u32 val) { #ifdef __arch_swahw32 return __arch_swahw32(val); @@ -89,7 +89,7 @@ static inline __attribute_const__ __u32 __fswahw32(__u32 val) #endif } -static inline __attribute_const__ __u32 __fswahb32(__u32 val) +static __inline__ __u32 __fswahb32(__u32 val) { #ifdef __arch_swahb32 return __arch_swahb32(val); @@ -151,7 +151,7 @@ static inline __attribute_const__ __u32 __fswahb32(__u32 val) * __swab16p - return a byteswapped 16-bit value from a pointer * @p: pointer to a naturally-aligned 16-bit value */ -static inline __u16 __swab16p(const __u16 *p) +static __inline__ __u16 __swab16p(const __u16 *p) { #ifdef __arch_swab16p return __arch_swab16p(p); @@ -164,7 +164,7 @@ static inline __u16 __swab16p(const __u16 *p) * __swab32p - return a byteswapped 32-bit value from a pointer * @p: pointer to a naturally-aligned 32-bit value */ -static inline __u32 __swab32p(const __u32 *p) +static __inline__ __u32 __swab32p(const __u32 *p) { #ifdef __arch_swab32p return __arch_swab32p(p); @@ -177,7 +177,7 @@ static inline __u32 __swab32p(const __u32 *p) * __swab64p - return a byteswapped 64-bit value from a pointer * @p: pointer to a naturally-aligned 64-bit value */ -static inline __u64 __swab64p(const __u64 *p) +static __inline__ __u64 __swab64p(const __u64 *p) { #ifdef __arch_swab64p return __arch_swab64p(p); @@ -192,7 +192,7 @@ static inline __u64 __swab64p(const __u64 *p) * * See __swahw32() for details of wordswapping. */ -static inline __u32 __swahw32p(const __u32 *p) +static __inline__ __u32 __swahw32p(const __u32 *p) { #ifdef __arch_swahw32p return __arch_swahw32p(p); @@ -207,7 +207,7 @@ static inline __u32 __swahw32p(const __u32 *p) * * See __swahb32() for details of high/low byteswapping. */ -static inline __u32 __swahb32p(const __u32 *p) +static __inline__ __u32 __swahb32p(const __u32 *p) { #ifdef __arch_swahb32p return __arch_swahb32p(p); @@ -220,7 +220,7 @@ static inline __u32 __swahb32p(const __u32 *p) * __swab16s - byteswap a 16-bit value in-place * @p: pointer to a naturally-aligned 16-bit value */ -static inline void __swab16s(__u16 *p) +static __inline__ void __swab16s(__u16 *p) { #ifdef __arch_swab16s __arch_swab16s(p); @@ -232,7 +232,7 @@ static inline void __swab16s(__u16 *p) * __swab32s - byteswap a 32-bit value in-place * @p: pointer to a naturally-aligned 32-bit value */ -static inline void __swab32s(__u32 *p) +static __inline__ void __swab32s(__u32 *p) { #ifdef __arch_swab32s __arch_swab32s(p); @@ -245,7 +245,7 @@ static inline void __swab32s(__u32 *p) * __swab64s - byteswap a 64-bit value in-place * @p: pointer to a naturally-aligned 64-bit value */ -static inline void __swab64s(__u64 *p) +static __inline__ void __swab64s(__u64 *p) { #ifdef __arch_swab64s __arch_swab64s(p); @@ -260,7 +260,7 @@ static inline void __swab64s(__u64 *p) * * See __swahw32() for details of wordswapping */ -static inline void __swahw32s(__u32 *p) +static __inline__ void __swahw32s(__u32 *p) { #ifdef __arch_swahw32s __arch_swahw32s(p); @@ -275,7 +275,7 @@ static inline void __swahw32s(__u32 *p) * * See __swahb32() for details of high and low byte swapping */ -static inline void __swahb32s(__u32 *p) +static __inline__ void __swahb32s(__u32 *p) { #ifdef __arch_swahb32s __arch_swahb32s(p); @@ -285,4 +285,4 @@ static inline void __swahb32s(__u32 *p) } -#endif /* _UAPI_LINUX_SWAB_H */ +#endif /* _LINUX_SWAB_H */ diff --git a/include/uapi/linux/synclink.h b/include/uapi/linux/synclink.h index 7dcb065a5f76..0818434e0a7c 100644 --- a/include/uapi/linux/synclink.h +++ b/include/uapi/linux/synclink.h @@ -9,8 +9,8 @@ * the terms of the GNU Public License (GPL) */ -#ifndef _UAPI_SYNCLINK_H_ -#define _UAPI_SYNCLINK_H_ +#ifndef _SYNCLINK_H_ +#define _SYNCLINK_H_ #define SYNCLINK_H_VERSION 3.6 #include <linux/types.h> @@ -297,4 +297,4 @@ struct gpio_desc { #define MGSL_IOCGXCTRL _IO(MGSL_MAGIC_IOC, 22) -#endif /* _UAPI_SYNCLINK_H_ */ +#endif /* _SYNCLINK_H_ */ diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h index 6d6721341f49..a092bce76a4e 100644 --- a/include/uapi/linux/sysctl.h +++ b/include/uapi/linux/sysctl.h @@ -19,12 +19,12 @@ **************************************************************** */ -#ifndef _UAPI_LINUX_SYSCTL_H -#define _UAPI_LINUX_SYSCTL_H +#ifndef _LINUX_SYSCTL_H +#define _LINUX_SYSCTL_H #include <linux/kernel.h> #include <linux/types.h> -#include <linux/compiler.h> + struct completion; @@ -34,11 +34,11 @@ struct completion; member of a struct __sysctl_args to have? */ struct __sysctl_args { - int __user *name; + int *name; int nlen; - void __user *oldval; - size_t __user *oldlenp; - void __user *newval; + void *oldval; + size_t *oldlenp; + void *newval; size_t newlen; unsigned long __unused[4]; }; @@ -929,4 +929,4 @@ enum }; -#endif /* _UAPI_LINUX_SYSCTL_H */ +#endif /* _LINUX_SYSCTL_H */ diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h index 377f1e59411d..7b6e5c289847 100644 --- a/include/uapi/linux/tcp.h +++ b/include/uapi/linux/tcp.h @@ -14,13 +14,15 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI_LINUX_TCP_H -#define _UAPI_LINUX_TCP_H +#ifndef _LINUX_TCP_H +#define _LINUX_TCP_H #include <linux/types.h> +#include <linux/libc-compat.h> #include <asm/byteorder.h> #include <linux/socket.h> +#if __UAPI_DEF_TCPHDR struct tcphdr { __be16 source; __be16 dest; @@ -55,6 +57,7 @@ struct tcphdr { __sum16 check; __be16 urg_ptr; }; +#endif /* * The union cast uses a gcc extension to avoid aliasing problems @@ -199,4 +202,4 @@ struct tcp_md5sig { __u8 tcpm_key[TCP_MD5SIG_MAXKEYLEN]; /* key (binary) */ }; -#endif /* _UAPI_LINUX_TCP_H */ +#endif /* _LINUX_TCP_H */ diff --git a/include/uapi/linux/time.h b/include/uapi/linux/time.h index e75e1b6ff27f..3d7a29daffa2 100644 --- a/include/uapi/linux/time.h +++ b/include/uapi/linux/time.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_TIME_H -#define _UAPI_LINUX_TIME_H +#ifndef _LINUX_TIME_H +#define _LINUX_TIME_H #include <linux/types.h> @@ -66,4 +66,4 @@ struct itimerval { */ #define TIMER_ABSTIME 0x01 -#endif /* _UAPI_LINUX_TIME_H */ +#endif /* _LINUX_TIME_H */ diff --git a/include/uapi/linux/timex.h b/include/uapi/linux/timex.h index a7ea81f13711..07dc26ef8992 100644 --- a/include/uapi/linux/timex.h +++ b/include/uapi/linux/timex.h @@ -50,8 +50,8 @@ * 2004-08-12 Christoph Lameter * Reworked time interpolation logic */ -#ifndef _UAPI_LINUX_TIMEX_H -#define _UAPI_LINUX_TIMEX_H +#ifndef _LINUX_TIMEX_H +#define _LINUX_TIMEX_H #include <linux/time.h> @@ -107,10 +107,8 @@ struct timex { #define ADJ_NANO 0x2000 /* select nanosecond resolution */ #define ADJ_TICK 0x4000 /* tick value */ -#ifndef __KERNEL__ #define ADJ_OFFSET_SINGLESHOT 0x8001 /* old-fashioned adjtime */ #define ADJ_OFFSET_SS_READ 0xa001 /* read-only adjtime */ -#endif /* NTP userland likes the MOD_ prefix better */ #define MOD_OFFSET ADJ_OFFSET @@ -163,4 +161,4 @@ struct timex { #define TIME_BAD TIME_ERROR /* bw compat */ -#endif /* _UAPI_LINUX_TIMEX_H */ +#endif /* _LINUX_TIMEX_H */ diff --git a/include/uapi/linux/tipc.h b/include/uapi/linux/tipc.h index 852373d27dbb..0f8630613cb6 100644 --- a/include/uapi/linux/tipc.h +++ b/include/uapi/linux/tipc.h @@ -59,24 +59,24 @@ struct tipc_name_seq { __u32 upper; }; -static inline __u32 tipc_addr(unsigned int zone, +static __inline__ __u32 tipc_addr(unsigned int zone, unsigned int cluster, unsigned int node) { return (zone << 24) | (cluster << 12) | node; } -static inline unsigned int tipc_zone(__u32 addr) +static __inline__ unsigned int tipc_zone(__u32 addr) { return addr >> 24; } -static inline unsigned int tipc_cluster(__u32 addr) +static __inline__ unsigned int tipc_cluster(__u32 addr) { return (addr >> 12) & 0xfff; } -static inline unsigned int tipc_node(__u32 addr) +static __inline__ unsigned int tipc_node(__u32 addr) { return addr & 0xfff; } diff --git a/include/uapi/linux/tipc_config.h b/include/uapi/linux/tipc_config.h index 6b0bff09b3a7..044ba4d66c7d 100644 --- a/include/uapi/linux/tipc_config.h +++ b/include/uapi/linux/tipc_config.h @@ -41,9 +41,7 @@ #include <linux/string.h> #include <asm/byteorder.h> -#ifndef __KERNEL__ #include <arpa/inet.h> /* for ntohs etc. */ -#endif /* * Configuration @@ -259,7 +257,7 @@ struct tlv_desc { #define TLV_SPACE(datalen) (TLV_ALIGN(TLV_LENGTH(datalen))) #define TLV_DATA(tlv) ((void *)((char *)(tlv) + TLV_LENGTH(0))) -static inline int TLV_OK(const void *tlv, __u16 space) +static __inline__ int TLV_OK(const void *tlv, __u16 space) { /* * Would also like to check that "tlv" is a multiple of 4, @@ -274,13 +272,13 @@ static inline int TLV_OK(const void *tlv, __u16 space) (ntohs(((struct tlv_desc *)tlv)->tlv_len) <= space); } -static inline int TLV_CHECK(const void *tlv, __u16 space, __u16 exp_type) +static __inline__ int TLV_CHECK(const void *tlv, __u16 space, __u16 exp_type) { return TLV_OK(tlv, space) && (ntohs(((struct tlv_desc *)tlv)->tlv_type) == exp_type); } -static inline int TLV_SET(void *tlv, __u16 type, void *data, __u16 len) +static __inline__ int TLV_SET(void *tlv, __u16 type, void *data, __u16 len) { struct tlv_desc *tlv_ptr; int tlv_len; @@ -304,29 +302,29 @@ struct tlv_list_desc { __u32 tlv_space; /* # bytes from curr TLV to list end */ }; -static inline void TLV_LIST_INIT(struct tlv_list_desc *list, +static __inline__ void TLV_LIST_INIT(struct tlv_list_desc *list, void *data, __u32 space) { list->tlv_ptr = (struct tlv_desc *)data; list->tlv_space = space; } -static inline int TLV_LIST_EMPTY(struct tlv_list_desc *list) +static __inline__ int TLV_LIST_EMPTY(struct tlv_list_desc *list) { return (list->tlv_space == 0); } -static inline int TLV_LIST_CHECK(struct tlv_list_desc *list, __u16 exp_type) +static __inline__ int TLV_LIST_CHECK(struct tlv_list_desc *list, __u16 exp_type) { return TLV_CHECK(list->tlv_ptr, list->tlv_space, exp_type); } -static inline void *TLV_LIST_DATA(struct tlv_list_desc *list) +static __inline__ void *TLV_LIST_DATA(struct tlv_list_desc *list) { return TLV_DATA(list->tlv_ptr); } -static inline void TLV_LIST_STEP(struct tlv_list_desc *list) +static __inline__ void TLV_LIST_STEP(struct tlv_list_desc *list) { __u16 tlv_space = TLV_ALIGN(ntohs(list->tlv_ptr->tlv_len)); @@ -376,7 +374,7 @@ struct tipc_cfg_msg_hdr { #define TCM_SPACE(datalen) (TCM_ALIGN(TCM_LENGTH(datalen))) #define TCM_DATA(tcm_hdr) ((void *)((char *)(tcm_hdr) + TCM_LENGTH(0))) -static inline int TCM_SET(void *msg, __u16 cmd, __u16 flags, +static __inline__ int TCM_SET(void *msg, __u16 cmd, __u16 flags, void *data, __u16 data_len) { struct tipc_cfg_msg_hdr *tcm_hdr; diff --git a/include/uapi/linux/toshiba.h b/include/uapi/linux/toshiba.h index e9bef5b2f91e..46522bf4528c 100644 --- a/include/uapi/linux/toshiba.h +++ b/include/uapi/linux/toshiba.h @@ -17,8 +17,8 @@ * */ -#ifndef _UAPI_LINUX_TOSHIBA_H -#define _UAPI_LINUX_TOSHIBA_H +#ifndef _LINUX_TOSHIBA_H +#define _LINUX_TOSHIBA_H #define TOSH_PROC "/proc/toshiba" #define TOSH_DEVICE "/dev/toshiba" @@ -34,4 +34,4 @@ typedef struct { } SMMRegisters; -#endif /* _UAPI_LINUX_TOSHIBA_H */ +#endif /* _LINUX_TOSHIBA_H */ diff --git a/include/uapi/linux/tty.h b/include/uapi/linux/tty.h index dac199a2dba5..f531621ea713 100644 --- a/include/uapi/linux/tty.h +++ b/include/uapi/linux/tty.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_TTY_H -#define _UAPI_LINUX_TTY_H +#ifndef _LINUX_TTY_H +#define _LINUX_TTY_H /* * 'tty.h' defines some structures used by tty_io.c and some defines. @@ -35,4 +35,4 @@ #define N_TRACESINK 23 /* Trace data routing for MIPI P1149.7 */ #define N_TRACEROUTER 24 /* Trace data routing for MIPI P1149.7 */ -#endif /* _UAPI_LINUX_TTY_H */ +#endif /* _LINUX_TTY_H */ diff --git a/include/uapi/linux/types.h b/include/uapi/linux/types.h index acf0979b790a..23ea78fd1847 100644 --- a/include/uapi/linux/types.h +++ b/include/uapi/linux/types.h @@ -1,14 +1,9 @@ -#ifndef _UAPI_LINUX_TYPES_H -#define _UAPI_LINUX_TYPES_H +#ifndef _LINUX_TYPES_H +#define _LINUX_TYPES_H #include <asm/types.h> #ifndef __ASSEMBLY__ -#ifndef __KERNEL__ -#ifndef __EXPORTED_HEADERS__ -#warning "Attempt to use kernel headers from user space, see http://kernelnewbies.org/KernelHeaders" -#endif /* __EXPORTED_HEADERS__ */ -#endif #include <linux/posix_types.h> @@ -53,4 +48,4 @@ typedef __u32 __bitwise __wsum; #define __aligned_le64 __le64 __attribute__((aligned(8))) #endif /* __ASSEMBLY__ */ -#endif /* _UAPI_LINUX_TYPES_H */ +#endif /* _LINUX_TYPES_H */ diff --git a/include/uapi/linux/udp.h b/include/uapi/linux/udp.h index e2bcfd75a30d..041cb220ac73 100644 --- a/include/uapi/linux/udp.h +++ b/include/uapi/linux/udp.h @@ -14,8 +14,8 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI_LINUX_UDP_H -#define _UAPI_LINUX_UDP_H +#ifndef _LINUX_UDP_H +#define _LINUX_UDP_H #include <linux/types.h> @@ -36,4 +36,4 @@ struct udphdr { #define UDP_ENCAP_L2TPINUDP 3 /* rfc2661 */ -#endif /* _UAPI_LINUX_UDP_H */ +#endif /* _LINUX_UDP_H */ diff --git a/include/uapi/linux/uhid.h b/include/uapi/linux/uhid.h index 414b74be4da1..23a6287e8257 100644 --- a/include/uapi/linux/uhid.h +++ b/include/uapi/linux/uhid.h @@ -40,7 +40,7 @@ struct uhid_create_req { __u8 name[128]; __u8 phys[64]; __u8 uniq[64]; - __u8 __user *rd_data; + __u8 *rd_data; __u16 rd_size; __u16 bus; diff --git a/include/uapi/linux/uinput.h b/include/uapi/linux/uinput.h index fe46431593f9..9048f043592e 100644 --- a/include/uapi/linux/uinput.h +++ b/include/uapi/linux/uinput.h @@ -29,8 +29,8 @@ * 0.1 20/06/2002 * - first public version */ -#ifndef _UAPI__UINPUT_H_ -#define _UAPI__UINPUT_H_ +#ifndef __UINPUT_H_ +#define __UINPUT_H_ #include <linux/types.h> #include <linux/input.h> @@ -134,4 +134,4 @@ struct uinput_user_dev { __s32 absfuzz[ABS_CNT]; __s32 absflat[ABS_CNT]; }; -#endif /* _UAPI__UINPUT_H_ */ +#endif /* __UINPUT_H_ */ diff --git a/include/uapi/linux/uio.h b/include/uapi/linux/uio.h index 2731d56a5484..d0978de607f1 100644 --- a/include/uapi/linux/uio.h +++ b/include/uapi/linux/uio.h @@ -6,16 +6,16 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#ifndef _UAPI__LINUX_UIO_H -#define _UAPI__LINUX_UIO_H +#ifndef __LINUX_UIO_H +#define __LINUX_UIO_H + -#include <linux/compiler.h> #include <linux/types.h> struct iovec { - void __user *iov_base; /* BSD uses caddr_t (1003.1g requires void *) */ + void *iov_base; /* BSD uses caddr_t (1003.1g requires void *) */ __kernel_size_t iov_len; /* Must be size_t (1003.1g) */ }; @@ -27,4 +27,4 @@ struct iovec #define UIO_MAXIOV 1024 -#endif /* _UAPI__LINUX_UIO_H */ +#endif /* __LINUX_UIO_H */ diff --git a/include/uapi/linux/usb/audio.h b/include/uapi/linux/usb/audio.h index d2314be4f0c0..210f2f5a1894 100644 --- a/include/uapi/linux/usb/audio.h +++ b/include/uapi/linux/usb/audio.h @@ -18,8 +18,8 @@ * this standard or common for newer versions. */ -#ifndef _UAPI__LINUX_USB_AUDIO_H -#define _UAPI__LINUX_USB_AUDIO_H +#ifndef __LINUX_USB_AUDIO_H +#define __LINUX_USB_AUDIO_H #include <linux/types.h> @@ -254,12 +254,12 @@ struct uac_mixer_unit_descriptor { __u8 baSourceID[]; } __attribute__ ((packed)); -static inline __u8 uac_mixer_unit_bNrChannels(struct uac_mixer_unit_descriptor *desc) +static __inline__ __u8 uac_mixer_unit_bNrChannels(struct uac_mixer_unit_descriptor *desc) { return desc->baSourceID[desc->bNrInPins]; } -static inline __u32 uac_mixer_unit_wChannelConfig(struct uac_mixer_unit_descriptor *desc, +static __inline__ __u32 uac_mixer_unit_wChannelConfig(struct uac_mixer_unit_descriptor *desc, int protocol) { if (protocol == UAC_VERSION_1) @@ -272,7 +272,7 @@ static inline __u32 uac_mixer_unit_wChannelConfig(struct uac_mixer_unit_descript (desc->baSourceID[desc->bNrInPins + 1]); } -static inline __u8 uac_mixer_unit_iChannelNames(struct uac_mixer_unit_descriptor *desc, +static __inline__ __u8 uac_mixer_unit_iChannelNames(struct uac_mixer_unit_descriptor *desc, int protocol) { return (protocol == UAC_VERSION_1) ? @@ -280,7 +280,7 @@ static inline __u8 uac_mixer_unit_iChannelNames(struct uac_mixer_unit_descriptor desc->baSourceID[desc->bNrInPins + 5]; } -static inline __u8 *uac_mixer_unit_bmControls(struct uac_mixer_unit_descriptor *desc, +static __inline__ __u8 *uac_mixer_unit_bmControls(struct uac_mixer_unit_descriptor *desc, int protocol) { return (protocol == UAC_VERSION_1) ? @@ -288,7 +288,7 @@ static inline __u8 *uac_mixer_unit_bmControls(struct uac_mixer_unit_descriptor * &desc->baSourceID[desc->bNrInPins + 6]; } -static inline __u8 uac_mixer_unit_iMixer(struct uac_mixer_unit_descriptor *desc) +static __inline__ __u8 uac_mixer_unit_iMixer(struct uac_mixer_unit_descriptor *desc) { __u8 *raw = (__u8 *) desc; return raw[desc->bLength - 1]; @@ -304,7 +304,7 @@ struct uac_selector_unit_descriptor { __u8 baSourceID[]; } __attribute__ ((packed)); -static inline __u8 uac_selector_unit_iSelector(struct uac_selector_unit_descriptor *desc) +static __inline__ __u8 uac_selector_unit_iSelector(struct uac_selector_unit_descriptor *desc) { __u8 *raw = (__u8 *) desc; return raw[desc->bLength - 1]; @@ -321,7 +321,7 @@ struct uac_feature_unit_descriptor { __u8 bmaControls[0]; /* variable length */ } __attribute__((packed)); -static inline __u8 uac_feature_unit_iFeature(struct uac_feature_unit_descriptor *desc) +static __inline__ __u8 uac_feature_unit_iFeature(struct uac_feature_unit_descriptor *desc) { __u8 *raw = (__u8 *) desc; return raw[desc->bLength - 1]; @@ -338,12 +338,12 @@ struct uac_processing_unit_descriptor { __u8 baSourceID[]; } __attribute__ ((packed)); -static inline __u8 uac_processing_unit_bNrChannels(struct uac_processing_unit_descriptor *desc) +static __inline__ __u8 uac_processing_unit_bNrChannels(struct uac_processing_unit_descriptor *desc) { return desc->baSourceID[desc->bNrInPins]; } -static inline __u32 uac_processing_unit_wChannelConfig(struct uac_processing_unit_descriptor *desc, +static __inline__ __u32 uac_processing_unit_wChannelConfig(struct uac_processing_unit_descriptor *desc, int protocol) { if (protocol == UAC_VERSION_1) @@ -356,7 +356,7 @@ static inline __u32 uac_processing_unit_wChannelConfig(struct uac_processing_uni (desc->baSourceID[desc->bNrInPins + 1]); } -static inline __u8 uac_processing_unit_iChannelNames(struct uac_processing_unit_descriptor *desc, +static __inline__ __u8 uac_processing_unit_iChannelNames(struct uac_processing_unit_descriptor *desc, int protocol) { return (protocol == UAC_VERSION_1) ? @@ -364,7 +364,7 @@ static inline __u8 uac_processing_unit_iChannelNames(struct uac_processing_unit_ desc->baSourceID[desc->bNrInPins + 5]; } -static inline __u8 uac_processing_unit_bControlSize(struct uac_processing_unit_descriptor *desc, +static __inline__ __u8 uac_processing_unit_bControlSize(struct uac_processing_unit_descriptor *desc, int protocol) { return (protocol == UAC_VERSION_1) ? @@ -372,7 +372,7 @@ static inline __u8 uac_processing_unit_bControlSize(struct uac_processing_unit_d desc->baSourceID[desc->bNrInPins + 6]; } -static inline __u8 *uac_processing_unit_bmControls(struct uac_processing_unit_descriptor *desc, +static __inline__ __u8 *uac_processing_unit_bmControls(struct uac_processing_unit_descriptor *desc, int protocol) { return (protocol == UAC_VERSION_1) ? @@ -380,7 +380,7 @@ static inline __u8 *uac_processing_unit_bmControls(struct uac_processing_unit_de &desc->baSourceID[desc->bNrInPins + 7]; } -static inline __u8 uac_processing_unit_iProcessing(struct uac_processing_unit_descriptor *desc, +static __inline__ __u8 uac_processing_unit_iProcessing(struct uac_processing_unit_descriptor *desc, int protocol) { __u8 control_size = uac_processing_unit_bControlSize(desc, protocol); @@ -388,7 +388,7 @@ static inline __u8 uac_processing_unit_iProcessing(struct uac_processing_unit_de + control_size); } -static inline __u8 *uac_processing_unit_specific(struct uac_processing_unit_descriptor *desc, +static __inline__ __u8 *uac_processing_unit_specific(struct uac_processing_unit_descriptor *desc, int protocol) { __u8 control_size = uac_processing_unit_bControlSize(desc, protocol); @@ -544,4 +544,4 @@ struct uac1_status_word { } __attribute__((packed)); -#endif /* _UAPI__LINUX_USB_AUDIO_H */ +#endif /* __LINUX_USB_AUDIO_H */ diff --git a/include/uapi/linux/usb/ch9.h b/include/uapi/linux/usb/ch9.h index aa33fd1b2d4f..ebe53ea3690d 100644 --- a/include/uapi/linux/usb/ch9.h +++ b/include/uapi/linux/usb/ch9.h @@ -30,8 +30,8 @@ * particular descriptor type. */ -#ifndef _UAPI__LINUX_USB_CH9_H -#define _UAPI__LINUX_USB_CH9_H +#ifndef __LINUX_USB_CH9_H +#define __LINUX_USB_CH9_H #include <linux/types.h> /* __u8 etc */ #include <asm/byteorder.h> /* le16_to_cpu */ @@ -422,7 +422,7 @@ struct usb_endpoint_descriptor { * * Returns @epd's number: 0 to 15. */ -static inline int usb_endpoint_num(const struct usb_endpoint_descriptor *epd) +static __inline__ int usb_endpoint_num(const struct usb_endpoint_descriptor *epd) { return epd->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK; } @@ -434,7 +434,7 @@ static inline int usb_endpoint_num(const struct usb_endpoint_descriptor *epd) * Returns one of USB_ENDPOINT_XFER_{CONTROL, ISOC, BULK, INT} according * to @epd's transfer type. */ -static inline int usb_endpoint_type(const struct usb_endpoint_descriptor *epd) +static __inline__ int usb_endpoint_type(const struct usb_endpoint_descriptor *epd) { return epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK; } @@ -445,7 +445,7 @@ static inline int usb_endpoint_type(const struct usb_endpoint_descriptor *epd) * * Returns true if the endpoint is of type IN, otherwise it returns false. */ -static inline int usb_endpoint_dir_in(const struct usb_endpoint_descriptor *epd) +static __inline__ int usb_endpoint_dir_in(const struct usb_endpoint_descriptor *epd) { return ((epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN); } @@ -456,7 +456,7 @@ static inline int usb_endpoint_dir_in(const struct usb_endpoint_descriptor *epd) * * Returns true if the endpoint is of type OUT, otherwise it returns false. */ -static inline int usb_endpoint_dir_out( +static __inline__ int usb_endpoint_dir_out( const struct usb_endpoint_descriptor *epd) { return ((epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT); @@ -468,7 +468,7 @@ static inline int usb_endpoint_dir_out( * * Returns true if the endpoint is of type bulk, otherwise it returns false. */ -static inline int usb_endpoint_xfer_bulk( +static __inline__ int usb_endpoint_xfer_bulk( const struct usb_endpoint_descriptor *epd) { return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == @@ -481,7 +481,7 @@ static inline int usb_endpoint_xfer_bulk( * * Returns true if the endpoint is of type control, otherwise it returns false. */ -static inline int usb_endpoint_xfer_control( +static __inline__ int usb_endpoint_xfer_control( const struct usb_endpoint_descriptor *epd) { return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == @@ -495,7 +495,7 @@ static inline int usb_endpoint_xfer_control( * Returns true if the endpoint is of type interrupt, otherwise it returns * false. */ -static inline int usb_endpoint_xfer_int( +static __inline__ int usb_endpoint_xfer_int( const struct usb_endpoint_descriptor *epd) { return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == @@ -509,7 +509,7 @@ static inline int usb_endpoint_xfer_int( * Returns true if the endpoint is of type isochronous, otherwise it returns * false. */ -static inline int usb_endpoint_xfer_isoc( +static __inline__ int usb_endpoint_xfer_isoc( const struct usb_endpoint_descriptor *epd) { return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == @@ -523,7 +523,7 @@ static inline int usb_endpoint_xfer_isoc( * Returns true if the endpoint has bulk transfer type and IN direction, * otherwise it returns false. */ -static inline int usb_endpoint_is_bulk_in( +static __inline__ int usb_endpoint_is_bulk_in( const struct usb_endpoint_descriptor *epd) { return usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_in(epd); @@ -536,7 +536,7 @@ static inline int usb_endpoint_is_bulk_in( * Returns true if the endpoint has bulk transfer type and OUT direction, * otherwise it returns false. */ -static inline int usb_endpoint_is_bulk_out( +static __inline__ int usb_endpoint_is_bulk_out( const struct usb_endpoint_descriptor *epd) { return usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_out(epd); @@ -549,7 +549,7 @@ static inline int usb_endpoint_is_bulk_out( * Returns true if the endpoint has interrupt transfer type and IN direction, * otherwise it returns false. */ -static inline int usb_endpoint_is_int_in( +static __inline__ int usb_endpoint_is_int_in( const struct usb_endpoint_descriptor *epd) { return usb_endpoint_xfer_int(epd) && usb_endpoint_dir_in(epd); @@ -562,7 +562,7 @@ static inline int usb_endpoint_is_int_in( * Returns true if the endpoint has interrupt transfer type and OUT direction, * otherwise it returns false. */ -static inline int usb_endpoint_is_int_out( +static __inline__ int usb_endpoint_is_int_out( const struct usb_endpoint_descriptor *epd) { return usb_endpoint_xfer_int(epd) && usb_endpoint_dir_out(epd); @@ -575,7 +575,7 @@ static inline int usb_endpoint_is_int_out( * Returns true if the endpoint has isochronous transfer type and IN direction, * otherwise it returns false. */ -static inline int usb_endpoint_is_isoc_in( +static __inline__ int usb_endpoint_is_isoc_in( const struct usb_endpoint_descriptor *epd) { return usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_in(epd); @@ -588,7 +588,7 @@ static inline int usb_endpoint_is_isoc_in( * Returns true if the endpoint has isochronous transfer type and OUT direction, * otherwise it returns false. */ -static inline int usb_endpoint_is_isoc_out( +static __inline__ int usb_endpoint_is_isoc_out( const struct usb_endpoint_descriptor *epd) { return usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_out(epd); @@ -600,12 +600,12 @@ static inline int usb_endpoint_is_isoc_out( * * Returns @epd's max packet */ -static inline int usb_endpoint_maxp(const struct usb_endpoint_descriptor *epd) +static __inline__ int usb_endpoint_maxp(const struct usb_endpoint_descriptor *epd) { return __le16_to_cpu(epd->wMaxPacketSize); } -static inline int usb_endpoint_interrupt_type( +static __inline__ int usb_endpoint_interrupt_type( const struct usb_endpoint_descriptor *epd) { return epd->bmAttributes & USB_ENDPOINT_INTRTYPE; @@ -626,7 +626,7 @@ struct usb_ss_ep_comp_descriptor { #define USB_DT_SS_EP_COMP_SIZE 6 /* Bits 4:0 of bmAttributes if this is a bulk endpoint */ -static inline int +static __inline__ int usb_ss_max_streams(const struct usb_ss_ep_comp_descriptor *comp) { int max_streams; @@ -996,4 +996,4 @@ struct usb_set_sel_req { */ #define USB_SELF_POWER_VBUS_MAX_DRAW 100 -#endif /* _UAPI__LINUX_USB_CH9_H */ +#endif /* __LINUX_USB_CH9_H */ diff --git a/include/uapi/linux/usb/functionfs.h b/include/uapi/linux/usb/functionfs.h index d6b01283f85c..532d484ffd9f 100644 --- a/include/uapi/linux/usb/functionfs.h +++ b/include/uapi/linux/usb/functionfs.h @@ -1,5 +1,5 @@ -#ifndef _UAPI__LINUX_FUNCTIONFS_H__ -#define _UAPI__LINUX_FUNCTIONFS_H__ +#ifndef __LINUX_FUNCTIONFS_H__ +#define __LINUX_FUNCTIONFS_H__ #include <linux/types.h> @@ -14,7 +14,6 @@ enum { }; -#ifndef __KERNEL__ /* Descriptor of an non-audio endpoint */ struct usb_endpoint_descriptor_no_audio { @@ -91,7 +90,6 @@ struct usb_functionfs_strings_head { * UTF-8. */ -#endif /* @@ -166,4 +164,4 @@ struct usb_functionfs_event { -#endif /* _UAPI__LINUX_FUNCTIONFS_H__ */ +#endif /* __LINUX_FUNCTIONFS_H__ */ diff --git a/include/uapi/linux/usbdevice_fs.h b/include/uapi/linux/usbdevice_fs.h index 0c65e4b12617..a6374240dbbc 100644 --- a/include/uapi/linux/usbdevice_fs.h +++ b/include/uapi/linux/usbdevice_fs.h @@ -26,8 +26,8 @@ /*****************************************************************************/ -#ifndef _UAPI_LINUX_USBDEVICE_FS_H -#define _UAPI_LINUX_USBDEVICE_FS_H +#ifndef _LINUX_USBDEVICE_FS_H +#define _LINUX_USBDEVICE_FS_H #include <linux/types.h> #include <linux/magic.h> @@ -43,14 +43,14 @@ struct usbdevfs_ctrltransfer { __u16 wIndex; __u16 wLength; __u32 timeout; /* in milliseconds */ - void __user *data; + void *data; }; struct usbdevfs_bulktransfer { unsigned int ep; unsigned int len; unsigned int timeout; /* in milliseconds */ - void __user *data; + void *data; }; struct usbdevfs_setinterface { @@ -60,7 +60,7 @@ struct usbdevfs_setinterface { struct usbdevfs_disconnectsignal { unsigned int signr; - void __user *context; + void *context; }; #define USBDEVFS_MAXDRIVERNAME 255 @@ -98,7 +98,7 @@ struct usbdevfs_urb { unsigned char endpoint; int status; unsigned int flags; - void __user *buffer; + void *buffer; int buffer_length; int actual_length; int start_frame; @@ -106,7 +106,7 @@ struct usbdevfs_urb { int error_count; unsigned int signr; /* signal to be sent on completion, or 0 if none should be sent. */ - void __user *usercontext; + void *usercontext; struct usbdevfs_iso_packet_desc iso_frame_desc[0]; }; @@ -115,7 +115,7 @@ struct usbdevfs_ioctl { int ifno; /* interface 0..N ; negative numbers reserved */ int ioctl_code; /* MUST encode size + direction of data so the * macros in <asm/ioctl.h> give correct values */ - void __user *data; /* param buffer (in, or out) */ + void *data; /* param buffer (in, or out) */ }; /* You can do most things with hubs just through control messages, @@ -177,4 +177,4 @@ struct usbdevfs_disconnect_claim { #define USBDEVFS_GET_CAPABILITIES _IOR('U', 26, __u32) #define USBDEVFS_DISCONNECT_CLAIM _IOR('U', 27, struct usbdevfs_disconnect_claim) -#endif /* _UAPI_LINUX_USBDEVICE_FS_H */ +#endif /* _LINUX_USBDEVICE_FS_H */ diff --git a/include/uapi/linux/utsname.h b/include/uapi/linux/utsname.h index 872c2df10de7..6387d4569f7d 100644 --- a/include/uapi/linux/utsname.h +++ b/include/uapi/linux/utsname.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_UTSNAME_H -#define _UAPI_LINUX_UTSNAME_H +#ifndef _LINUX_UTSNAME_H +#define _LINUX_UTSNAME_H #define __OLD_UTS_LEN 8 @@ -31,4 +31,4 @@ struct new_utsname { }; -#endif /* _UAPI_LINUX_UTSNAME_H */ +#endif /* _LINUX_UTSNAME_H */ diff --git a/include/uapi/linux/uuid.h b/include/uapi/linux/uuid.h index 786f0773cc33..af891a3a9855 100644 --- a/include/uapi/linux/uuid.h +++ b/include/uapi/linux/uuid.h @@ -18,8 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _UAPI_LINUX_UUID_H_ -#define _UAPI_LINUX_UUID_H_ +#ifndef _LINUX_UUID_H_ +#define _LINUX_UUID_H_ #include <linux/types.h> #include <linux/string.h> @@ -55,4 +55,4 @@ typedef struct { 0x00, 0x00, 0x00, 0x00) -#endif /* _UAPI_LINUX_UUID_H_ */ +#endif /* _LINUX_UUID_H_ */ diff --git a/include/uapi/linux/uvcvideo.h b/include/uapi/linux/uvcvideo.h index 3b081862b9e8..faff40e1aa69 100644 --- a/include/uapi/linux/uvcvideo.h +++ b/include/uapi/linux/uvcvideo.h @@ -49,7 +49,7 @@ struct uvc_xu_control_mapping { __u32 v4l2_type; __u32 data_type; - struct uvc_menu_info __user *menu_info; + struct uvc_menu_info *menu_info; __u32 menu_count; __u32 reserved[4]; @@ -61,7 +61,7 @@ struct uvc_xu_control_query { __u8 query; /* Video Class-Specific Request Code, */ /* defined in linux/usb/video.h A.8. */ __u16 size; - __u8 __user *data; + __u8 *data; }; #define UVCIOC_CTRL_MAP _IOWR('u', 0x20, struct uvc_xu_control_mapping) diff --git a/include/uapi/linux/v4l2-subdev.h b/include/uapi/linux/v4l2-subdev.h index a33c4daadce3..c1add0d284c3 100644 --- a/include/uapi/linux/v4l2-subdev.h +++ b/include/uapi/linux/v4l2-subdev.h @@ -153,7 +153,7 @@ struct v4l2_subdev_edid { __u32 start_block; __u32 blocks; __u32 reserved[5]; - __u8 __user *edid; + __u8 *edid; }; #define VIDIOC_SUBDEV_G_FMT _IOWR('V', 4, struct v4l2_subdev_format) diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h index 0fd47f5bc146..17c58e0ede42 100644 --- a/include/uapi/linux/vfio.h +++ b/include/uapi/linux/vfio.h @@ -8,8 +8,8 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#ifndef _UAPIVFIO_H -#define _UAPIVFIO_H +#ifndef VFIO_H +#define VFIO_H #include <linux/types.h> #include <linux/ioctl.h> @@ -451,4 +451,4 @@ struct vfio_iommu_spapr_tce_info { /* ***************************************************************** */ -#endif /* _UAPIVFIO_H */ +#endif /* VFIO_H */ diff --git a/include/uapi/linux/vhost.h b/include/uapi/linux/vhost.h index bb6a5b4cb3c5..c656f61cfc75 100644 --- a/include/uapi/linux/vhost.h +++ b/include/uapi/linux/vhost.h @@ -11,7 +11,7 @@ */ #include <linux/types.h> -#include <linux/compiler.h> + #include <linux/ioctl.h> #include <linux/virtio_config.h> #include <linux/virtio_ring.h> diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 437f1b0f8937..caf463caf0c1 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -53,13 +53,11 @@ * Hans Verkuil <hverkuil@xs4all.nl> * et al. */ -#ifndef _UAPI__LINUX_VIDEODEV2_H -#define _UAPI__LINUX_VIDEODEV2_H +#ifndef __LINUX_VIDEODEV2_H +#define __LINUX_VIDEODEV2_H -#ifndef __KERNEL__ #include <sys/time.h> -#endif -#include <linux/compiler.h> + #include <linux/ioctl.h> #include <linux/types.h> #include <linux/v4l2-common.h> @@ -746,16 +744,16 @@ struct v4l2_framebuffer { struct v4l2_clip { struct v4l2_rect c; - struct v4l2_clip __user *next; + struct v4l2_clip *next; }; struct v4l2_window { struct v4l2_rect w; __u32 field; /* enum v4l2_field */ __u32 chromakey; - struct v4l2_clip __user *clips; + struct v4l2_clip *clips; __u32 clipcount; - void __user *bitmap; + void *bitmap; __u8 global_alpha; }; @@ -1963,4 +1961,4 @@ struct v4l2_create_buffers { #define BASE_VIDIOC_PRIVATE 192 /* 192-255 are private */ -#endif /* _UAPI__LINUX_VIDEODEV2_H */ +#endif /* __LINUX_VIDEODEV2_H */ diff --git a/include/uapi/linux/virtio_blk.h b/include/uapi/linux/virtio_blk.h index 6d8e61c48563..8270c14ab7e2 100644 --- a/include/uapi/linux/virtio_blk.h +++ b/include/uapi/linux/virtio_blk.h @@ -41,10 +41,8 @@ #define VIRTIO_BLK_F_TOPOLOGY 10 /* Topology information is available */ #define VIRTIO_BLK_F_CONFIG_WCE 11 /* Writeback mode available in config */ -#ifndef __KERNEL__ /* Old (deprecated) name for VIRTIO_BLK_F_WCE. */ #define VIRTIO_BLK_F_FLUSH VIRTIO_BLK_F_WCE -#endif #define VIRTIO_BLK_ID_BYTES 20 /* ID string length */ diff --git a/include/uapi/linux/virtio_config.h b/include/uapi/linux/virtio_config.h index 3ce768c6910d..75dc20ba6fff 100644 --- a/include/uapi/linux/virtio_config.h +++ b/include/uapi/linux/virtio_config.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_VIRTIO_CONFIG_H -#define _UAPI_LINUX_VIRTIO_CONFIG_H +#ifndef _LINUX_VIRTIO_CONFIG_H +#define _LINUX_VIRTIO_CONFIG_H /* This header, excluding the #ifdef __KERNEL__ part, is BSD licensed so * anyone can use the definitions to implement compatible drivers/servers. * @@ -54,4 +54,4 @@ /* Can the device handle any descriptor layout? */ #define VIRTIO_F_ANY_LAYOUT 27 -#endif /* _UAPI_LINUX_VIRTIO_CONFIG_H */ +#endif /* _LINUX_VIRTIO_CONFIG_H */ diff --git a/include/uapi/linux/virtio_console.h b/include/uapi/linux/virtio_console.h index ba260dd0b33a..8cb46df69b6e 100644 --- a/include/uapi/linux/virtio_console.h +++ b/include/uapi/linux/virtio_console.h @@ -29,8 +29,8 @@ * Copyright (C) Red Hat, Inc., 2009, 2010, 2011 * Copyright (C) Amit Shah <amit.shah@redhat.com>, 2009, 2010, 2011 */ -#ifndef _UAPI_LINUX_VIRTIO_CONSOLE_H -#define _UAPI_LINUX_VIRTIO_CONSOLE_H +#ifndef _LINUX_VIRTIO_CONSOLE_H +#define _LINUX_VIRTIO_CONSOLE_H #include <linux/types.h> #include <linux/virtio_ids.h> #include <linux/virtio_config.h> @@ -74,4 +74,4 @@ struct virtio_console_control { #define VIRTIO_CONSOLE_PORT_NAME 7 -#endif /* _UAPI_LINUX_VIRTIO_CONSOLE_H */ +#endif /* _LINUX_VIRTIO_CONSOLE_H */ diff --git a/include/uapi/linux/virtio_ring.h b/include/uapi/linux/virtio_ring.h index a99f9b7caa67..1b333e25363a 100644 --- a/include/uapi/linux/virtio_ring.h +++ b/include/uapi/linux/virtio_ring.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_VIRTIO_RING_H -#define _UAPI_LINUX_VIRTIO_RING_H +#ifndef _LINUX_VIRTIO_RING_H +#define _LINUX_VIRTIO_RING_H /* An interface for efficient virtio implementation, currently for use by KVM * and lguest, but hopefully others soon. Do NOT change this since it will * break existing servers and clients. @@ -129,7 +129,7 @@ struct vring { #define vring_used_event(vr) ((vr)->avail->ring[(vr)->num]) #define vring_avail_event(vr) (*(__u16 *)&(vr)->used->ring[(vr)->num]) -static inline void vring_init(struct vring *vr, unsigned int num, void *p, +static __inline__ void vring_init(struct vring *vr, unsigned int num, void *p, unsigned long align) { vr->num = num; @@ -139,7 +139,7 @@ static inline void vring_init(struct vring *vr, unsigned int num, void *p, + align-1) & ~(align - 1)); } -static inline unsigned vring_size(unsigned int num, unsigned long align) +static __inline__ unsigned vring_size(unsigned int num, unsigned long align) { return ((sizeof(struct vring_desc) * num + sizeof(__u16) * (3 + num) + align - 1) & ~(align - 1)) @@ -150,7 +150,7 @@ static inline unsigned vring_size(unsigned int num, unsigned long align) /* Assuming a given event_idx value from the other size, if * we have just incremented index from old to new_idx, * should we trigger an event? */ -static inline int vring_need_event(__u16 event_idx, __u16 new_idx, __u16 old) +static __inline__ int vring_need_event(__u16 event_idx, __u16 new_idx, __u16 old) { /* Note: Xen has similar logic for notification hold-off * in include/xen/interface/io/ring.h with req_event and req_prod @@ -160,4 +160,4 @@ static inline int vring_need_event(__u16 event_idx, __u16 new_idx, __u16 old) return (__u16)(new_idx - event_idx - 1) < (__u16)(new_idx - old); } -#endif /* _UAPI_LINUX_VIRTIO_RING_H */ +#endif /* _LINUX_VIRTIO_RING_H */ diff --git a/include/uapi/linux/vt.h b/include/uapi/linux/vt.h index 4b59a26799a3..f108f052cd3f 100644 --- a/include/uapi/linux/vt.h +++ b/include/uapi/linux/vt.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_VT_H -#define _UAPI_LINUX_VT_H +#ifndef _LINUX_VT_H +#define _LINUX_VT_H /* @@ -87,4 +87,4 @@ struct vt_setactivate { #define vt_get_kmsg_redirect() vt_kmsg_redirect(-1) -#endif /* _UAPI_LINUX_VT_H */ +#endif /* _LINUX_VT_H */ diff --git a/include/uapi/linux/wait.h b/include/uapi/linux/wait.h index 9393eead23e2..bb88233a99e2 100644 --- a/include/uapi/linux/wait.h +++ b/include/uapi/linux/wait.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_LINUX_WAIT_H -#define _UAPI_LINUX_WAIT_H +#ifndef _LINUX_WAIT_H +#define _LINUX_WAIT_H #define WNOHANG 0x00000001 #define WUNTRACED 0x00000002 @@ -18,4 +18,4 @@ #define P_PGID 2 -#endif /* _UAPI_LINUX_WAIT_H */ +#endif /* _LINUX_WAIT_H */ diff --git a/include/uapi/linux/wanrouter.h b/include/uapi/linux/wanrouter.h index 498d6c12c666..cc61950cb65b 100644 --- a/include/uapi/linux/wanrouter.h +++ b/include/uapi/linux/wanrouter.h @@ -2,8 +2,8 @@ * wanrouter.h Legacy declarations kept around until X25 is removed */ -#ifndef _UAPI_ROUTER_H -#define _UAPI_ROUTER_H +#ifndef _ROUTER_H +#define _ROUTER_H /* 'state' defines */ enum wan_states @@ -14,4 +14,4 @@ enum wan_states WAN_CONNECTED /* link/channel is operational */ }; -#endif /* _UAPI_ROUTER_H */ +#endif /* _ROUTER_H */ diff --git a/include/uapi/linux/watchdog.h b/include/uapi/linux/watchdog.h index 2babe72870ba..a89ed11c18f9 100644 --- a/include/uapi/linux/watchdog.h +++ b/include/uapi/linux/watchdog.h @@ -6,8 +6,8 @@ * */ -#ifndef _UAPI_LINUX_WATCHDOG_H -#define _UAPI_LINUX_WATCHDOG_H +#ifndef _LINUX_WATCHDOG_H +#define _LINUX_WATCHDOG_H #include <linux/ioctl.h> #include <linux/types.h> @@ -54,4 +54,4 @@ struct watchdog_info { #define WDIOS_TEMPPANIC 0x0004 /* Kernel panic on temperature trip */ -#endif /* _UAPI_LINUX_WATCHDOG_H */ +#endif /* _LINUX_WATCHDOG_H */ diff --git a/include/uapi/linux/wireless.h b/include/uapi/linux/wireless.h index c1592e3e4036..ad9839f1ed38 100644 --- a/include/uapi/linux/wireless.h +++ b/include/uapi/linux/wireless.h @@ -7,8 +7,8 @@ * Copyright (c) 1997-2007 Jean Tourrilhes, All Rights Reserved. */ -#ifndef _UAPI_LINUX_WIRELESS_H -#define _UAPI_LINUX_WIRELESS_H +#ifndef _LINUX_WIRELESS_H +#define _LINUX_WIRELESS_H /************************** DOCUMENTATION **************************/ /* @@ -684,7 +684,7 @@ struct iw_param */ struct iw_point { - void __user *pointer; /* Pointer to the data (in user space) */ + void *pointer; /* Pointer to the data (in user space) */ __u16 length; /* number of fields or size in bytes */ __u16 flags; /* Optional params */ }; @@ -1125,4 +1125,4 @@ struct iw_event #define IW_EV_QUAL_PK_LEN (IW_EV_LCP_PK_LEN + sizeof(struct iw_quality)) #define IW_EV_POINT_PK_LEN (IW_EV_LCP_PK_LEN + 4) -#endif /* _UAPI_LINUX_WIRELESS_H */ +#endif /* _LINUX_WIRELESS_H */ diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h index e4629b93bdd6..4b00c10c0085 100644 --- a/include/uapi/linux/xattr.h +++ b/include/uapi/linux/xattr.h @@ -7,8 +7,8 @@ Copyright (c) 2001-2002 Silicon Graphics, Inc. All Rights Reserved. Copyright (c) 2004 Red Hat, Inc., James Morris <jmorris@redhat.com> */ -#ifndef _UAPI_LINUX_XATTR_H -#define _UAPI_LINUX_XATTR_H +#ifndef _LINUX_XATTR_H +#define _LINUX_XATTR_H #define XATTR_CREATE 0x1 /* set value, fail if attr already exists */ #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ @@ -64,4 +64,4 @@ #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT -#endif /* _UAPI_LINUX_XATTR_H */ +#endif /* _LINUX_XATTR_H */ diff --git a/include/uapi/linux/xfrm.h b/include/uapi/linux/xfrm.h index a8cd6a4a2970..341c3c951dac 100644 --- a/include/uapi/linux/xfrm.h +++ b/include/uapi/linux/xfrm.h @@ -474,14 +474,12 @@ struct xfrm_user_mapping { __be16 new_sport; }; -#ifndef __KERNEL__ /* backwards compatibility for userspace */ #define XFRMGRP_ACQUIRE 1 #define XFRMGRP_EXPIRE 2 #define XFRMGRP_SA 4 #define XFRMGRP_POLICY 8 #define XFRMGRP_REPORT 0x20 -#endif enum xfrm_nlgroups { XFRMNLGRP_NONE, diff --git a/include/uapi/mtd/mtd-abi.h b/include/uapi/mtd/mtd-abi.h index 36eace03b2ac..576e8c95e8b9 100644 --- a/include/uapi/mtd/mtd-abi.h +++ b/include/uapi/mtd/mtd-abi.h @@ -35,7 +35,7 @@ struct erase_info_user64 { struct mtd_oob_buf { __u32 start; __u32 length; - unsigned char __user *ptr; + unsigned char *ptr; }; struct mtd_oob_buf64 { diff --git a/include/uapi/mtd/ubi-user.h b/include/uapi/mtd/ubi-user.h index 723c324590c1..f6d93e8347bc 100644 --- a/include/uapi/mtd/ubi-user.h +++ b/include/uapi/mtd/ubi-user.h @@ -310,7 +310,7 @@ struct ubi_mkvol_req { __s16 name_len; __s8 padding2[4]; char name[UBI_MAX_VOLUME_NAME + 1]; -} __packed; +} __attribute__((packed)); /** * struct ubi_rsvol_req - a data structure used in volume re-size requests. @@ -326,7 +326,7 @@ struct ubi_mkvol_req { struct ubi_rsvol_req { __s64 bytes; __s32 vol_id; -} __packed; +} __attribute__((packed)); /** * struct ubi_rnvol_req - volumes re-name request. @@ -368,7 +368,7 @@ struct ubi_rnvol_req { __s8 padding2[2]; char name[UBI_MAX_VOLUME_NAME + 1]; } ents[UBI_MAX_RNVOL]; -} __packed; +} __attribute__((packed)); /** * struct ubi_leb_change_req - a data structure used in atomic LEB change @@ -392,7 +392,7 @@ struct ubi_leb_change_req { __s32 bytes; __s8 dtype; /* obsolete, do not use! */ __s8 padding[7]; -} __packed; +} __attribute__((packed)); /** * struct ubi_map_req - a data structure used in map LEB requests. @@ -404,7 +404,7 @@ struct ubi_map_req { __s32 lnum; __s8 dtype; /* obsolete, do not use! */ __s8 padding[3]; -} __packed; +} __attribute__((packed)); /** @@ -418,6 +418,6 @@ struct ubi_set_vol_prop_req { __u8 property; __u8 padding[7]; __u64 value; -} __packed; +} __attribute__((packed)); #endif /* __UBI_USER_H__ */ diff --git a/include/uapi/rdma/rdma_netlink.h b/include/uapi/rdma/rdma_netlink.h index 8297285b6288..6a79ea87ad6e 100644 --- a/include/uapi/rdma/rdma_netlink.h +++ b/include/uapi/rdma/rdma_netlink.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_RDMA_NETLINK_H -#define _UAPI_RDMA_NETLINK_H +#ifndef _RDMA_NETLINK_H +#define _RDMA_NETLINK_H #include <linux/types.h> @@ -34,4 +34,4 @@ struct rdma_cm_id_stats { }; -#endif /* _UAPI_RDMA_NETLINK_H */ +#endif /* _RDMA_NETLINK_H */ diff --git a/include/uapi/sound/asequencer.h b/include/uapi/sound/asequencer.h index 09c8a00ea503..2be4da55dfef 100644 --- a/include/uapi/sound/asequencer.h +++ b/include/uapi/sound/asequencer.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ -#ifndef _UAPI__SOUND_ASEQUENCER_H -#define _UAPI__SOUND_ASEQUENCER_H +#ifndef __SOUND_ASEQUENCER_H +#define __SOUND_ASEQUENCER_H /** version of the sequencer */ @@ -337,9 +337,9 @@ struct snd_seq_running_info { /* client types */ typedef int __bitwise snd_seq_client_type_t; -#define NO_CLIENT ((__force snd_seq_client_type_t) 0) -#define USER_CLIENT ((__force snd_seq_client_type_t) 1) -#define KERNEL_CLIENT ((__force snd_seq_client_type_t) 2) +#define NO_CLIENT ((snd_seq_client_type_t) 0) +#define USER_CLIENT ((snd_seq_client_type_t) 1) +#define KERNEL_CLIENT ((snd_seq_client_type_t) 2) /* event filter flags */ #define SNDRV_SEQ_FILTER_BROADCAST (1<<0) /* accept broadcast messages */ @@ -611,4 +611,4 @@ struct snd_seq_query_subs { #define SNDRV_SEQ_IOCTL_QUERY_NEXT_CLIENT _IOWR('S', 0x51, struct snd_seq_client_info) #define SNDRV_SEQ_IOCTL_QUERY_NEXT_PORT _IOWR('S', 0x52, struct snd_seq_port_info) -#endif /* _UAPI__SOUND_ASEQUENCER_H */ +#endif /* __SOUND_ASEQUENCER_H */ diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h index 041203f20f6d..2ffea5010cb4 100644 --- a/include/uapi/sound/asound.h +++ b/include/uapi/sound/asound.h @@ -20,8 +20,8 @@ * */ -#ifndef _UAPI__SOUND_ASOUND_H -#define _UAPI__SOUND_ASOUND_H +#ifndef __SOUND_ASOUND_H +#define __SOUND_ASOUND_H #include <linux/types.h> @@ -120,7 +120,7 @@ struct snd_hwdep_dsp_status { struct snd_hwdep_dsp_image { unsigned int index; /* W: DSP index */ unsigned char name[64]; /* W: ID (e.g. file name) */ - unsigned char __user *image; /* W: binary image */ + unsigned char *image; /* W: binary image */ size_t length; /* W: size of image in bytes */ unsigned long driver_data; /* W: driver-specific data */ }; @@ -164,58 +164,58 @@ enum { }; typedef int __bitwise snd_pcm_access_t; -#define SNDRV_PCM_ACCESS_MMAP_INTERLEAVED ((__force snd_pcm_access_t) 0) /* interleaved mmap */ -#define SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED ((__force snd_pcm_access_t) 1) /* noninterleaved mmap */ -#define SNDRV_PCM_ACCESS_MMAP_COMPLEX ((__force snd_pcm_access_t) 2) /* complex mmap */ -#define SNDRV_PCM_ACCESS_RW_INTERLEAVED ((__force snd_pcm_access_t) 3) /* readi/writei */ -#define SNDRV_PCM_ACCESS_RW_NONINTERLEAVED ((__force snd_pcm_access_t) 4) /* readn/writen */ +#define SNDRV_PCM_ACCESS_MMAP_INTERLEAVED ((snd_pcm_access_t) 0) /* interleaved mmap */ +#define SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED ((snd_pcm_access_t) 1) /* noninterleaved mmap */ +#define SNDRV_PCM_ACCESS_MMAP_COMPLEX ((snd_pcm_access_t) 2) /* complex mmap */ +#define SNDRV_PCM_ACCESS_RW_INTERLEAVED ((snd_pcm_access_t) 3) /* readi/writei */ +#define SNDRV_PCM_ACCESS_RW_NONINTERLEAVED ((snd_pcm_access_t) 4) /* readn/writen */ #define SNDRV_PCM_ACCESS_LAST SNDRV_PCM_ACCESS_RW_NONINTERLEAVED typedef int __bitwise snd_pcm_format_t; -#define SNDRV_PCM_FORMAT_S8 ((__force snd_pcm_format_t) 0) -#define SNDRV_PCM_FORMAT_U8 ((__force snd_pcm_format_t) 1) -#define SNDRV_PCM_FORMAT_S16_LE ((__force snd_pcm_format_t) 2) -#define SNDRV_PCM_FORMAT_S16_BE ((__force snd_pcm_format_t) 3) -#define SNDRV_PCM_FORMAT_U16_LE ((__force snd_pcm_format_t) 4) -#define SNDRV_PCM_FORMAT_U16_BE ((__force snd_pcm_format_t) 5) -#define SNDRV_PCM_FORMAT_S24_LE ((__force snd_pcm_format_t) 6) /* low three bytes */ -#define SNDRV_PCM_FORMAT_S24_BE ((__force snd_pcm_format_t) 7) /* low three bytes */ -#define SNDRV_PCM_FORMAT_U24_LE ((__force snd_pcm_format_t) 8) /* low three bytes */ -#define SNDRV_PCM_FORMAT_U24_BE ((__force snd_pcm_format_t) 9) /* low three bytes */ -#define SNDRV_PCM_FORMAT_S32_LE ((__force snd_pcm_format_t) 10) -#define SNDRV_PCM_FORMAT_S32_BE ((__force snd_pcm_format_t) 11) -#define SNDRV_PCM_FORMAT_U32_LE ((__force snd_pcm_format_t) 12) -#define SNDRV_PCM_FORMAT_U32_BE ((__force snd_pcm_format_t) 13) -#define SNDRV_PCM_FORMAT_FLOAT_LE ((__force snd_pcm_format_t) 14) /* 4-byte float, IEEE-754 32-bit, range -1.0 to 1.0 */ -#define SNDRV_PCM_FORMAT_FLOAT_BE ((__force snd_pcm_format_t) 15) /* 4-byte float, IEEE-754 32-bit, range -1.0 to 1.0 */ -#define SNDRV_PCM_FORMAT_FLOAT64_LE ((__force snd_pcm_format_t) 16) /* 8-byte float, IEEE-754 64-bit, range -1.0 to 1.0 */ -#define SNDRV_PCM_FORMAT_FLOAT64_BE ((__force snd_pcm_format_t) 17) /* 8-byte float, IEEE-754 64-bit, range -1.0 to 1.0 */ -#define SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE ((__force snd_pcm_format_t) 18) /* IEC-958 subframe, Little Endian */ -#define SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE ((__force snd_pcm_format_t) 19) /* IEC-958 subframe, Big Endian */ -#define SNDRV_PCM_FORMAT_MU_LAW ((__force snd_pcm_format_t) 20) -#define SNDRV_PCM_FORMAT_A_LAW ((__force snd_pcm_format_t) 21) -#define SNDRV_PCM_FORMAT_IMA_ADPCM ((__force snd_pcm_format_t) 22) -#define SNDRV_PCM_FORMAT_MPEG ((__force snd_pcm_format_t) 23) -#define SNDRV_PCM_FORMAT_GSM ((__force snd_pcm_format_t) 24) -#define SNDRV_PCM_FORMAT_SPECIAL ((__force snd_pcm_format_t) 31) -#define SNDRV_PCM_FORMAT_S24_3LE ((__force snd_pcm_format_t) 32) /* in three bytes */ -#define SNDRV_PCM_FORMAT_S24_3BE ((__force snd_pcm_format_t) 33) /* in three bytes */ -#define SNDRV_PCM_FORMAT_U24_3LE ((__force snd_pcm_format_t) 34) /* in three bytes */ -#define SNDRV_PCM_FORMAT_U24_3BE ((__force snd_pcm_format_t) 35) /* in three bytes */ -#define SNDRV_PCM_FORMAT_S20_3LE ((__force snd_pcm_format_t) 36) /* in three bytes */ -#define SNDRV_PCM_FORMAT_S20_3BE ((__force snd_pcm_format_t) 37) /* in three bytes */ -#define SNDRV_PCM_FORMAT_U20_3LE ((__force snd_pcm_format_t) 38) /* in three bytes */ -#define SNDRV_PCM_FORMAT_U20_3BE ((__force snd_pcm_format_t) 39) /* in three bytes */ -#define SNDRV_PCM_FORMAT_S18_3LE ((__force snd_pcm_format_t) 40) /* in three bytes */ -#define SNDRV_PCM_FORMAT_S18_3BE ((__force snd_pcm_format_t) 41) /* in three bytes */ -#define SNDRV_PCM_FORMAT_U18_3LE ((__force snd_pcm_format_t) 42) /* in three bytes */ -#define SNDRV_PCM_FORMAT_U18_3BE ((__force snd_pcm_format_t) 43) /* in three bytes */ -#define SNDRV_PCM_FORMAT_G723_24 ((__force snd_pcm_format_t) 44) /* 8 samples in 3 bytes */ -#define SNDRV_PCM_FORMAT_G723_24_1B ((__force snd_pcm_format_t) 45) /* 1 sample in 1 byte */ -#define SNDRV_PCM_FORMAT_G723_40 ((__force snd_pcm_format_t) 46) /* 8 Samples in 5 bytes */ -#define SNDRV_PCM_FORMAT_G723_40_1B ((__force snd_pcm_format_t) 47) /* 1 sample in 1 byte */ -#define SNDRV_PCM_FORMAT_DSD_U8 ((__force snd_pcm_format_t) 48) /* DSD, 1-byte samples DSD (x8) */ -#define SNDRV_PCM_FORMAT_DSD_U16_LE ((__force snd_pcm_format_t) 49) /* DSD, 2-byte samples DSD (x16), little endian */ +#define SNDRV_PCM_FORMAT_S8 ((snd_pcm_format_t) 0) +#define SNDRV_PCM_FORMAT_U8 ((snd_pcm_format_t) 1) +#define SNDRV_PCM_FORMAT_S16_LE ((snd_pcm_format_t) 2) +#define SNDRV_PCM_FORMAT_S16_BE ((snd_pcm_format_t) 3) +#define SNDRV_PCM_FORMAT_U16_LE ((snd_pcm_format_t) 4) +#define SNDRV_PCM_FORMAT_U16_BE ((snd_pcm_format_t) 5) +#define SNDRV_PCM_FORMAT_S24_LE ((snd_pcm_format_t) 6) /* low three bytes */ +#define SNDRV_PCM_FORMAT_S24_BE ((snd_pcm_format_t) 7) /* low three bytes */ +#define SNDRV_PCM_FORMAT_U24_LE ((snd_pcm_format_t) 8) /* low three bytes */ +#define SNDRV_PCM_FORMAT_U24_BE ((snd_pcm_format_t) 9) /* low three bytes */ +#define SNDRV_PCM_FORMAT_S32_LE ((snd_pcm_format_t) 10) +#define SNDRV_PCM_FORMAT_S32_BE ((snd_pcm_format_t) 11) +#define SNDRV_PCM_FORMAT_U32_LE ((snd_pcm_format_t) 12) +#define SNDRV_PCM_FORMAT_U32_BE ((snd_pcm_format_t) 13) +#define SNDRV_PCM_FORMAT_FLOAT_LE ((snd_pcm_format_t) 14) /* 4-byte float, IEEE-754 32-bit, range -1.0 to 1.0 */ +#define SNDRV_PCM_FORMAT_FLOAT_BE ((snd_pcm_format_t) 15) /* 4-byte float, IEEE-754 32-bit, range -1.0 to 1.0 */ +#define SNDRV_PCM_FORMAT_FLOAT64_LE ((snd_pcm_format_t) 16) /* 8-byte float, IEEE-754 64-bit, range -1.0 to 1.0 */ +#define SNDRV_PCM_FORMAT_FLOAT64_BE ((snd_pcm_format_t) 17) /* 8-byte float, IEEE-754 64-bit, range -1.0 to 1.0 */ +#define SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE ((snd_pcm_format_t) 18) /* IEC-958 subframe, Little Endian */ +#define SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE ((snd_pcm_format_t) 19) /* IEC-958 subframe, Big Endian */ +#define SNDRV_PCM_FORMAT_MU_LAW ((snd_pcm_format_t) 20) +#define SNDRV_PCM_FORMAT_A_LAW ((snd_pcm_format_t) 21) +#define SNDRV_PCM_FORMAT_IMA_ADPCM ((snd_pcm_format_t) 22) +#define SNDRV_PCM_FORMAT_MPEG ((snd_pcm_format_t) 23) +#define SNDRV_PCM_FORMAT_GSM ((snd_pcm_format_t) 24) +#define SNDRV_PCM_FORMAT_SPECIAL ((snd_pcm_format_t) 31) +#define SNDRV_PCM_FORMAT_S24_3LE ((snd_pcm_format_t) 32) /* in three bytes */ +#define SNDRV_PCM_FORMAT_S24_3BE ((snd_pcm_format_t) 33) /* in three bytes */ +#define SNDRV_PCM_FORMAT_U24_3LE ((snd_pcm_format_t) 34) /* in three bytes */ +#define SNDRV_PCM_FORMAT_U24_3BE ((snd_pcm_format_t) 35) /* in three bytes */ +#define SNDRV_PCM_FORMAT_S20_3LE ((snd_pcm_format_t) 36) /* in three bytes */ +#define SNDRV_PCM_FORMAT_S20_3BE ((snd_pcm_format_t) 37) /* in three bytes */ +#define SNDRV_PCM_FORMAT_U20_3LE ((snd_pcm_format_t) 38) /* in three bytes */ +#define SNDRV_PCM_FORMAT_U20_3BE ((snd_pcm_format_t) 39) /* in three bytes */ +#define SNDRV_PCM_FORMAT_S18_3LE ((snd_pcm_format_t) 40) /* in three bytes */ +#define SNDRV_PCM_FORMAT_S18_3BE ((snd_pcm_format_t) 41) /* in three bytes */ +#define SNDRV_PCM_FORMAT_U18_3LE ((snd_pcm_format_t) 42) /* in three bytes */ +#define SNDRV_PCM_FORMAT_U18_3BE ((snd_pcm_format_t) 43) /* in three bytes */ +#define SNDRV_PCM_FORMAT_G723_24 ((snd_pcm_format_t) 44) /* 8 samples in 3 bytes */ +#define SNDRV_PCM_FORMAT_G723_24_1B ((snd_pcm_format_t) 45) /* 1 sample in 1 byte */ +#define SNDRV_PCM_FORMAT_G723_40 ((snd_pcm_format_t) 46) /* 8 Samples in 5 bytes */ +#define SNDRV_PCM_FORMAT_G723_40_1B ((snd_pcm_format_t) 47) /* 1 sample in 1 byte */ +#define SNDRV_PCM_FORMAT_DSD_U8 ((snd_pcm_format_t) 48) /* DSD, 1-byte samples DSD (x8) */ +#define SNDRV_PCM_FORMAT_DSD_U16_LE ((snd_pcm_format_t) 49) /* DSD, 2-byte samples DSD (x16), little endian */ #define SNDRV_PCM_FORMAT_LAST SNDRV_PCM_FORMAT_DSD_U16_LE #ifdef SNDRV_LITTLE_ENDIAN @@ -242,7 +242,7 @@ typedef int __bitwise snd_pcm_format_t; #endif typedef int __bitwise snd_pcm_subformat_t; -#define SNDRV_PCM_SUBFORMAT_STD ((__force snd_pcm_subformat_t) 0) +#define SNDRV_PCM_SUBFORMAT_STD ((snd_pcm_subformat_t) 0) #define SNDRV_PCM_SUBFORMAT_LAST SNDRV_PCM_SUBFORMAT_STD #define SNDRV_PCM_INFO_MMAP 0x00000001 /* hardware supports mmap */ @@ -264,15 +264,15 @@ typedef int __bitwise snd_pcm_subformat_t; #define SNDRV_PCM_INFO_FIFO_IN_FRAMES 0x80000000 /* internal kernel flag - FIFO size is in frames */ typedef int __bitwise snd_pcm_state_t; -#define SNDRV_PCM_STATE_OPEN ((__force snd_pcm_state_t) 0) /* stream is open */ -#define SNDRV_PCM_STATE_SETUP ((__force snd_pcm_state_t) 1) /* stream has a setup */ -#define SNDRV_PCM_STATE_PREPARED ((__force snd_pcm_state_t) 2) /* stream is ready to start */ -#define SNDRV_PCM_STATE_RUNNING ((__force snd_pcm_state_t) 3) /* stream is running */ -#define SNDRV_PCM_STATE_XRUN ((__force snd_pcm_state_t) 4) /* stream reached an xrun */ -#define SNDRV_PCM_STATE_DRAINING ((__force snd_pcm_state_t) 5) /* stream is draining */ -#define SNDRV_PCM_STATE_PAUSED ((__force snd_pcm_state_t) 6) /* stream is paused */ -#define SNDRV_PCM_STATE_SUSPENDED ((__force snd_pcm_state_t) 7) /* hardware is suspended */ -#define SNDRV_PCM_STATE_DISCONNECTED ((__force snd_pcm_state_t) 8) /* hardware is disconnected */ +#define SNDRV_PCM_STATE_OPEN ((snd_pcm_state_t) 0) /* stream is open */ +#define SNDRV_PCM_STATE_SETUP ((snd_pcm_state_t) 1) /* stream has a setup */ +#define SNDRV_PCM_STATE_PREPARED ((snd_pcm_state_t) 2) /* stream is ready to start */ +#define SNDRV_PCM_STATE_RUNNING ((snd_pcm_state_t) 3) /* stream is running */ +#define SNDRV_PCM_STATE_XRUN ((snd_pcm_state_t) 4) /* stream reached an xrun */ +#define SNDRV_PCM_STATE_DRAINING ((snd_pcm_state_t) 5) /* stream is draining */ +#define SNDRV_PCM_STATE_PAUSED ((snd_pcm_state_t) 6) /* stream is paused */ +#define SNDRV_PCM_STATE_SUSPENDED ((snd_pcm_state_t) 7) /* hardware is suspended */ +#define SNDRV_PCM_STATE_DISCONNECTED ((snd_pcm_state_t) 8) /* hardware is disconnected */ #define SNDRV_PCM_STATE_LAST SNDRV_PCM_STATE_DISCONNECTED enum { @@ -446,13 +446,13 @@ struct snd_pcm_sync_ptr { struct snd_xferi { snd_pcm_sframes_t result; - void __user *buf; + void *buf; snd_pcm_uframes_t frames; }; struct snd_xfern { snd_pcm_sframes_t result; - void __user * __user *bufs; + void * *bufs; snd_pcm_uframes_t frames; }; @@ -774,23 +774,23 @@ struct snd_ctl_card_info { }; typedef int __bitwise snd_ctl_elem_type_t; -#define SNDRV_CTL_ELEM_TYPE_NONE ((__force snd_ctl_elem_type_t) 0) /* invalid */ -#define SNDRV_CTL_ELEM_TYPE_BOOLEAN ((__force snd_ctl_elem_type_t) 1) /* boolean type */ -#define SNDRV_CTL_ELEM_TYPE_INTEGER ((__force snd_ctl_elem_type_t) 2) /* integer type */ -#define SNDRV_CTL_ELEM_TYPE_ENUMERATED ((__force snd_ctl_elem_type_t) 3) /* enumerated type */ -#define SNDRV_CTL_ELEM_TYPE_BYTES ((__force snd_ctl_elem_type_t) 4) /* byte array */ -#define SNDRV_CTL_ELEM_TYPE_IEC958 ((__force snd_ctl_elem_type_t) 5) /* IEC958 (S/PDIF) setup */ -#define SNDRV_CTL_ELEM_TYPE_INTEGER64 ((__force snd_ctl_elem_type_t) 6) /* 64-bit integer type */ +#define SNDRV_CTL_ELEM_TYPE_NONE ((snd_ctl_elem_type_t) 0) /* invalid */ +#define SNDRV_CTL_ELEM_TYPE_BOOLEAN ((snd_ctl_elem_type_t) 1) /* boolean type */ +#define SNDRV_CTL_ELEM_TYPE_INTEGER ((snd_ctl_elem_type_t) 2) /* integer type */ +#define SNDRV_CTL_ELEM_TYPE_ENUMERATED ((snd_ctl_elem_type_t) 3) /* enumerated type */ +#define SNDRV_CTL_ELEM_TYPE_BYTES ((snd_ctl_elem_type_t) 4) /* byte array */ +#define SNDRV_CTL_ELEM_TYPE_IEC958 ((snd_ctl_elem_type_t) 5) /* IEC958 (S/PDIF) setup */ +#define SNDRV_CTL_ELEM_TYPE_INTEGER64 ((snd_ctl_elem_type_t) 6) /* 64-bit integer type */ #define SNDRV_CTL_ELEM_TYPE_LAST SNDRV_CTL_ELEM_TYPE_INTEGER64 typedef int __bitwise snd_ctl_elem_iface_t; -#define SNDRV_CTL_ELEM_IFACE_CARD ((__force snd_ctl_elem_iface_t) 0) /* global control */ -#define SNDRV_CTL_ELEM_IFACE_HWDEP ((__force snd_ctl_elem_iface_t) 1) /* hardware dependent device */ -#define SNDRV_CTL_ELEM_IFACE_MIXER ((__force snd_ctl_elem_iface_t) 2) /* virtual mixer device */ -#define SNDRV_CTL_ELEM_IFACE_PCM ((__force snd_ctl_elem_iface_t) 3) /* PCM device */ -#define SNDRV_CTL_ELEM_IFACE_RAWMIDI ((__force snd_ctl_elem_iface_t) 4) /* RawMidi device */ -#define SNDRV_CTL_ELEM_IFACE_TIMER ((__force snd_ctl_elem_iface_t) 5) /* timer device */ -#define SNDRV_CTL_ELEM_IFACE_SEQUENCER ((__force snd_ctl_elem_iface_t) 6) /* sequencer client */ +#define SNDRV_CTL_ELEM_IFACE_CARD ((snd_ctl_elem_iface_t) 0) /* global control */ +#define SNDRV_CTL_ELEM_IFACE_HWDEP ((snd_ctl_elem_iface_t) 1) /* hardware dependent device */ +#define SNDRV_CTL_ELEM_IFACE_MIXER ((snd_ctl_elem_iface_t) 2) /* virtual mixer device */ +#define SNDRV_CTL_ELEM_IFACE_PCM ((snd_ctl_elem_iface_t) 3) /* PCM device */ +#define SNDRV_CTL_ELEM_IFACE_RAWMIDI ((snd_ctl_elem_iface_t) 4) /* RawMidi device */ +#define SNDRV_CTL_ELEM_IFACE_TIMER ((snd_ctl_elem_iface_t) 5) /* timer device */ +#define SNDRV_CTL_ELEM_IFACE_SEQUENCER ((snd_ctl_elem_iface_t) 6) /* sequencer client */ #define SNDRV_CTL_ELEM_IFACE_LAST SNDRV_CTL_ELEM_IFACE_SEQUENCER #define SNDRV_CTL_ELEM_ACCESS_READ (1<<0) @@ -833,7 +833,7 @@ struct snd_ctl_elem_list { unsigned int space; /* W: count of element IDs to get */ unsigned int used; /* R: count of element IDs set */ unsigned int count; /* R: count of all elements */ - struct snd_ctl_elem_id __user *pids; /* R: IDs */ + struct snd_ctl_elem_id *pids; /* R: IDs */ unsigned char reserved[50]; }; @@ -972,4 +972,4 @@ struct snd_ctl_event { #define SNDRV_CTL_NAME_IEC958_PCM_STREAM "PCM Stream" #define SNDRV_CTL_NAME_IEC958(expl,direction,what) "IEC958 " expl SNDRV_CTL_NAME_##direction SNDRV_CTL_NAME_IEC958_##what -#endif /* _UAPI__SOUND_ASOUND_H */ +#endif /* __SOUND_ASOUND_H */ diff --git a/include/uapi/sound/compress_offload.h b/include/uapi/sound/compress_offload.h index d630163b9a2e..5759810e1c1b 100644 --- a/include/uapi/sound/compress_offload.h +++ b/include/uapi/sound/compress_offload.h @@ -30,7 +30,7 @@ #include <sound/compress_params.h> -#define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 1, 1) +#define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 1, 2) /** * struct snd_compressed_buffer: compressed buffer * @fragment_size: size of buffer fragment in bytes @@ -67,8 +67,8 @@ struct snd_compr_params { struct snd_compr_tstamp { __u32 byte_offset; __u32 copied_total; - snd_pcm_uframes_t pcm_frames; - snd_pcm_uframes_t pcm_io_frames; + __u32 pcm_frames; + __u32 pcm_io_frames; __u32 sampling_rate; }; diff --git a/include/uapi/sound/emu10k1.h b/include/uapi/sound/emu10k1.h index d1bbaf78457a..88449df1db09 100644 --- a/include/uapi/sound/emu10k1.h +++ b/include/uapi/sound/emu10k1.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ -#ifndef _UAPI__SOUND_EMU10K1_H -#define _UAPI__SOUND_EMU10K1_H +#ifndef __SOUND_EMU10K1_H +#define __SOUND_EMU10K1_H #include <linux/types.h> @@ -251,13 +251,11 @@ #define EMU10K1_DBG_SINGLE_STEP_ADDR 0x000001ff /* single step address */ /* tank memory address line */ -#ifndef __KERNEL__ #define TANKMEMADDRREG_ADDR_MASK 0x000fffff /* 20 bit tank address field */ #define TANKMEMADDRREG_CLEAR 0x00800000 /* Clear tank memory */ #define TANKMEMADDRREG_ALIGN 0x00400000 /* Align read or write relative to tank access */ #define TANKMEMADDRREG_WRITE 0x00200000 /* Write to tank memory */ #define TANKMEMADDRREG_READ 0x00100000 /* Read from tank memory */ -#endif struct snd_emu10k1_fx8010_info { unsigned int internal_tram_size; /* in samples */ @@ -302,24 +300,24 @@ struct snd_emu10k1_fx8010_code { char name[128]; DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */ - __u32 __user *gpr_map; /* initializers */ + __u32 *gpr_map; /* initializers */ unsigned int gpr_add_control_count; /* count of GPR controls to add/replace */ - struct snd_emu10k1_fx8010_control_gpr __user *gpr_add_controls; /* GPR controls to add/replace */ + struct snd_emu10k1_fx8010_control_gpr *gpr_add_controls; /* GPR controls to add/replace */ unsigned int gpr_del_control_count; /* count of GPR controls to remove */ - struct snd_ctl_elem_id __user *gpr_del_controls; /* IDs of GPR controls to remove */ + struct snd_ctl_elem_id *gpr_del_controls; /* IDs of GPR controls to remove */ unsigned int gpr_list_control_count; /* count of GPR controls to list */ unsigned int gpr_list_control_total; /* total count of GPR controls */ - struct snd_emu10k1_fx8010_control_gpr __user *gpr_list_controls; /* listed GPR controls */ + struct snd_emu10k1_fx8010_control_gpr *gpr_list_controls; /* listed GPR controls */ DECLARE_BITMAP(tram_valid, 0x100); /* bitmask of valid initializers */ - __u32 __user *tram_data_map; /* data initializers */ - __u32 __user *tram_addr_map; /* map initializers */ + __u32 *tram_data_map; /* data initializers */ + __u32 *tram_addr_map; /* map initializers */ DECLARE_BITMAP(code_valid, 1024); /* bitmask of valid instructions */ - __u32 __user *code; /* one instruction - 64 bits */ + __u32 *code; /* one instruction - 64 bits */ }; struct snd_emu10k1_fx8010_tram { @@ -370,4 +368,4 @@ typedef struct snd_emu10k1_fx8010_code emu10k1_fx8010_code_t; typedef struct snd_emu10k1_fx8010_tram emu10k1_fx8010_tram_t; typedef struct snd_emu10k1_fx8010_pcm_rec emu10k1_fx8010_pcm_t; -#endif /* _UAPI__SOUND_EMU10K1_H */ +#endif /* __SOUND_EMU10K1_H */ diff --git a/include/uapi/sound/hdsp.h b/include/uapi/sound/hdsp.h index 0909a3843479..56b11a74f36b 100644 --- a/include/uapi/sound/hdsp.h +++ b/include/uapi/sound/hdsp.h @@ -73,7 +73,7 @@ struct hdsp_config_info { #define SNDRV_HDSP_IOCTL_GET_CONFIG_INFO _IOR('H', 0x41, struct hdsp_config_info) struct hdsp_firmware { - void __user *firmware_data; /* 24413 x 4 bytes */ + void *firmware_data; /* 24413 x 4 bytes */ }; #define SNDRV_HDSP_IOCTL_UPLOAD_FIRMWARE _IOW('H', 0x42, struct hdsp_firmware) diff --git a/include/uapi/sound/sb16_csp.h b/include/uapi/sound/sb16_csp.h index 3b96907e2afb..255f69c86e0e 100644 --- a/include/uapi/sound/sb16_csp.h +++ b/include/uapi/sound/sb16_csp.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ -#ifndef _UAPI__SOUND_SB16_CSP_H -#define _UAPI__SOUND_SB16_CSP_H +#ifndef __SOUND_SB16_CSP_H +#define __SOUND_SB16_CSP_H /* CSP modes */ @@ -119,4 +119,4 @@ struct snd_sb_csp_info { #define SNDRV_SB_CSP_IOCTL_RESTART _IO('H', 0x16) -#endif /* _UAPI__SOUND_SB16_CSP_H */ +#endif /* __SOUND_SB16_CSP_H */ diff --git a/include/uapi/video/edid.h b/include/uapi/video/edid.h index 8c0f032014c9..6aeb97489e38 100644 --- a/include/uapi/video/edid.h +++ b/include/uapi/video/edid.h @@ -1,9 +1,9 @@ -#ifndef _UAPI__linux_video_edid_h__ -#define _UAPI__linux_video_edid_h__ +#ifndef __linux_video_edid_h__ +#define __linux_video_edid_h__ struct edid_info { unsigned char dummy[128]; }; -#endif /* _UAPI__linux_video_edid_h__ */ +#endif /* __linux_video_edid_h__ */ diff --git a/include/uapi/video/sisfb.h b/include/uapi/video/sisfb.h index 9250b22b10f8..e9b8e2c552cb 100644 --- a/include/uapi/video/sisfb.h +++ b/include/uapi/video/sisfb.h @@ -18,8 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA */ -#ifndef _UAPI_LINUX_SISFB_H_ -#define _UAPI_LINUX_SISFB_H_ +#ifndef _LINUX_SISFB_H_ +#define _LINUX_SISFB_H_ #include <linux/types.h> #include <asm/ioctl.h> @@ -206,4 +206,4 @@ struct sis_memreq { /**********************************************/ -#endif /* _UAPI_LINUX_SISFB_H_ */ +#endif /* _LINUX_SISFB_H_ */ diff --git a/include/uapi/video/uvesafb.h b/include/uapi/video/uvesafb.h index cee063d723ad..79e281bb7942 100644 --- a/include/uapi/video/uvesafb.h +++ b/include/uapi/video/uvesafb.h @@ -1,5 +1,5 @@ -#ifndef _UAPI_UVESAFB_H -#define _UAPI_UVESAFB_H +#ifndef _UVESAFB_H +#define _UVESAFB_H #include <linux/types.h> @@ -57,4 +57,4 @@ struct vbe_ib { char misc_data[512]; } __attribute__ ((packed)); -#endif /* _UAPI_UVESAFB_H */ +#endif /* _UVESAFB_H */ diff --git a/include/uapi/xen/privcmd.h b/include/uapi/xen/privcmd.h index a85316811d79..12eab3c638b6 100644 --- a/include/uapi/xen/privcmd.h +++ b/include/uapi/xen/privcmd.h @@ -34,7 +34,7 @@ #define __LINUX_PUBLIC_PRIVCMD_H__ #include <linux/types.h> -#include <linux/compiler.h> + #include <xen/interface/xen.h> struct privcmd_hypercall { @@ -51,14 +51,14 @@ struct privcmd_mmap_entry { struct privcmd_mmap { int num; domid_t dom; /* target domain */ - struct privcmd_mmap_entry __user *entry; + struct privcmd_mmap_entry *entry; }; struct privcmd_mmapbatch { int num; /* number of pages to populate */ domid_t dom; /* target domain */ __u64 addr; /* virtual address */ - xen_pfn_t __user *arr; /* array of mfns - or'd with + xen_pfn_t *arr; /* array of mfns - or'd with PRIVCMD_MMAPBATCH_*_ERROR on err */ }; @@ -69,8 +69,8 @@ struct privcmd_mmapbatch_v2 { unsigned int num; /* number of pages to populate */ domid_t dom; /* target domain */ __u64 addr; /* virtual address */ - const xen_pfn_t __user *arr; /* array of mfns */ - int __user *err; /* array of error codes */ + const xen_pfn_t *arr; /* array of mfns */ + int *err; /* array of error codes */ }; /* |