Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc: Fix compilation for 32-bit configs

Signed-off-by: Paul Mackerras <paulus@samba.org>

+10 -22
+3 -18
arch/powerpc/kernel/setup_32.c
··· 70 70 unsigned int DMA_MODE_READ; 71 71 unsigned int DMA_MODE_WRITE; 72 72 73 + int have_of = 1; 74 + 73 75 #ifdef CONFIG_PPC_MULTIPLATFORM 74 76 int _machine = 0; 75 77 ··· 91 89 #endif 92 90 93 91 struct machdep_calls ppc_md; 92 + EXPORT_SYMBOL(ppc_md); 94 93 95 94 /* 96 95 * These are used in binfmt_elf.c to put aux entries on the stack ··· 457 454 console_initcall(set_preferred_console); 458 455 #endif /* CONFIG_SERIAL_CORE_CONSOLE */ 459 456 #endif /* CONFIG_PPC_MULTIPLATFORM */ 460 - 461 - struct bi_record *find_bootinfo(void) 462 - { 463 - struct bi_record *rec; 464 - 465 - rec = (struct bi_record *)_ALIGN((ulong)__bss_start+(1<<20)-1,(1<<20)); 466 - if ( rec->tag != BI_FIRST ) { 467 - /* 468 - * This 0x10000 offset is a terrible hack but it will go away when 469 - * we have the bootloader handle all the relocation and 470 - * prom calls -- Cort 471 - */ 472 - rec = (struct bi_record *)_ALIGN((ulong)__bss_start+0x10000+(1<<20)-1,(1<<20)); 473 - if ( rec->tag != BI_FIRST ) 474 - return NULL; 475 - } 476 - return rec; 477 - } 478 457 479 458 /* 480 459 * Find out what kind of machine we're on and save any data we need
+2 -4
arch/ppc/kernel/Makefile
··· 42 42 fpu-y += ../../powerpc/kernel/fpu.o 43 43 44 44 else 45 - obj-y := entry.o irq.o idle.o time.o misc.o \ 45 + obj-y := irq.o idle.o time.o \ 46 46 signal.o ptrace.o align.o \ 47 - syscalls.o setup.o \ 48 - cputable.o perfmon.o 47 + syscalls.o cputable.o perfmon.o 49 48 obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o 50 49 obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o 51 - obj-$(CONFIG_POWER4) += cpu_setup_power4.o 52 50 obj-$(CONFIG_MODULES) += module.o 53 51 obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o 54 52 obj-$(CONFIG_PCI) += pci.o
+5
include/asm-ppc/pci-bridge.h
··· 79 79 struct resource mem_space; 80 80 }; 81 81 82 + static inline struct pci_controller *pci_bus_to_host(struct pci_bus *bus) 83 + { 84 + return bus->sysdata; 85 + } 86 + 82 87 /* These are used for config access before all the PCI probing 83 88 has been done. */ 84 89 int early_read_config_byte(struct pci_controller *hose, int bus, int dev_fn,