---

yaml --- r: 77815 b: refs/heads/master c: 325df7f h: refs/heads/master i: 77813: 131aade 77811: 273e3f2 77807: 51ec188 v: v3
git-mirror · Jan 28, 2008 · cdaf64e · cdaf64e
1 parent 24c30b4
commit cdaf64e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1efe4ce3ca126da77e450d5a83f7201949d76f62
+refs/heads/master: 325df7f20467da07901c4f2b006d3457bba0adec
diff --git a/trunk/arch/sh/lib/clear_page.S b/trunk/arch/sh/lib/clear_page.S
@@ -50,6 +50,8 @@ ENTRY(clear_page)
 	!
 	rts
 	 nop
+
+	.balign 4
 .Llimit:	.long	(PAGE_SIZE-28)
 
 ENTRY(__clear_user)

diff --git a/trunk/arch/sh/lib/copy_page.S b/trunk/arch/sh/lib/copy_page.S
@@ -68,8 +68,9 @@ ENTRY(copy_page)
 	rts
 	 nop
 
-	.align 2
+	.balign 4
 .Lpsz:	.long	PAGE_SIZE
+
 /*
  * __kernel_size_t __copy_user(void *to, const void *from, __kernel_size_t n);
  * Return the number of bytes NOT copied
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,6 +50,8 @@ ENTRY(clear_page) @@
     	!
     	rts
     	 nop
+    	.balign 4
     .Llimit:	.long	(PAGE_SIZE-28)
     ENTRY(__clear_user)
@@ Expand Down @@