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

Commit a0616cde authored by David Howells's avatar David Howells
Browse files

Disintegrate asm/system.h for S390 



Disintegrate asm/system.h for S390.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: linux-s390@vger.kernel.org
parent ae3a197e

arch/s390/crypto/crypt_s390.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
#define _CRYPTO_ARCH_S390_CRYPT_S390_H

#define _CRYPTO_ARCH_S390_CRYPT_S390_H





#include <asm/errno.h>

#include <asm/errno.h>

#include <asm/facility.h>





#define CRYPT_S390_OP_MASK 0xFF00

#define CRYPT_S390_OP_MASK 0xFF00

#define CRYPT_S390_FUNC_MASK 0x00FF

#define CRYPT_S390_FUNC_MASK 0x00FF

arch/s390/include/asm/atomic.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ 




#include <linux/compiler.h>

#include <linux/compiler.h>

#include <linux/types.h>

#include <linux/types.h>

#include <asm/system.h>

#include <asm/cmpxchg.h>





#define ATOMIC_INIT(i)  { (i) }

#define ATOMIC_INIT(i)  { (i) }

arch/s390/include/asm/barrier.h

0 → 100644
+35 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright IBM Corp. 1999, 2009

 *

 * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>

 */



#ifndef __ASM_BARRIER_H

#define __ASM_BARRIER_H



/*

 * Force strict CPU ordering.

 * And yes, this is required on UP too when we're talking

 * to devices.

 *

 * This is very similar to the ppc eieio/sync instruction in that is

 * does a checkpoint syncronisation & makes sure that 

 * all memory ops have completed wrt other CPU's ( see 7-15 POP  DJB ).

 */



#define eieio()	asm volatile("bcr 15,0" : : : "memory")

#define SYNC_OTHER_CORES(x)   eieio()

#define mb()    eieio()

#define rmb()   eieio()

#define wmb()   eieio()

#define read_barrier_depends() do { } while(0)

#define smp_mb()       mb()

#define smp_rmb()      rmb()

#define smp_wmb()      wmb()

#define smp_read_barrier_depends()    read_barrier_depends()

#define smp_mb__before_clear_bit()     smp_mb()

#define smp_mb__after_clear_bit()      smp_mb()



#define set_mb(var, value)      do { var = value; mb(); } while (0)



#endif /* __ASM_BARRIER_H */

arch/s390/include/asm/ctl_reg.h

0 → 100644
+76 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright IBM Corp. 1999, 2009

 *

 * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>

 */



#ifndef __ASM_CTL_REG_H

#define __ASM_CTL_REG_H



#ifdef __s390x__



#define __ctl_load(array, low, high) ({				\

	typedef struct { char _[sizeof(array)]; } addrtype;	\

	asm volatile(						\

		"	lctlg	%1,%2,%0\n"			\

		: : "Q" (*(addrtype *)(&array)),		\

		    "i" (low), "i" (high));			\

	})



#define __ctl_store(array, low, high) ({			\

	typedef struct { char _[sizeof(array)]; } addrtype;	\

	asm volatile(						\

		"	stctg	%1,%2,%0\n"			\

		: "=Q" (*(addrtype *)(&array))			\

		: "i" (low), "i" (high));			\

	})



#else /* __s390x__ */



#define __ctl_load(array, low, high) ({				\

	typedef struct { char _[sizeof(array)]; } addrtype;	\

	asm volatile(						\

		"	lctl	%1,%2,%0\n"			\

		: : "Q" (*(addrtype *)(&array)),		\

		    "i" (low), "i" (high));			\

})



#define __ctl_store(array, low, high) ({			\

	typedef struct { char _[sizeof(array)]; } addrtype;	\

	asm volatile(						\

		"	stctl	%1,%2,%0\n"			\

		: "=Q" (*(addrtype *)(&array))			\

		: "i" (low), "i" (high));			\

	})



#endif /* __s390x__ */



#define __ctl_set_bit(cr, bit) ({	\

	unsigned long __dummy;		\

	__ctl_store(__dummy, cr, cr);	\

	__dummy |= 1UL << (bit);	\

	__ctl_load(__dummy, cr, cr);	\

})



#define __ctl_clear_bit(cr, bit) ({	\

	unsigned long __dummy;		\

	__ctl_store(__dummy, cr, cr);	\

	__dummy &= ~(1UL << (bit));	\

	__ctl_load(__dummy, cr, cr);	\

})



#ifdef CONFIG_SMP



extern void smp_ctl_set_bit(int cr, int bit);

extern void smp_ctl_clear_bit(int cr, int bit);

#define ctl_set_bit(cr, bit) smp_ctl_set_bit(cr, bit)

#define ctl_clear_bit(cr, bit) smp_ctl_clear_bit(cr, bit)



#else



#define ctl_set_bit(cr, bit) __ctl_set_bit(cr, bit)

#define ctl_clear_bit(cr, bit) __ctl_clear_bit(cr, bit)



#endif /* CONFIG_SMP */



#endif /* __ASM_CTL_REG_H */

arch/s390/include/asm/elf.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -129,7 +129,6 @@ typedef s390_fp_regs compat_elf_fpregset_t; 
typedef s390_compat_regs compat_elf_gregset_t;

typedef s390_compat_regs compat_elf_gregset_t;





#include <linux/sched.h>	/* for task_struct */

#include <linux/sched.h>	/* for task_struct */

#include <asm/system.h>		/* for save_access_regs */

#include <asm/mmu_context.h>

#include <asm/mmu_context.h>





#include <asm/vdso.h>

#include <asm/vdso.h>