From 06910bc9726b46bc3de9aadcbfbc9d01c4b825eb Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Sun, 1 May 2005 08:58:44 -0700 Subject: [PATCH] --- yaml --- r: 651 b: refs/heads/master c: bb78cb72201985ae9269b723c82ea0f892048b9e h: refs/heads/master i: 649: 11a75699aba6f0220480cc00df7a498ed7132a07 647: f7b0328abf894d04af6e860322bdb5343f02a327 v: v3 --- [refs] | 2 +- trunk/arch/ppc64/mm/slb.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 37700ad51fdd..e9e1bf0605e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b29f9d13e3cf0fe86bf7f82a3399c9e3caf58e5 +refs/heads/master: bb78cb72201985ae9269b723c82ea0f892048b9e diff --git a/trunk/arch/ppc64/mm/slb.c b/trunk/arch/ppc64/mm/slb.c index 6a20773f695d..244150a0bc18 100644 --- a/trunk/arch/ppc64/mm/slb.c +++ b/trunk/arch/ppc64/mm/slb.c @@ -33,8 +33,8 @@ static inline unsigned long mk_vsid_data(unsigned long ea, unsigned long flags) return (get_kernel_vsid(ea) << SLB_VSID_SHIFT) | flags; } -static inline void create_slbe(unsigned long ea, unsigned long vsid, - unsigned long flags, unsigned long entry) +static inline void create_slbe(unsigned long ea, unsigned long flags, + unsigned long entry) { asm volatile("slbmte %0,%1" : : "r" (mk_vsid_data(ea, flags)), @@ -145,9 +145,8 @@ void slb_initialize(void) asm volatile("isync":::"memory"); asm volatile("slbmte %0,%0"::"r" (0) : "memory"); asm volatile("isync; slbia; isync":::"memory"); - create_slbe(KERNELBASE, get_kernel_vsid(KERNELBASE), flags, 0); - create_slbe(VMALLOCBASE, get_kernel_vsid(KERNELBASE), - SLB_VSID_KERNEL, 1); + create_slbe(KERNELBASE, flags, 0); + create_slbe(VMALLOCBASE, SLB_VSID_KERNEL, 1); /* We don't bolt the stack for the time being - we're in boot, * so the stack is in the bolted segment. By the time it goes * elsewhere, we'll call _switch() which will bolt in the new