[POWERPC] ppc: More compile fixes
This fixes a few more miscellaneous compile problems with ARCH=ppc. 1. Don't compile devres.c on ARCH=ppc, it doesn't have ioremap_flags. 2. Include <asm/irq.h> in setup.c for the __DO_IRQ_CANON definition. 3. Include <linux/proc_fs.h> in residual.c for the definition of create_proc_read_entry. 4. Fix xchg_ptr to be a static inline to eliminate a compiler warning. Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
6a8b23086c
commit
0d4b6b901c
4 changed files with 4 additions and 2 deletions
|
@ -10,6 +10,7 @@ ifeq ($(CONFIG_PPC_MERGE),y)
|
||||||
obj-y := string.o alloc.o \
|
obj-y := string.o alloc.o \
|
||||||
checksum_$(CONFIG_WORD_SIZE).o
|
checksum_$(CONFIG_WORD_SIZE).o
|
||||||
obj-$(CONFIG_PPC32) += div64.o copy_32.o
|
obj-$(CONFIG_PPC32) += div64.o copy_32.o
|
||||||
|
obj-$(CONFIG_HAS_IOMEM) += devres.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
obj-$(CONFIG_PPC64) += copypage_64.o copyuser_64.o \
|
obj-$(CONFIG_PPC64) += copypage_64.o copyuser_64.o \
|
||||||
|
@ -23,4 +24,3 @@ obj-$(CONFIG_SMP) += locks.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o
|
obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o
|
||||||
obj-$(CONFIG_HAS_IOMEM) += devres.o
|
|
||||||
|
|
|
@ -36,6 +36,7 @@
|
||||||
#include <asm/nvram.h>
|
#include <asm/nvram.h>
|
||||||
#include <asm/xmon.h>
|
#include <asm/xmon.h>
|
||||||
#include <asm/ocp.h>
|
#include <asm/ocp.h>
|
||||||
|
#include <asm/irq.h>
|
||||||
|
|
||||||
#define USES_PPC_SYS (defined(CONFIG_MPC10X_BRIDGE) || defined(CONFIG_8260) || \
|
#define USES_PPC_SYS (defined(CONFIG_MPC10X_BRIDGE) || defined(CONFIG_8260) || \
|
||||||
defined(CONFIG_PPC_MPC52xx))
|
defined(CONFIG_PPC_MPC52xx))
|
||||||
|
|
|
@ -38,6 +38,7 @@
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/ioport.h>
|
#include <linux/ioport.h>
|
||||||
#include <linux/pci.h>
|
#include <linux/pci.h>
|
||||||
|
#include <linux/proc_fs.h>
|
||||||
|
|
||||||
#include <asm/sections.h>
|
#include <asm/sections.h>
|
||||||
#include <asm/mmu.h>
|
#include <asm/mmu.h>
|
||||||
|
|
|
@ -178,7 +178,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
extern inline void * xchg_ptr(void * m, void * val)
|
static inline void * xchg_ptr(void * m, void * val)
|
||||||
{
|
{
|
||||||
return (void *) xchg_u32(m, (unsigned long) val);
|
return (void *) xchg_u32(m, (unsigned long) val);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue