Commit 1632b9e2 authored by David Howells's avatar David Howells

UAPI: Split trivial #if defined(__KERNEL__) && X conditionals

Split trivial #if defined(__KERNEL__) && X conditionals to make automated
disintegration easier.
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent fdc29805
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
#define HWCAP_IDIVT (1 << 18) #define HWCAP_IDIVT (1 << 18)
#define HWCAP_IDIV (HWCAP_IDIVA | HWCAP_IDIVT) #define HWCAP_IDIV (HWCAP_IDIVA | HWCAP_IDIVT)
#if defined(__KERNEL__) && !defined(__ASSEMBLY__) #if defined(__KERNEL__)
#if !defined(__ASSEMBLY__)
/* /*
* This yields a mask that user programs can use to figure out what * This yields a mask that user programs can use to figure out what
* instruction set this cpu supports. * instruction set this cpu supports.
...@@ -33,5 +34,6 @@ ...@@ -33,5 +34,6 @@
#define ELF_HWCAP (elf_hwcap) #define ELF_HWCAP (elf_hwcap)
extern unsigned int elf_hwcap; extern unsigned int elf_hwcap;
#endif #endif
#endif
#endif #endif
...@@ -22,7 +22,8 @@ ...@@ -22,7 +22,8 @@
# define __SWAB_64_THRU_32__ # define __SWAB_64_THRU_32__
#endif #endif
#if defined(__KERNEL__) && __LINUX_ARM_ARCH__ >= 6 #if defined(__KERNEL__)
#if __LINUX_ARM_ARCH__ >= 6
static inline __attribute_const__ __u16 __arch_swab16(__u16 x) static inline __attribute_const__ __u16 __arch_swab16(__u16 x)
{ {
...@@ -38,8 +39,10 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x) ...@@ -38,8 +39,10 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
} }
#define __arch_swab32 __arch_swab32 #define __arch_swab32 __arch_swab32
#else #endif
#endif
#if !defined(__KERNEL__) || __LINUX_ARM_ARCH__ < 6
static inline __attribute_const__ __u32 __arch_swab32(__u32 x) static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
{ {
__u32 t; __u32 t;
......
...@@ -427,7 +427,8 @@ ...@@ -427,7 +427,8 @@
/* /*
* The following syscalls are obsolete and no longer available for EABI. * The following syscalls are obsolete and no longer available for EABI.
*/ */
#if defined(__ARM_EABI__) && !defined(__KERNEL__) #if !defined(__KERNEL__)
#if defined(__ARM_EABI__)
#undef __NR_time #undef __NR_time
#undef __NR_umount #undef __NR_umount
#undef __NR_stime #undef __NR_stime
...@@ -441,6 +442,7 @@ ...@@ -441,6 +442,7 @@
#undef __NR_syscall #undef __NR_syscall
#undef __NR_ipc #undef __NR_ipc
#endif #endif
#endif
#ifdef __KERNEL__ #ifdef __KERNEL__
......
...@@ -201,16 +201,21 @@ extern long ia64_cmpxchg_called_with_bad_pointer (void); ...@@ -201,16 +201,21 @@ extern long ia64_cmpxchg_called_with_bad_pointer (void);
#endif #endif
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#if defined(CONFIG_PARAVIRT) && defined(__KERNEL__)
#ifdef ASM_SUPPORTED #define IA64_INTRINSIC_API(name) ia64_native_ ## name
#define IA64_INTRINSIC_MACRO(name) ia64_native_ ## name
#if defined(__KERNEL__)
#if defined(CONFIG_PARAVIRT)
# undef IA64_INTRINSIC_API
# undef IA64_INTRINSIC_MACRO
# ifdef ASM_SUPPORTED
# define IA64_INTRINSIC_API(name) paravirt_ ## name # define IA64_INTRINSIC_API(name) paravirt_ ## name
#else # else
# define IA64_INTRINSIC_API(name) pv_cpu_ops.name # define IA64_INTRINSIC_API(name) pv_cpu_ops.name
#endif # endif
#define IA64_INTRINSIC_MACRO(name) paravirt_ ## name #define IA64_INTRINSIC_MACRO(name) paravirt_ ## name
#else #endif
#define IA64_INTRINSIC_API(name) ia64_native_ ## name
#define IA64_INTRINSIC_MACRO(name) ia64_native_ ## name
#endif #endif
/************************************************/ /************************************************/
......
...@@ -15,10 +15,14 @@ ...@@ -15,10 +15,14 @@
* We don't use int-l64.h for the kernel anymore but still use it for * We don't use int-l64.h for the kernel anymore but still use it for
* userspace to avoid code changes. * userspace to avoid code changes.
*/ */
#if (_MIPS_SZLONG == 64) && !defined(__KERNEL__) #ifdef __KERNEL__
# include <asm-generic/int-l64.h> # include <asm-generic/int-ll64.h>
#else #else
# if _MIPS_SZLONG == 64
# include <asm-generic/int-l64.h>
# else
# include <asm-generic/int-ll64.h> # include <asm-generic/int-ll64.h>
# endif
#endif #endif
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
......
...@@ -11,9 +11,11 @@ ...@@ -11,9 +11,11 @@
#include <asm-generic/mman.h> #include <asm-generic/mman.h>
#if defined(__KERNEL__) && !defined(__ASSEMBLY__) && defined(CONFIG_64BIT) #if defined(__KERNEL__)
#if !defined(__ASSEMBLY__) && defined(CONFIG_64BIT)
int s390_mmap_check(unsigned long addr, unsigned long len); int s390_mmap_check(unsigned long addr, unsigned long len);
#define arch_mmap_check(addr,len,flags) s390_mmap_check(addr,len) #define arch_mmap_check(addr,len,flags) s390_mmap_check(addr,len)
#endif #endif
#endif
#endif /* __S390_MMAN_H__ */ #endif /* __S390_MMAN_H__ */
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
#include <asm-generic/signal.h> #include <asm-generic/signal.h>
#if defined(__KERNEL__) && !defined(__ASSEMBLY__) #if defined(__KERNEL__)
#if !defined(__ASSEMBLY__)
struct pt_regs; struct pt_regs;
int restore_sigcontext(struct pt_regs *, struct sigcontext __user *); int restore_sigcontext(struct pt_regs *, struct sigcontext __user *);
int setup_sigcontext(struct sigcontext __user *, struct pt_regs *); int setup_sigcontext(struct sigcontext __user *, struct pt_regs *);
...@@ -33,5 +34,6 @@ void signal_fault(const char *type, struct pt_regs *, ...@@ -33,5 +34,6 @@ void signal_fault(const char *type, struct pt_regs *,
void trace_unhandled_signal(const char *type, struct pt_regs *regs, void trace_unhandled_signal(const char *type, struct pt_regs *regs,
unsigned long address, int signo); unsigned long address, int signo);
#endif #endif
#endif
#endif /* _ASM_TILE_SIGNAL_H */ #endif /* _ASM_TILE_SIGNAL_H */
...@@ -43,9 +43,11 @@ typedef unsigned short mifi_t; ...@@ -43,9 +43,11 @@ typedef unsigned short mifi_t;
typedef __u32 if_mask; typedef __u32 if_mask;
#define NIFBITS (sizeof(if_mask) * 8) /* bits per mask */ #define NIFBITS (sizeof(if_mask) * 8) /* bits per mask */
#if !defined(__KERNEL__) && !defined(DIV_ROUND_UP) #if !defined(__KERNEL__)
#if !defined(DIV_ROUND_UP)
#define DIV_ROUND_UP(x,y) (((x) + ((y) - 1)) / (y)) #define DIV_ROUND_UP(x,y) (((x) + ((y) - 1)) / (y))
#endif #endif
#endif
typedef struct if_set { typedef struct if_set {
if_mask ifs_bits[DIV_ROUND_UP(IF_SETSIZE, NIFBITS)]; if_mask ifs_bits[DIV_ROUND_UP(IF_SETSIZE, NIFBITS)];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment