lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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:
Linus Torvalds
2012-03-03 16:33:51 -08:00
parent 001f3a4887 aabb70dc23
commit 233ba2c5ff
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/parisc/Makefile
View File

@@ -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

2
drivers/parisc/iommu-helpers.h
View File

@@ -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.

2
include/asm-generic/iomap.h
View File

@@ -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)
{ } { }

2
include/asm-generic/pci_iomap.h
View File

@@ -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;