Skip to content

Commit

Permalink
powerpc/asm: Allow including ppc_asm.h in asm files
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michael Ellerman committed Nov 14, 2016
1 parent f4329f2 commit e3f2c6c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/powerpc/include/asm/ppc_asm.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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 */

0 comments on commit e3f2c6c

Please sign in to comment.