From 04c5ae9428cbad361f0a95a52b7fe95b06a2adaa Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Fri, 10 Jun 2011 11:05:45 +0200
Subject: [PATCH] --- yaml --- r: 272032 b: refs/heads/master c:
 eedac7914dd4d6effa0b970a36efd898c9fc4873 h: refs/heads/master v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/microblaze/lib/uaccess_old.S | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d6722732aa5e..7cecb0756df0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b133f8d87a460e97b63efbf421a87741a029cd0
+refs/heads/master: eedac7914dd4d6effa0b970a36efd898c9fc4873
diff --git a/trunk/arch/microblaze/lib/uaccess_old.S b/trunk/arch/microblaze/lib/uaccess_old.S
index 5b6d69e07968..bacfedc3c7dd 100644
--- a/trunk/arch/microblaze/lib/uaccess_old.S
+++ b/trunk/arch/microblaze/lib/uaccess_old.S
@@ -136,6 +136,12 @@ __copy_tofrom_user:
 	addik	r3, r7, 0
 	rtsd	r15, 8
 	nop
+
+	.section	__ex_table,"a"
+	.word	5b, 0f;
+	.word	6b, 0f;
+	.text
+
 4:	or	r3, r0, r0
 1:	lbu	r4,r6,r3
 2:	sb	r4,r5,r3
@@ -149,4 +155,6 @@ __copy_tofrom_user:
 	.size   __copy_tofrom_user, . - __copy_tofrom_user
 
 	.section	__ex_table,"a"
-	.word	1b,0b,2b,0b,5b,0b,6b,0b
+	.word	1b, 0b;
+	.word	2b, 0b;
+	.text