From cdaf64e38fc966b417edf1880e3191607d0b6039 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Fri, 30 Nov 2007 16:34:26 +0900 Subject: [PATCH] --- yaml --- r: 77815 b: refs/heads/master c: 325df7f20467da07901c4f2b006d3457bba0adec h: refs/heads/master i: 77813: 131aade1977057802a48a381a3fd52c7c83c540e 77811: 273e3f22fb2bdd2c8e2d11c09747143dd5dfe580 77807: 51ec188b7c5e4e1cbbe1de968fb554c8d6246e16 v: v3 --- [refs] | 2 +- trunk/arch/sh/lib/clear_page.S | 2 ++ trunk/arch/sh/lib/copy_page.S | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f8d7435a882c..6f77ae44f827 100644 --- 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 index 36d44ef2b8a2..3539123fe517 100644 --- 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 index b879545fa28b..e002b91c8752 100644 --- 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