diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2017-03-20 14:39:28 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2017-03-22 08:29:18 +0100 |
| commit | 0b7bb6af1d734b15dbebec942767708e8ca40ca3 (patch) | |
| tree | 3342e613fe7acfecd71286b5f92d8b94f9479301 /arch | |
| parent | s390/facilites: use stfle_fac_list array size for MAX_FACILITY_BIT (diff) | |
| download | linux-0b7bb6af1d734b15dbebec942767708e8ca40ca3.tar.xz linux-0b7bb6af1d734b15dbebec942767708e8ca40ca3.zip | |
s390/facilities: get rid of __ASSEMBLY__ in facility header file
There is no need for the __ASSEMBLY__ ifdefery anymore since the
architecture level set code that deals with facility bits was
converted to C in the meantime.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/include/asm/facility.h | 4 | ||||
| -rw-r--r-- | arch/s390/kernel/head.S | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/arch/s390/include/asm/facility.h b/arch/s390/include/asm/facility.h index aead78b5da7e..cb60d5c5755d 100644 --- a/arch/s390/include/asm/facility.h +++ b/arch/s390/include/asm/facility.h @@ -8,9 +8,6 @@ #define __ASM_FACILITY_H #include <generated/facilities.h> - -#ifndef __ASSEMBLY__ - #include <linux/string.h> #include <linux/preempt.h> #include <asm/lowcore.h> @@ -72,5 +69,4 @@ static inline void stfle(u64 *stfle_fac_list, int size) preempt_enable(); } -#endif /* __ASSEMBLY__ */ #endif /* __ASM_FACILITY_H */ diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S index 0b5ebf8a3d30..eff5b31671d4 100644 --- a/arch/s390/kernel/head.S +++ b/arch/s390/kernel/head.S @@ -25,7 +25,6 @@ #include <linux/linkage.h> #include <asm/asm-offsets.h> #include <asm/thread_info.h> -#include <asm/facility.h> #include <asm/page.h> #include <asm/ptrace.h> |