From: Michal Simek <monstr@monstr.eu>
To: viro@ZenIV.linux.org.uk
Cc: linux-arch@vger.kernel.org, Michal Simek <monstr@monstr.eu>
Subject: [PATCH 2/2] microblaze: Remove compilation failure
Date: Mon, 17 Sep 2012 11:18:25 +0200 [thread overview]
Message-ID: <1347873505-17025-2-git-send-email-monstr@monstr.eu> (raw)
In-Reply-To: <1347873505-17025-1-git-send-email-monstr@monstr.eu>
Remove typo fault in addik asm instruction.
Error log:
arch/microblaze/kernel/built-in.o: In function `sys_rt_sigreturn_wrapper':
(.text+0x50e0): undefined reference to `r0'
Caused by:
"microblaze: fix the horror with restarts of sigreturn()"
(sha1: 4441e2fc9d18124d395010d60435e07c70ae4271)
Signed-off-by: Michal Simek <monstr@monstr.eu>
---
arch/microblaze/kernel/entry.S | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/microblaze/kernel/entry.S b/arch/microblaze/kernel/entry.S
index 48223a1..76ae019 100644
--- a/arch/microblaze/kernel/entry.S
+++ b/arch/microblaze/kernel/entry.S
@@ -429,7 +429,7 @@ C_ENTRY(ret_from_trap):
bri 1b
/* Maybe handle a signal */
-5:
+5:
andi r11, r19, _TIF_SIGPENDING | _TIF_NOTIFY_RESUME;
beqi r11, 4f; /* Signals to handle, handle them */
@@ -505,7 +505,7 @@ C_ENTRY(sys_execve):
addik r8, r1, 0; /* add user context as 4th arg */
C_ENTRY(sys_rt_sigreturn_wrapper):
- addik r30, r0, r0 /* no restarts */
+ addik r30, r0, 0 /* no restarts */
brid sys_rt_sigreturn /* Do real work */
addik r5, r1, 0; /* add user context as 1st arg */
--
1.7.0.4
prev parent reply other threads:[~2012-09-17 9:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-17 9:18 [PATCH 1/2] microblaze: Move restart allowed out of block Michal Simek
2012-09-17 9:18 ` Michal Simek [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1347873505-17025-2-git-send-email-monstr@monstr.eu \
--to=monstr@monstr.eu \
--cc=linux-arch@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).