Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Thomas Huth <thuth@redhat.com>
Signed-off-by: Helge Deller <deller@gmx.de>

authored by

Thomas Huth and committed by
Helge Deller
e2b6a188 b4432656

+4 -4
+2 -2
arch/parisc/include/uapi/asm/pdc.h
··· 361 361 /* size of the pdc_result buffer for firmware.c */ 362 362 #define NUM_PDC_RESULT 32 363 363 364 - #if !defined(__ASSEMBLY__) 364 + #if !defined(__ASSEMBLER__) 365 365 366 366 /* flags for hardware_path */ 367 367 #define PF_AUTOBOOT 0x80 ··· 741 741 #define PIRANHA_CPU_ID 0x13 742 742 #define MAKO_CPU_ID 0x14 743 743 744 - #endif /* !defined(__ASSEMBLY__) */ 744 + #endif /* !defined(__ASSEMBLER__) */ 745 745 746 746 #endif /* _UAPI_PARISC_PDC_H */
+2 -2
arch/parisc/include/uapi/asm/signal.h
··· 61 61 #define _NSIG_BPW (sizeof(unsigned long) * 8) 62 62 #define _NSIG_WORDS (_NSIG / _NSIG_BPW) 63 63 64 - # ifndef __ASSEMBLY__ 64 + # ifndef __ASSEMBLER__ 65 65 66 66 # include <linux/types.h> 67 67 ··· 80 80 __kernel_size_t ss_size; 81 81 } stack_t; 82 82 83 - #endif /* !__ASSEMBLY */ 83 + #endif /* !__ASSEMBLER__ */ 84 84 #endif /* _UAPI_ASM_PARISC_SIGNAL_H */