iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[POWERPC] iSeries: fix slb.c for combined build

Browse Source 
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Stephen Rothwell 2006-11-14 12:57:38 +11:00 committed by Paul Mackerras
parent 1d13581d00
commit 56291e19e3
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/powerpc/mm/slb.c
View File

@ -23,6 +23,7 @@
#include <asm/cputable.h> #include <asm/cputable.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/firmware.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#ifdef DEBUG #ifdef DEBUG
@ -193,6 +194,7 @@ static inline void patch_slb_encoding(unsigned int *insn_addr,
void slb_initialize(void) void slb_initialize(void)
{ {
unsigned long linear_llp, vmalloc_llp, io_llp; unsigned long linear_llp, vmalloc_llp, io_llp;
unsigned long lflags, vflags;
static int slb_encoding_inited; static int slb_encoding_inited;
extern unsigned int *slb_miss_kernel_load_linear; extern unsigned int *slb_miss_kernel_load_linear;
extern unsigned int *slb_miss_kernel_load_io; extern unsigned int *slb_miss_kernel_load_io;
@ -225,11 +227,12 @@ void slb_initialize(void)
#endif #endif
} }
get_paca()->stab_rr = SLB_NUM_BOLTED;
/* On iSeries the bolted entries have already been set up by /* On iSeries the bolted entries have already been set up by
* the hypervisor from the lparMap data in head.S */ * the hypervisor from the lparMap data in head.S */
#ifndef CONFIG_PPC_ISERIES if (firmware_has_feature(FW_FEATURE_ISERIES))
{ return;
unsigned long lflags, vflags;
lflags = SLB_VSID_KERNEL | linear_llp; lflags = SLB_VSID_KERNEL | linear_llp;
vflags = SLB_VSID_KERNEL | vmalloc_llp; vflags = SLB_VSID_KERNEL | vmalloc_llp;
@ -247,8 +250,4 @@ void slb_initialize(void)
* elsewhere, we'll call _switch() which will bolt in the new * elsewhere, we'll call _switch() which will bolt in the new
* one. */ * one. */
asm volatile("isync":::"memory"); asm volatile("isync":::"memory");
}
#endif /* CONFIG_PPC_ISERIES */
get_paca()->stab_rr = SLB_NUM_BOLTED;
} }