Skip to content

Commit ef23703

Browse files
lsgunthmpe
authored andcommitted
powerpc: io.h: move iomap.h include so that it can use readq/writeq defs
Subsequent patches in this series makes use of the readq and writeq defines in iomap.h. However, as is, they get missed on the powerpc platform seeing the include comes before the define. This patch moves the include down to fix this. Signed-off-by: Logan Gunthorpe <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Signed-off-by: Michael Ellerman <[email protected]>
1 parent ad7b4e8 commit ef23703

File tree

1 file changed

+2
-2
lines changed
  • arch/powerpc/include/asm

1 file changed

+2
-2
lines changed

arch/powerpc/include/asm/io.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ extern struct pci_dev *isa_bridge_pcidev;
3333
#include <asm/mmu.h>
3434
#include <asm/ppc_asm.h>
3535

36-
#include <asm-generic/iomap.h>
37-
3836
#ifdef CONFIG_PPC64
3937
#include <asm/paca.h>
4038
#endif
@@ -663,6 +661,8 @@ static inline void name at \
663661
#define writel_relaxed(v, addr) writel(v, addr)
664662
#define writeq_relaxed(v, addr) writeq(v, addr)
665663

664+
#include <asm-generic/iomap.h>
665+
666666
#ifdef CONFIG_PPC32
667667
#define mmiowb()
668668
#else

0 commit comments

Comments
 (0)