diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2016-10-14 06:58:28 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-11-14 01:11:51 +0100 |
| commit | e3f2c6c39371c0e67c7fd6ebcb8b74ca27ce95d7 (patch) | |
| tree | f4de9d08254d4b50378f0eb3c719dc26a3c79c96 /arch/powerpc | |
| parent | powerpc/64s: Reduce exception alignment (diff) | |
| download | linux-e3f2c6c39371c0e67c7fd6ebcb8b74ca27ce95d7.tar.xz linux-e3f2c6c39371c0e67c7fd6ebcb8b74ca27ce95d7.zip | |
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: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/include/asm/ppc_asm.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h index c73750b0d9fa..28ab87e5b739 100644 --- a/arch/powerpc/include/asm/ppc_asm.h +++ b/arch/powerpc/include/asm/ppc_asm.h @@ -10,9 +10,7 @@ #include <asm/ppc-opcode.h> #include <asm/firmware.h> -#ifndef __ASSEMBLY__ -#error __FILE__ should only be used in assembler files -#else +#ifdef __ASSEMBLY__ #define SZL (BITS_PER_LONG/8) @@ -779,5 +777,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601) .long 0xa6037b7d; /* mtsrr1 r11 */ \ .long 0x2400004c /* rfid */ #endif /* !CONFIG_PPC_BOOK3E */ + #endif /* __ASSEMBLY__ */ + #endif /* _ASM_POWERPC_PPC_ASM_H */ |