forked from luck/tmp_suning_uos_patched
powerpc: Fix compile errors found by new ppc64e_defconfig
Fix the following 3 issues:
arch/powerpc/kernel/process.c: In function 'arch_randomize_brk':
arch/powerpc/kernel/process.c:1183: error: 'mmu_highuser_ssize' undeclared (first use in this function)
arch/powerpc/kernel/process.c:1183: error: (Each undeclared identifier is reported only once
arch/powerpc/kernel/process.c:1183: error: for each function it appears in.)
arch/powerpc/kernel/process.c:1183: error: 'MMU_SEGSIZE_1T' undeclared (first use in this function)
In file included from arch/powerpc/kernel/setup_64.c:60:
arch/powerpc/include/asm/mmu-hash64.h:132: error: redefinition of 'struct mmu_psize_def'
arch/powerpc/include/asm/mmu-hash64.h:159: error: expected identifier or '(' before numeric constant
arch/powerpc/include/asm/mmu-hash64.h:396: error: conflicting types for 'mm_context_t'
arch/powerpc/include/asm/mmu-book3e.h:184: error: previous declaration of 'mm_context_t' was here
cc1: warnings being treated as errors
arch/powerpc/kernel/pci_64.c: In function 'pcibios_unmap_io_space':
arch/powerpc/kernel/pci_64.c💯 error: unused variable 'res'
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
parent
fafbe983d9
commit
ce7a35c73a
|
@ -97,7 +97,9 @@ int pcibios_unmap_io_space(struct pci_bus *bus)
|
|||
* to do an appropriate TLB flush here too
|
||||
*/
|
||||
if (bus->self) {
|
||||
#ifdef CONFIG_PPC_STD_MMU_64
|
||||
struct resource *res = bus->resource[0];
|
||||
#endif
|
||||
|
||||
pr_debug("IO unmapping for PCI-PCI bridge %s\n",
|
||||
pci_name(bus->self));
|
||||
|
|
|
@ -1172,7 +1172,7 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
|
|||
unsigned long base = mm->brk;
|
||||
unsigned long ret;
|
||||
|
||||
#ifdef CONFIG_PPC64
|
||||
#ifdef CONFIG_PPC_STD_MMU_64
|
||||
/*
|
||||
* If we are using 1TB segments and we are allowed to randomise
|
||||
* the heap, we can put it above 1TB so it is backed by a 1TB
|
||||
|
|
|
@ -57,7 +57,6 @@
|
|||
#include <asm/cache.h>
|
||||
#include <asm/page.h>
|
||||
#include <asm/mmu.h>
|
||||
#include <asm/mmu-hash64.h>
|
||||
#include <asm/firmware.h>
|
||||
#include <asm/xmon.h>
|
||||
#include <asm/udbg.h>
|
||||
|
|
Loading…
Reference in New Issue
Block a user