1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/lib/copy_page.S b/arch/sparc/lib/copy_page.S
index 4d2df328e514..dd16c61f3263 100644
--- a/arch/sparc/lib/copy_page.S
+++ b/arch/sparc/lib/copy_page.S
@@ -46,10 +46,10 @@
        .type           copy_user_page,#function
 copy_user_page:         /* %o0=dest, %o1=src, %o2=vaddr */
        lduw            [%g6 + TI_PRE_COUNT], %o4
-        sethi           %uhi(PAGE_OFFSET), %g2
+        sethi           %hi(PAGE_OFFSET), %g2
        sethi           %hi(PAGE_SIZE), %o3
-        sllx            %g2, 32, %g2
+        ldx             [%g2 + %lo(PAGE_OFFSET)], %g2
        sethi           %hi(PAGE_KERNEL_LOCKED), %g3
        ldx             [%g3 + %lo(PAGE_KERNEL_LOCKED)], %g3

diff --git a/arch/sparc/lib/copy_page.S b/arch/sparc/lib/copy_page.S index 4d2df328e514..dd16c61f3263 100644 --- a/arch/sparc/lib/copy_page.S +++ b/arch/sparc/lib/copy_page.S
@@ -46,10 +46,10 @@
46	.type copy_user_page,#function	46	.type copy_user_page,#function
47	copy_user_page: /* %o0=dest, %o1=src, %o2=vaddr */	47	copy_user_page: /* %o0=dest, %o1=src, %o2=vaddr */
48	lduw [%g6 + TI_PRE_COUNT], %o4	48	lduw [%g6 + TI_PRE_COUNT], %o4
49	sethi %uhi(PAGE_OFFSET), %g2	49	sethi %hi(PAGE_OFFSET), %g2
50	sethi %hi(PAGE_SIZE), %o3	50	sethi %hi(PAGE_SIZE), %o3
51		51
52	sllx %g2, 32, %g2	52	ldx [%g2 + %lo(PAGE_OFFSET)], %g2
53	sethi %hi(PAGE_KERNEL_LOCKED), %g3	53	sethi %hi(PAGE_KERNEL_LOCKED), %g3
54		54
55	ldx [%g3 + %lo(PAGE_KERNEL_LOCKED)], %g3	55	ldx [%g3 + %lo(PAGE_KERNEL_LOCKED)], %g3