Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b7bb6af authored Mar 20, 2017 by Heiko Carstens Committed by Martin Schwidefsky Mar 22, 2017

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>

parent 6f5165e8

arch/s390/include/asm/facility.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -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 */

arch/s390/kernel/head.S

+0 −1

Original line number	Diff line number	Diff line
		@@ -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>