Commit 8e65986d authored by Max Filippov's avatar Max Filippov

xtensa: drop ifdef __KERNEL__ from kernel-only headers

These headers are not exported to userspace, so they're never used
without __KERNEL__ defined. Drop these ifdef statements.
Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent fd58015c
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
#include <linux/stringify.h> #include <linux/stringify.h>
#include <linux/types.h> #include <linux/types.h>
#ifdef __KERNEL__
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/cmpxchg.h> #include <asm/cmpxchg.h>
#include <asm/barrier.h> #include <asm/barrier.h>
...@@ -200,6 +198,4 @@ ATOMIC_OPS(xor) ...@@ -200,6 +198,4 @@ ATOMIC_OPS(xor)
#define atomic_cmpxchg(v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n))) #define atomic_cmpxchg(v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n)))
#define atomic_xchg(v, new) (xchg(&((v)->counter), new)) #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
#endif /* __KERNEL__ */
#endif /* _XTENSA_ATOMIC_H */ #endif /* _XTENSA_ATOMIC_H */
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
#ifndef _XTENSA_BITOPS_H #ifndef _XTENSA_BITOPS_H
#define _XTENSA_BITOPS_H #define _XTENSA_BITOPS_H
#ifdef __KERNEL__
#ifndef _LINUX_BITOPS_H #ifndef _LINUX_BITOPS_H
#error only <linux/bitops.h> can be included directly #error only <linux/bitops.h> can be included directly
#endif #endif
...@@ -232,6 +230,4 @@ test_and_change_bit(unsigned int bit, volatile unsigned long *p) ...@@ -232,6 +230,4 @@ test_and_change_bit(unsigned int bit, volatile unsigned long *p)
#include <asm-generic/bitops/lock.h> #include <asm-generic/bitops/lock.h>
#include <asm-generic/bitops/sched.h> #include <asm-generic/bitops/sched.h>
#endif /* __KERNEL__ */
#endif /* _XTENSA_BITOPS_H */ #endif /* _XTENSA_BITOPS_H */
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
#ifndef _ASM_XTENSA_FUTEX_H #ifndef _ASM_XTENSA_FUTEX_H
#define _ASM_XTENSA_FUTEX_H #define _ASM_XTENSA_FUTEX_H
#ifdef __KERNEL__
#include <linux/futex.h> #include <linux/futex.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/errno.h> #include <linux/errno.h>
...@@ -123,5 +121,4 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, ...@@ -123,5 +121,4 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
return ret; return ret;
} }
#endif /* __KERNEL__ */
#endif /* _ASM_XTENSA_FUTEX_H */ #endif /* _ASM_XTENSA_FUTEX_H */
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#ifndef _XTENSA_IO_H #ifndef _XTENSA_IO_H
#define _XTENSA_IO_H #define _XTENSA_IO_H
#ifdef __KERNEL__
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/vectors.h> #include <asm/vectors.h>
...@@ -78,8 +77,6 @@ static inline void iounmap(volatile void __iomem *addr) ...@@ -78,8 +77,6 @@ static inline void iounmap(volatile void __iomem *addr)
#endif /* CONFIG_MMU */ #endif /* CONFIG_MMU */
#endif /* __KERNEL__ */
#include <asm-generic/io.h> #include <asm-generic/io.h>
#endif /* _XTENSA_IO_H */ #endif /* _XTENSA_IO_H */
...@@ -11,8 +11,6 @@ ...@@ -11,8 +11,6 @@
#ifndef _XTENSA_PCI_BRIDGE_H #ifndef _XTENSA_PCI_BRIDGE_H
#define _XTENSA_PCI_BRIDGE_H #define _XTENSA_PCI_BRIDGE_H
#ifdef __KERNEL__
struct device_node; struct device_node;
struct pci_controller; struct pci_controller;
...@@ -84,5 +82,4 @@ int early_write_config_byte(struct pci_controller*, int, int, int, u8); ...@@ -84,5 +82,4 @@ int early_write_config_byte(struct pci_controller*, int, int, int, u8);
int early_write_config_word(struct pci_controller*, int, int, int, u16); int early_write_config_word(struct pci_controller*, int, int, int, u16);
int early_write_config_dword(struct pci_controller*, int, int, int, u32); int early_write_config_dword(struct pci_controller*, int, int, int, u32);
#endif /* __KERNEL__ */
#endif /* _XTENSA_PCI_BRIDGE_H */ #endif /* _XTENSA_PCI_BRIDGE_H */
...@@ -11,8 +11,6 @@ ...@@ -11,8 +11,6 @@
#ifndef _XTENSA_PCI_H #ifndef _XTENSA_PCI_H
#define _XTENSA_PCI_H #define _XTENSA_PCI_H
#ifdef __KERNEL__
/* Can be used to override the logic in pci_scan_bus for skipping /* Can be used to override the logic in pci_scan_bus for skipping
* already-configured bus numbers - to be used for buggy BIOSes * already-configured bus numbers - to be used for buggy BIOSes
* or architectures with incomplete PCI setup by the loader * or architectures with incomplete PCI setup by the loader
...@@ -45,8 +43,6 @@ ...@@ -45,8 +43,6 @@
#define ARCH_GENERIC_PCI_MMAP_RESOURCE 1 #define ARCH_GENERIC_PCI_MMAP_RESOURCE 1
#define arch_can_pci_mmap_io() 1 #define arch_can_pci_mmap_io() 1
#endif /* __KERNEL__ */
/* Generic PCI */ /* Generic PCI */
#include <asm-generic/pci.h> #include <asm-generic/pci.h>
......
...@@ -11,8 +11,6 @@ ...@@ -11,8 +11,6 @@
#ifndef _XTENSA_PGALLOC_H #ifndef _XTENSA_PGALLOC_H
#define _XTENSA_PGALLOC_H #define _XTENSA_PGALLOC_H
#ifdef __KERNEL__
#include <linux/highmem.h> #include <linux/highmem.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -79,5 +77,4 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte) ...@@ -79,5 +77,4 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
} }
#define pmd_pgtable(pmd) pmd_page(pmd) #define pmd_pgtable(pmd) pmd_page(pmd)
#endif /* __KERNEL__ */
#endif /* _XTENSA_PGALLOC_H */ #endif /* _XTENSA_PGALLOC_H */
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