redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

powerpc: Fix compilation for 32-bit configs 

Signed-off-by: Paul Mackerras <paulus@samba.org>
hifive-unleashed-5.1
Paul Mackerras 2005-10-10 22:58:10 +10:00
parent c5200c90db
commit e574d238ab
3 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/powerpc/kernel/setup_32.c
View File

@ -70,6 +70,8 @@ unsigned long ISA_DMA_THRESHOLD;
unsigned int DMA_MODE_READ;
unsigned int DMA_MODE_WRITE;
int have_of = 1;
#ifdef CONFIG_PPC_MULTIPLATFORM
int _machine = 0;
@ -89,6 +91,7 @@ unsigned long vgacon_remap_base;
#endif
struct machdep_calls ppc_md;
EXPORT_SYMBOL(ppc_md);
/*
* These are used in binfmt_elf.c to put aux entries on the stack
@ -455,24 +458,6 @@ console_initcall(set_preferred_console);
#endif /* CONFIG_SERIAL_CORE_CONSOLE */
#endif /* CONFIG_PPC_MULTIPLATFORM */
struct bi_record *find_bootinfo(void)
{
struct bi_record *rec;
rec = (struct bi_record *)_ALIGN((ulong)__bss_start+(1<<20)-1,(1<<20));
if ( rec->tag != BI_FIRST ) {
/*
* This 0x10000 offset is a terrible hack but it will go away when
* we have the bootloader handle all the relocation and
* prom calls -- Cort
*/
rec = (struct bi_record *)_ALIGN((ulong)__bss_start+0x10000+(1<<20)-1,(1<<20));
if ( rec->tag != BI_FIRST )
return NULL;
}
return rec;
}
/*
* Find out what kind of machine we're on and save any data we need
* from the early boot process (devtree is copied on pmac by prom_init()).

6
arch/ppc/kernel/Makefile
View File

@ -42,13 +42,11 @@ vector-y += ../../powerpc/kernel/vector.o
fpu-y += ../../powerpc/kernel/fpu.o
else
obj-y := entry.o irq.o idle.o time.o misc.o \
obj-y := irq.o idle.o time.o \
signal.o ptrace.o align.o \
syscalls.o setup.o \
cputable.o perfmon.o
syscalls.o cputable.o perfmon.o
obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o
obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o
obj-$(CONFIG_POWER4) += cpu_setup_power4.o
obj-$(CONFIG_MODULES) += module.o
obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o
obj-$(CONFIG_PCI) += pci.o

5
include/asm-ppc/pci-bridge.h
View File

@ -79,6 +79,11 @@ struct pci_controller {
struct resource mem_space;
};
static inline struct pci_controller *pci_bus_to_host(struct pci_bus *bus)
{
return bus->sysdata;
}
/* These are used for config access before all the PCI probing
has been done. */
int early_read_config_byte(struct pci_controller *hose, int bus, int dev_fn,