Commit e2b6a188 authored by Thomas Huth's avatar Thomas Huth Committed by Helge Deller
Browse files

parisc: 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 almost a completely mechanical patch (done with a simple
"sed -i" statement), except for a manual change in the file
arch/parisc/include/uapi/asm/signal.h (where a comment was missing
some underscores).

Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Helge Deller <deller@gmx.de>
Cc: linux-parisc@vger.kernel.org
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent b4432656

arch/parisc/include/uapi/asm/pdc.h

+2 −2
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ 
/* size of the pdc_result buffer for firmware.c */

#define NUM_PDC_RESULT	32



#if !defined(__ASSEMBLY__)

#if !defined(__ASSEMBLER__)



/* flags for hardware_path */

#define	PF_AUTOBOOT	0x80
@@ -741,6 +741,6 @@ struct pdc_firm_test_get_rtn_block { /* PDC_MODEL/PDC_FIRM_TEST_GET */ 
#define PIRANHA_CPU_ID		0x13

#define MAKO_CPU_ID		0x14



#endif /* !defined(__ASSEMBLY__) */

#endif /* !defined(__ASSEMBLER__) */



#endif /* _UAPI_PARISC_PDC_H */

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

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
#define _NSIG_BPW	(sizeof(unsigned long) * 8)

#define _NSIG_WORDS	(_NSIG / _NSIG_BPW)



# ifndef __ASSEMBLY__

# ifndef __ASSEMBLER__



#  include <linux/types.h>
@@ -80,5 +80,5 @@ typedef struct sigaltstack { 
	__kernel_size_t ss_size;

} stack_t;



#endif /* !__ASSEMBLY */

#endif /* !__ASSEMBLER__ */

#endif /* _UAPI_ASM_PARISC_SIGNAL_H */