mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-17 01:34:00 +08:00
s390/headers: remove #ifdef __KERNEL__ from not exported headers
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Heiko Carstens
Martin Schwidefsky
parent
02456169e0
commit
da477737c5
@ -13,8 +13,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#ifndef _LINUX_BITOPS_H
|
||||
#error only <linux/bitops.h> can be included directly
|
||||
#endif
|
||||
@ -834,7 +832,4 @@ static inline int find_next_bit_le(void *vaddr, unsigned long size,
|
||||
|
||||
#include <asm-generic/bitops/ext2-atomic-setbit.h>
|
||||
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#endif /* _S390_BITOPS_H */
|
||||
|
||||
@ -10,8 +10,6 @@
|
||||
#include <linux/spinlock.h>
|
||||
#include <asm/types.h>
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#define LPM_ANYPATH 0xff
|
||||
#define __MAX_CSSID 0
|
||||
|
||||
@ -291,5 +289,3 @@ int chsc_sstpc(void *page, unsigned int op, u16 ctrl);
|
||||
int chsc_sstpi(void *page, void *result, size_t size);
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@ -11,13 +11,10 @@
|
||||
#ifndef _S390_CURRENT_H
|
||||
#define _S390_CURRENT_H
|
||||
|
||||
#ifdef __KERNEL__
|
||||
#include <asm/lowcore.h>
|
||||
|
||||
struct task_struct;
|
||||
|
||||
#define current ((struct task_struct *const)S390_lowcore.current_task)
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* !(_S390_CURRENT_H) */
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
#ifndef _ASM_S390_FUTEX_H
|
||||
#define _ASM_S390_FUTEX_H
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#include <linux/futex.h>
|
||||
#include <linux/uaccess.h>
|
||||
#include <asm/errno.h>
|
||||
@ -48,5 +46,4 @@ static inline int futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
|
||||
return uaccess.futex_atomic_cmpxchg(uval, uaddr, oldval, newval);
|
||||
}
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
#endif /* _ASM_S390_FUTEX_H */
|
||||
|
||||
@ -11,8 +11,6 @@
|
||||
#ifndef _S390_IO_H
|
||||
#define _S390_IO_H
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#include <asm/page.h>
|
||||
|
||||
#define IO_SPACE_LIMIT 0xffffffff
|
||||
@ -46,6 +44,4 @@ void unxlate_dev_mem_ptr(unsigned long phys, void *addr);
|
||||
*/
|
||||
#define xlate_dev_kmem_ptr(p) p
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#endif
|
||||
|
||||
@ -10,10 +10,8 @@
|
||||
#ifndef _S390_KEXEC_H
|
||||
#define _S390_KEXEC_H
|
||||
|
||||
#ifdef __KERNEL__
|
||||
#include <asm/page.h>
|
||||
#endif
|
||||
#include <asm/processor.h>
|
||||
#include <asm/page.h>
|
||||
/*
|
||||
* KEXEC_SOURCE_MEMORY_LIMIT maximum page get_free_page can return.
|
||||
* I.e. Maximum page that is mapped directly into kernel memory,
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
#ifdef __KERNEL__
|
||||
#ifndef _ASM_KMAP_TYPES_H
|
||||
#define _ASM_KMAP_TYPES_H
|
||||
|
||||
#include <asm-generic/kmap_types.h>
|
||||
|
||||
#endif
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
@ -20,7 +20,6 @@
|
||||
#include <asm/ptrace.h>
|
||||
#include <asm/setup.h>
|
||||
|
||||
#ifdef __KERNEL__
|
||||
/*
|
||||
* Default implementation of macro that returns current
|
||||
* instruction pointer ("program counter").
|
||||
@ -54,8 +53,6 @@ extern int sysctl_ieee_emulation_warnings;
|
||||
|
||||
#endif /* __s390x__ */
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#ifndef __s390x__
|
||||
#define STACK_TOP (1UL << 31)
|
||||
#define STACK_TOP_MAX (1UL << 31)
|
||||
@ -64,9 +61,6 @@ extern int sysctl_ieee_emulation_warnings;
|
||||
#define STACK_TOP_MAX (1UL << 42)
|
||||
#endif /* __s390x__ */
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
#define HAVE_ARCH_PICK_MMAP_LAYOUT
|
||||
|
||||
typedef struct {
|
||||
@ -341,8 +335,6 @@ extern void (*s390_base_ext_handler_fn)(void);
|
||||
|
||||
#define ARCH_LOW_ADDRESS_LIMIT 0x7fffffffUL
|
||||
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Helper macro for exception table entries
|
||||
*/
|
||||
|
||||
@ -41,8 +41,6 @@
|
||||
#error "please don't include asm/rwsem.h directly, use linux/rwsem.h instead"
|
||||
#endif
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#ifndef __s390x__
|
||||
#define RWSEM_UNLOCKED_VALUE 0x00000000
|
||||
#define RWSEM_ACTIVE_BIAS 0x00000001
|
||||
@ -319,5 +317,4 @@ static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
|
||||
return new;
|
||||
}
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
#endif /* _S390_RWSEM_H */
|
||||
|
||||
@ -9,8 +9,6 @@
|
||||
#ifndef _S390_STRING_H_
|
||||
#define _S390_STRING_H_
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#ifndef _LINUX_TYPES_H
|
||||
#include <linux/types.h>
|
||||
#endif
|
||||
@ -152,6 +150,4 @@ size_t strlen(const char *s);
|
||||
size_t strnlen(const char * s, size_t n);
|
||||
#endif /* !IN_ARCH_STRING_C */
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#endif /* __S390_STRING_H_ */
|
||||
|
||||
@ -9,8 +9,6 @@
|
||||
#ifndef _ASM_THREAD_INFO_H
|
||||
#define _ASM_THREAD_INFO_H
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
/*
|
||||
* Size of kernel stack for each process
|
||||
*/
|
||||
@ -123,8 +121,6 @@ static inline struct thread_info *current_thread_info(void)
|
||||
#define is_32bit_task() (1)
|
||||
#endif
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#define PREEMPT_ACTIVE 0x4000000
|
||||
|
||||
#endif /* _ASM_THREAD_INFO_H */
|
||||
|
||||
@ -10,8 +10,6 @@
|
||||
#ifndef _ASM_S390_TIMER_H
|
||||
#define _ASM_S390_TIMER_H
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#include <linux/timer.h>
|
||||
|
||||
#define VTIMER_MAX_SLICE (0x7ffffffffffff000LL)
|
||||
@ -50,6 +48,4 @@ extern void vtime_init(void);
|
||||
extern void vtime_stop_cpu(void);
|
||||
extern void vtime_start_leave(void);
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#endif /* _ASM_S390_TIMER_H */
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
#ifndef __S390_VDSO_H__
|
||||
#define __S390_VDSO_H__
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
/* Default link addresses for the vDSOs */
|
||||
#define VDSO32_LBASE 0
|
||||
#define VDSO64_LBASE 0
|
||||
@ -45,7 +43,4 @@ void vdso_free_per_cpu(struct _lowcore *lowcore);
|
||||
#endif
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#endif /* __S390_VDSO_H__ */
|
||||
|
||||
@ -10,8 +10,6 @@
|
||||
#ifndef DASD_INT_H
|
||||
#define DASD_INT_H
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
/* we keep old device allocation scheme; IOW, minors are still in 0..255 */
|
||||
#define DASD_PER_MAJOR (1U << (MINORBITS - DASD_PARTN_BITS))
|
||||
#define DASD_PARTN_MASK ((1 << DASD_PARTN_BITS) - 1)
|
||||
@ -791,6 +789,4 @@ static inline int dasd_eer_enabled(struct dasd_device *device)
|
||||
#define dasd_eer_enabled(d) (0)
|
||||
#endif /* CONFIG_DASD_ERR */
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#endif /* DASD_H */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user