From: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Date: Fri, 23 Feb 2007 19:20:47 +0000 (+0100)
Subject: [ARM] 4234/1: Introduce get_irqnr_preamble and arch_ret_to_user for ns9xxx.
X-Git-Tag: v2.6.21-rc2~28^2~2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8748415d0df9e16c419a749b5de3a0ccd90bca3f;p=linux-2.6

[ARM] 4234/1: Introduce get_irqnr_preamble and arch_ret_to_user for ns9xxx.

This is a follow up for f80dff9da07d81da16e3b842118d47b9febf9c01 which
didn't include adaption for the new ns9xxx machine support.

Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/include/asm-arm/arch-ns9xxx/entry-macro.S b/include/asm-arm/arch-ns9xxx/entry-macro.S
index 467a1986d2..86aec87303 100644
--- a/include/asm-arm/arch-ns9xxx/entry-macro.S
+++ b/include/asm-arm/arch-ns9xxx/entry-macro.S
@@ -11,6 +11,12 @@
 #include <asm/hardware.h>
 #include <asm/arch-ns9xxx/regs-sys.h>
 
+		.macro	get_irqnr_preamble, base, tmp
+		.endm
+
+		.macro	arch_ret_to_user, tmp1, tmp2
+		.endm
+
 		.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp
 		ldr	\base, =SYS_ISRADDR
 		ldr	\irqstat, [\base, #(SYS_ISA - SYS_ISRADDR)]