Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 233ba2c5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 001f3a48 aabb70dc

arch/parisc/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -31,7 +31,11 @@ ifdef CONFIG_64BIT 
UTS_MACHINE	:= parisc64

CHECKFLAGS	+= -D__LP64__=1 -m64

WIDTH		:= 64



# FIXME: if no default set, should really try to locate dynamically

ifeq ($(CROSS_COMPILE),)

CROSS_COMPILE	:= hppa64-linux-gnu-

endif

else # 32-bit

WIDTH		:=

endif

drivers/parisc/iommu-helpers.h

+2 −0
Original line number Diff line number Diff line 
#include <linux/prefetch.h>



/**

 * iommu_fill_pdir - Insert coalesced scatter/gather chunks into the I/O Pdir.

 * @ioc: The I/O Controller.

include/asm-generic/iomap.h

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ extern void ioport_unmap(void __iomem *); 
/* Destroy a virtual mapping cookie for a PCI BAR (memory or IO) */

struct pci_dev;

extern void pci_iounmap(struct pci_dev *dev, void __iomem *);

#else

#elif defined(CONFIG_GENERIC_IOMAP)

struct pci_dev;

static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr)

{ }

include/asm-generic/pci_iomap.h

+1 −1
Original line number Diff line number Diff line
@@ -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))

#endif



#else

#elif defined(CONFIG_GENERIC_PCI_IOMAP)

static inline void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)

{

	return NULL;