From db7d4daea91e105e3859cf461d7e53b9b77454b2 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Sun, 13 Jun 1999 16:29:25 +0000
Subject: Merge with Linux 2.2.8.

---
 arch/alpha/lib/copy_user.S | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'arch/alpha/lib/copy_user.S')

diff --git a/arch/alpha/lib/copy_user.S b/arch/alpha/lib/copy_user.S
index aa309b9f5..7cc7382ab 100644
--- a/arch/alpha/lib/copy_user.S
+++ b/arch/alpha/lib/copy_user.S
@@ -46,6 +46,8 @@
 	.globl __copy_user
 	.ent __copy_user
 __copy_user:
+	ldgp $29,0($27)			# we do exceptions -- we need the gp.
+	.prologue 1
 	and $6,7,$3
 	beq $0,$35
 	beq $3,$36
@@ -107,7 +109,7 @@ $43:
 $66:
 	EXI( ldq $1,0($7) )
 	subq $4,8,$4
-	stq $1,0($6)
+	EXO( stq $1,0($6) )
 	addq $7,8,$7
 	subq $0,8,$0
 	addq $6,8,$6
-- 
cgit v1.2.3