History

Merge tag 'parisc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6

PARISC fixes from James Bottomley: "This is a set of build fixes to get the cross compiled architecture testbeds building again" * tag 'parisc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6: [PARISC] don't unconditionally override CROSS_COMPILE for 64 bit. [PARISC] include <linux/prefetch.h> in drivers/parisc/iommu-helpers.h [PARISC] fix compile break caused by iomap: make IOPORT/PCI mapping functions conditional

Linus Torvalds committed 14 years ago

Commit 233ba2c2 parents 001f3a4 aabb70d4 files · +8 −2Browse files

Unified · Split

4 files
  1. arch/parisc/Makefile +4 −0
  2. drivers/parisc/iommu-helpers.h +2 −0
  3. include/asm-generic/iomap.h +1 −1
  4. include/asm-generic/pci_iomap.h +1 −1
arch/parisc/Makefile+4−0
@@ -31,7 +31,11 @@ ifdef CONFIG_64BIT · 30 unmodified lines
31UTS_MACHINE := parisc6431UTS_MACHINE := parisc64
32CHECKFLAGS += -D__LP64__=1 -m6432CHECKFLAGS += -D__LP64__=1 -m64
33WIDTH := 6433WIDTH := 64
34
35# FIXME: if no default set, should really try to locate dynamically
36ifeq ($(CROSS_COMPILE),)
34CROSS_COMPILE := hppa64-linux-gnu-37CROSS_COMPILE := hppa64-linux-gnu-
38endif
35else # 32-bit39else # 32-bit
36WIDTH :=40WIDTH :=
37endif41endif
drivers/parisc/iommu-helpers.h+2−0
@@ -1,3 +1,5 @@
1#include <linux/prefetch.h>
2
1/**3/**
2 * iommu_fill_pdir - Insert coalesced scatter/gather chunks into the I/O Pdir.4 * iommu_fill_pdir - Insert coalesced scatter/gather chunks into the I/O Pdir.
3 * @ioc: The I/O Controller.5 * @ioc: The I/O Controller.
include/asm-generic/iomap.h+1−1
@@ -70,7 +70,7 @@ extern void ioport_unmap(void __iomem *); · 69 unmodified lines
70/* Destroy a virtual mapping cookie for a PCI BAR (memory or IO) */70/* Destroy a virtual mapping cookie for a PCI BAR (memory or IO) */
71struct pci_dev;71struct pci_dev;
72extern void pci_iounmap(struct pci_dev *dev, void __iomem *);72extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
73#else73#elif defined(CONFIG_GENERIC_IOMAP)
74struct pci_dev;74struct pci_dev;
75static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr)75static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
76{ }76{ }
include/asm-generic/pci_iomap.h+1−1
@@ -25,7 +25,7 @@ extern void __iomem *__pci_ioport_map(struct pci_dev *dev, unsigned long port, · 24 unmodified lines
25#define __pci_ioport_map(dev, port, nr) ioport_map((port), (nr))25#define __pci_ioport_map(dev, port, nr) ioport_map((port), (nr))
26#endif26#endif
27 27
28#else28#elif defined(CONFIG_GENERIC_PCI_IOMAP)
29static inline void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)29static inline void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
30{30{
31 return NULL;31 return NULL;