Skip to content

Commit e2b6a18

Browse files
huthhdeller
authored andcommitted
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" <[email protected]> Cc: Helge Deller <[email protected]> Cc: [email protected] Signed-off-by: Thomas Huth <[email protected]> Signed-off-by: Helge Deller <[email protected]>
1 parent b443265 commit e2b6a18

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@
361361
/* size of the pdc_result buffer for firmware.c */
362362
#define NUM_PDC_RESULT 32
363363

364-
#if !defined(__ASSEMBLY__)
364+
#if !defined(__ASSEMBLER__)
365365

366366
/* flags for hardware_path */
367367
#define PF_AUTOBOOT 0x80
@@ -741,6 +741,6 @@ struct pdc_firm_test_get_rtn_block { /* PDC_MODEL/PDC_FIRM_TEST_GET */
741741
#define PIRANHA_CPU_ID 0x13
742742
#define MAKO_CPU_ID 0x14
743743

744-
#endif /* !defined(__ASSEMBLY__) */
744+
#endif /* !defined(__ASSEMBLER__) */
745745

746746
#endif /* _UAPI_PARISC_PDC_H */

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
#define _NSIG_BPW (sizeof(unsigned long) * 8)
6262
#define _NSIG_WORDS (_NSIG / _NSIG_BPW)
6363

64-
# ifndef __ASSEMBLY__
64+
# ifndef __ASSEMBLER__
6565

6666
# include <linux/types.h>
6767

@@ -80,5 +80,5 @@ typedef struct sigaltstack {
8080
__kernel_size_t ss_size;
8181
} stack_t;
8282

83-
#endif /* !__ASSEMBLY */
83+
#endif /* !__ASSEMBLER__ */
8484
#endif /* _UAPI_ASM_PARISC_SIGNAL_H */

0 commit comments

Comments
 (0)