Commit e3f2c6c3 authored by Michael Ellerman's avatar Michael Ellerman

powerpc/asm: Allow including ppc_asm.h in asm files

There's no reason to #error if we include ppc_asm.h in asm files, the
ifdef already prevents any problems.
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent f4329f2e
...@@ -10,9 +10,7 @@ ...@@ -10,9 +10,7 @@
#include <asm/ppc-opcode.h> #include <asm/ppc-opcode.h>
#include <asm/firmware.h> #include <asm/firmware.h>
#ifndef __ASSEMBLY__ #ifdef __ASSEMBLY__
#error __FILE__ should only be used in assembler files
#else
#define SZL (BITS_PER_LONG/8) #define SZL (BITS_PER_LONG/8)
...@@ -779,5 +777,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601) ...@@ -779,5 +777,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601)
.long 0xa6037b7d; /* mtsrr1 r11 */ \ .long 0xa6037b7d; /* mtsrr1 r11 */ \
.long 0x2400004c /* rfid */ .long 0x2400004c /* rfid */
#endif /* !CONFIG_PPC_BOOK3E */ #endif /* !CONFIG_PPC_BOOK3E */
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* _ASM_POWERPC_PPC_ASM_H */ #endif /* _ASM_POWERPC_PPC_ASM_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment