Skip to contentSkip to conversation

arm64: dump: Fix implicit inclusion of definition for PCI_IOBASE

PATCH New Mark Brown 3 participants 4 messages Jan 12, 2015 arm64

lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 arm64: dump: Fix implicit inclusion of definition for PCI_IOBASE

Since c9465b4ec37a68425 (arm64: add support to dump the kernel page tables) allmodconfig has failed to build on arm64 as a result of:

../arch/arm64/mm/dump.c:55:20: error: 'PCI_IOBASE' undeclared here (not in a function)

Fix this by explicitly including io.h to ensure that a definition is present.

Signed-off-by Mark Brown <[email protected]>
---
 arch/arm64/mm/dump.c | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/mm/dump.c +1 -0
index cf33f33333cc..258ce731c5cd 100644
@@ -14,6 +14,7 @@
  * of the License.
  */
 #include <linux/debugfs.h>
+#include <linux/io.h>
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/sched.h>
Signature · 1 line
2.1.4
reviewer
#1 lore raw

PATCH 1/1 arm64: dump: Fix implicit inclusion of definition for PCI_IOBASE

Hi Mark,

Quoted 4 lines · Mark Brown

Since c9465b4ec37a68425 (arm64: add support to dump the kernel page tables) allmodconfig has failed to build on arm64 as a result of:

../arch/arm64/mm/dump.c:55:20: error: 'PCI_IOBASE' undeclared here (not in a function)

When I build a v3.19-rc4 allmodconfig, I don't see this failure, but I agree that we need the explicit include for PCI_IOBASE.

Quoted 13 lines

Fix this by explicitly including io.h to ensure that a definition is present.

Signed-off-by Mark Brown <[email protected]>
---
 arch/arm64/mm/dump.c | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/mm/dump.c +0 -0
index cf33f33333cc..258ce731c5cd 100644

arch/arm64/mm/dump.c line 20

Quoted 7 lines
arch/arm64/mm/dump.c +1 -0
@@ -14,6 +14,7 @@
  * of the License.
  */
 #include <linux/debugfs.h>
+#include <linux/io.h>
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/sched.h>

Nit: please keep includes ordered (unless there's some other include issue?).

I see that for other definitions we include the asm headers rather than linux headers, and we also seem to be missing an include of asm/memory.h for MODULES_VADDR and PAGE_OFFSET.

Does the below work for you?

Thanks,
Mark.

---->8----

arch/arm64/mm/dump.c +2 -0
index cf33f33..88f9ad9 100644
@@ -19,7 +19,9 @@
 #include <linux/sched.h>
 #include <linux/seq_file.h>
 
+#include <asm/io.h>
 #include <asm/fixmap.h>
+#include <asm/memory.h>
 #include <asm/pgtable.h>
 
 #define LOWEST_ADDR    (UL(0xffffffffffffffff) << VA_BITS)
#2 lore raw

PATCH 1/1 arm64: dump: Fix implicit inclusion of definition for PCI_IOBASE

Quoted 8 lines · Mark Rutland
Quoted 4 lines · Mark Brown

Since c9465b4ec37a68425 (arm64: add support to dump the kernel page tables) allmodconfig has failed to build on arm64 as a result of:

../arch/arm64/mm/dump.c:55:20: error: 'PCI_IOBASE' undeclared here (not in a function)

When I build a v3.19-rc4 allmodconfig, I don't see this failure, but I agree that we need the explicit include for PCI_IOBASE.

It's one of the failures in -next, but it didn't get resolved by Paul's series unfortunately (I probably just did a defconfig build for that).

Will

author
#3 lore raw

PATCH 1/1 arm64: dump: Fix implicit inclusion of definition for PCI_IOBASE

In reply to Mark Rutland
Quoted 5 lines · Mark Rutland

I see that for other definitions we include the asm headers rather than linux headers, and we also seem to be missing an include of asm/memory.h for MODULES_VADDR and PAGE_OFFSET.

Does the below work for you?

Should do.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150112/955dc12d/attachment.sig>