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

Commit ec0c464c authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc: move ASM_CONST and stringify_in_c() into asm-const.h 



This patch moves ASM_CONST() and stringify_in_c() into
dedicated asm-const.h, then cleans all related inclusions.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
[mpe: asm-compat.h should include asm-const.h]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 36a7eeaf

arch/powerpc/crypto/md5-asm.S

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 */

#include <asm/ppc_asm.h>

#include <asm/asm-offsets.h>

#include <asm/asm-compat.h>



#define rHP	r3

#define rWP	r4

arch/powerpc/crypto/sha1-powerpc-asm.S

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


#include <asm/ppc_asm.h>

#include <asm/asm-offsets.h>

#include <asm/asm-compat.h>



#ifdef __BIG_ENDIAN__

#define LWZ(rt, d, ra)	\

arch/powerpc/include/asm/asm-compat.h

+1 −12
Original line number Diff line number Diff line 
#ifndef _ASM_POWERPC_ASM_COMPAT_H

#define _ASM_POWERPC_ASM_COMPAT_H



#include <asm/asm-const.h>

#include <asm/types.h>

#include <asm/ppc-opcode.h>



#ifdef __ASSEMBLY__

#  define stringify_in_c(...)	__VA_ARGS__

#  define ASM_CONST(x)		x

#else

/* This version of stringify will deal with commas... */

#  define __stringify_in_c(...)	#__VA_ARGS__

#  define stringify_in_c(...)	__stringify_in_c(__VA_ARGS__) " "

#  define __ASM_CONST(x)	x##UL

#  define ASM_CONST(x)		__ASM_CONST(x)

#endif





#ifdef __powerpc64__



/* operations for longs and pointers */

arch/powerpc/include/asm/asm-const.h

0 → 100644
+14 −0
Original line number Diff line number Diff line 
#ifndef _ASM_POWERPC_ASM_CONST_H

#define _ASM_POWERPC_ASM_CONST_H



#ifdef __ASSEMBLY__

#  define stringify_in_c(...)	__VA_ARGS__

#  define ASM_CONST(x)		x

#else

/* This version of stringify will deal with commas... */

#  define __stringify_in_c(...)	#__VA_ARGS__

#  define stringify_in_c(...)	__stringify_in_c(__VA_ARGS__) " "

#  define __ASM_CONST(x)	x##UL

#  define ASM_CONST(x)		__ASM_CONST(x)

#endif

#endif /* _ASM_POWERPC_ASM_CONST_H */

arch/powerpc/include/asm/barrier.h

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
#ifndef _ASM_POWERPC_BARRIER_H

#define _ASM_POWERPC_BARRIER_H



#include <asm/asm-const.h>



/*

 * Memory barrier.

 * The sync instruction guarantees that all memory accesses initiated