From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761732AbZE0H2p (ORCPT ); Wed, 27 May 2009 03:28:45 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762188AbZE0HZy (ORCPT ); Wed, 27 May 2009 03:25:54 -0400 Received: from 178-47-31-89.wifiinternet.cz ([89.31.47.178]:46902 "EHLO monstr.eu" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1761141AbZE0HZx (ORCPT ); Wed, 27 May 2009 03:25:53 -0400 From: Michal Simek To: linux-kernel@vger.kernel.org Cc: john.williams@petalogix.com, microblaze-uclinux@itee.uq.edu.au, michal.simek@petalogix.com, Michal Simek Subject: [PATCH 23/29] microblaze_mmu_v2: Update signal returning address Date: Wed, 27 May 2009 08:47:48 +0200 Message-Id: <1243406874-3917-24-git-send-email-monstr@monstr.eu> X-Mailer: git-send-email 1.5.5.1 In-Reply-To: <1243406874-3917-23-git-send-email-monstr@monstr.eu> References: <1243406874-3917-1-git-send-email-monstr@monstr.eu> <1243406874-3917-2-git-send-email-monstr@monstr.eu> <1243406874-3917-3-git-send-email-monstr@monstr.eu> <1243406874-3917-4-git-send-email-monstr@monstr.eu> <1243406874-3917-5-git-send-email-monstr@monstr.eu> <1243406874-3917-6-git-send-email-monstr@monstr.eu> <1243406874-3917-7-git-send-email-monstr@monstr.eu> <1243406874-3917-8-git-send-email-monstr@monstr.eu> <1243406874-3917-9-git-send-email-monstr@monstr.eu> <1243406874-3917-10-git-send-email-monstr@monstr.eu> <1243406874-3917-11-git-send-email-monstr@monstr.eu> <1243406874-3917-12-git-send-email-monstr@monstr.eu> <1243406874-3917-13-git-send-email-monstr@monstr.eu> <1243406874-3917-14-git-send-email-monstr@monstr.eu> <1243406874-3917-15-git-send-email-monstr@monstr.eu> <1243406874-3917-16-git-send-email-monstr@monstr.eu> <1243406874-3917-17-git-send-email-monstr@monstr.eu> <1243406874-3917-18-git-send-email-monstr@monstr.eu> <1243406874-3917-19-git-send-email-monstr@monstr.eu> <1243406874-3917-20-git-send-email-monstr@monstr.eu> <1243406874-3917-21-git-send-email-monstr@monstr.eu> <1243406874-3917-22-git-send-email-monstr@monstr.eu> <1243406874-3917-23-git-send-email-monstr@monstr.eu> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Michal Simek --- arch/microblaze/kernel/signal.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/arch/microblaze/kernel/signal.c b/arch/microblaze/kernel/signal.c index 3cdcbfe..4c0e652 100644 --- a/arch/microblaze/kernel/signal.c +++ b/arch/microblaze/kernel/signal.c @@ -388,7 +388,15 @@ handle_restart(struct pt_regs *regs, struct k_sigaction *ka, int has_handler) case -ERESTARTNOINTR: do_restart: /* offset of 4 bytes to re-execute trap (brki) instruction */ +#ifndef CONFIG_MMU regs->pc -= 4; +#else + /* offset of 8 bytes required = 4 for rtbd + offset, plus 4 for size of + "brki r14,8" + instruction. */ + regs->pc -= 8; +#endif break; } } -- 1.5.5.1