PARISC fixes on 20120303
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJPUqnkAAoJEDeqqVYsXL0MyTwH/14R9sIt+IdQgMGje6Dys6U1 3wxmNHcxNBB461212i+XVToH72GiPtUyWY8Q3LT+Qcq4Rab9oq8wDffxdgflDLja sZq9COLR8dmXJM0hduyuysCiNIlmuURV20uIMsDbYutBVtAKKqMd7ZrJBmkVh7xT slBJf+0lcD5IBYPYwf8lbxAI7E/C5TarMCIZk4z21I8ovF321RlGcyyo6NM62q/P wvLw4bJuW7nJa3q3B7BznzBcoHLmzo9tiY+CbtQlGhSdasDKJ8HuAegTVyofl6s8 0/RTvaUcqTWUlFxXzLVDT+MCWAUP4GFR66tR2T5tygRi9st70TcpMzISiyZzKi8= =WzAJ -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
233ba2c5ff
|
@ -31,7 +31,11 @@ ifdef CONFIG_64BIT
|
||||||
UTS_MACHINE := parisc64
|
UTS_MACHINE := parisc64
|
||||||
CHECKFLAGS += -D__LP64__=1 -m64
|
CHECKFLAGS += -D__LP64__=1 -m64
|
||||||
WIDTH := 64
|
WIDTH := 64
|
||||||
|
|
||||||
|
# FIXME: if no default set, should really try to locate dynamically
|
||||||
|
ifeq ($(CROSS_COMPILE),)
|
||||||
CROSS_COMPILE := hppa64-linux-gnu-
|
CROSS_COMPILE := hppa64-linux-gnu-
|
||||||
|
endif
|
||||||
else # 32-bit
|
else # 32-bit
|
||||||
WIDTH :=
|
WIDTH :=
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
#include <linux/prefetch.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* iommu_fill_pdir - Insert coalesced scatter/gather chunks into the I/O Pdir.
|
* iommu_fill_pdir - Insert coalesced scatter/gather chunks into the I/O Pdir.
|
||||||
* @ioc: The I/O Controller.
|
* @ioc: The I/O Controller.
|
||||||
|
|
|
@ -70,7 +70,7 @@ extern void ioport_unmap(void __iomem *);
|
||||||
/* Destroy a virtual mapping cookie for a PCI BAR (memory or IO) */
|
/* Destroy a virtual mapping cookie for a PCI BAR (memory or IO) */
|
||||||
struct pci_dev;
|
struct pci_dev;
|
||||||
extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
|
extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
|
||||||
#else
|
#elif defined(CONFIG_GENERIC_IOMAP)
|
||||||
struct pci_dev;
|
struct pci_dev;
|
||||||
static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
|
static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
|
||||||
{ }
|
{ }
|
||||||
|
|
|
@ -25,7 +25,7 @@ extern void __iomem *__pci_ioport_map(struct pci_dev *dev, unsigned long port,
|
||||||
#define __pci_ioport_map(dev, port, nr) ioport_map((port), (nr))
|
#define __pci_ioport_map(dev, port, nr) ioport_map((port), (nr))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#else
|
#elif defined(CONFIG_GENERIC_PCI_IOMAP)
|
||||||
static inline void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
|
static inline void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
|
||||||
{
|
{
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
Loading…
Reference in New Issue