Commit d6fb6511 authored by Thomas Huth's avatar Thomas Huth Committed by Andreas Larsson
Browse files

sparc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers 



__ASSEMBLY__ is only defined by the Makefile of the kernel, so
this is not really useful for uapi headers (unless the userspace
Makefile defines it, too). Let's switch to __ASSEMBLER__ which
gets set automatically by the compiler when compiling assembly
code.

This is a completely mechanical patch (done with a simple "sed -i"
statement).

Cc: David S. Miller <davem@davemloft.net>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: sparclinux@vger.kernel.org
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarAndreas Larsson <andreas@gaisler.com>
Signed-off-by: default avatarAndreas Larsson <andreas@gaisler.com>
parent dc356bf3

arch/sparc/include/uapi/asm/ptrace.h

+12 −12
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */

#define PT_REGS_MAGIC 0x57ac6c00



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#include <linux/types.h>
@@ -88,7 +88,7 @@ struct sparc_trapf { 
	unsigned long _unused;

	struct pt_regs *regs;

};

#endif /* (!__ASSEMBLY__) */

#endif /* (!__ASSEMBLER__) */

#else

/* 32 bit sparc */
@@ -97,7 +97,7 @@ struct sparc_trapf { 
/* This struct defines the way the registers are stored on the

 * stack during a system call and basically all traps.

 */

#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#include <linux/types.h>
@@ -125,11 +125,11 @@ struct sparc_stackf { 
	unsigned long xargs[6];

	unsigned long xxargs[1];

};

#endif /* (!__ASSEMBLY__) */

#endif /* (!__ASSEMBLER__) */



#endif /* (defined(__sparc__) && defined(__arch64__))*/



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#define TRACEREG_SZ	sizeof(struct pt_regs)

#define STACKFRAME_SZ	sizeof(struct sparc_stackf)
@@ -137,7 +137,7 @@ struct sparc_stackf { 
#define TRACEREG32_SZ	sizeof(struct pt_regs32)

#define STACKFRAME32_SZ	sizeof(struct sparc_stackf32)



#endif /* (!__ASSEMBLY__) */

#endif /* (!__ASSEMBLER__) */



#define UREG_G0        0

#define UREG_G1        1
@@ -161,30 +161,30 @@ struct sparc_stackf { 
#if defined(__sparc__) && defined(__arch64__)

/* 64 bit sparc */



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__





#else /* __ASSEMBLY__ */

#else /* __ASSEMBLER__ */

/* For assembly code. */

#define TRACEREG_SZ		0xa0

#define STACKFRAME_SZ		0xc0



#define TRACEREG32_SZ		0x50

#define STACKFRAME32_SZ		0x60

#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */



#else /* (defined(__sparc__) && defined(__arch64__)) */



/* 32 bit sparc */



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__





#else /* (!__ASSEMBLY__) */

#else /* (!__ASSEMBLER__) */

/* For assembly code. */

#define TRACEREG_SZ       0x50

#define STACKFRAME_SZ     0x60

#endif /* (!__ASSEMBLY__) */

#endif /* (!__ASSEMBLER__) */



#endif /* (defined(__sparc__) && defined(__arch64__)) */

arch/sparc/include/uapi/asm/signal.h

+2 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ 
#define __old_sigaction32	sigaction32

#endif



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



typedef unsigned long __old_sigset_t;            /* at least 32 bits */
@@ -176,6 +176,6 @@ typedef struct sigaltstack { 
} stack_t;





#endif /* !(__ASSEMBLY__) */

#endif /* !(__ASSEMBLER__) */



#endif /* _UAPI__SPARC_SIGNAL_H */

arch/sparc/include/uapi/asm/traps.h

+2 −2
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ 


#define NUM_SPARC_TRAPS  255



#ifndef __ASSEMBLY__

#endif /* !(__ASSEMBLY__) */

#ifndef __ASSEMBLER__

#endif /* !(__ASSEMBLER__) */



/* For patching the trap table at boot time, we need to know how to

 * form various common Sparc instructions.  Thus these macros...

arch/sparc/include/uapi/asm/utrap.h

+2 −2
Original line number Diff line number Diff line
@@ -44,9 +44,9 @@ 


#define	UTH_NOCHANGE				(-1)



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__

typedef int utrap_entry_t;

typedef void *utrap_handler_t;

#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */



#endif /* !(__ASM_SPARC64_PROCESSOR_H) */