Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-shmobile / include / mach / entry-macro.S

diff --git a/arch/arm/mach-shmobile/include/mach/entry-macro.S b/arch/arm/mach-shmobile/include/mach/entry-macro.S
index f428c4db2b60e60f2c21761859aaec3e4401eea3..d791f10eeac7ee4e26f1a072e7769d3e0a149b22 100644 (file)
--- a/arch/arm/mach-shmobile/include/mach/entry-macro.S
+++ b/arch/arm/mach-shmobile/include/mach/entry-macro.S
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2010 Magnus Damm
- * Copyright (C) 2008 Renesas Solutions Corp.
+ * Copyright (C) 2010  Paul Mundt
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,47 +14,21 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include <mach/irqs.h>
-
-#define INTCA_BASE     0xe6980000
-#define INTFLGA_OFFS   0x00000018 /* accept pending interrupt */
-#define INTEVTA_OFFS   0x00000020 /* vector number of accepted interrupt */
-#define INTLVLA_OFFS   0x00000030 /* priority level of accepted interrupt */
-#define INTLVLB_OFFS   0x00000034 /* previous priority level */
 
        .macro  disable_fiq
        .endm
 
        .macro  get_irqnr_preamble, base, tmp
-       ldr     \base, =INTCA_BASE
-       .endm
-
-       .macro  arch_ret_to_user, tmp1, tmp2
        .endm
 
        .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
-       /* The single INTFLGA read access below results in the following:
-        *
-        * 1. INTLVLB is updated with old priority value from INTLVLA
-        * 2. Highest priority interrupt is accepted
-        * 3. INTLVLA is updated to contain priority of accepted interrupt
-        * 4. Accepted interrupt vector is stored in INTFLGA and INTEVTA
-        */
-       ldr     \irqnr, [\base, #INTFLGA_OFFS]
-
-       /* Restore INTLVLA with the value saved in INTLVLB.
-        * This is required to support interrupt priorities properly.
-        */
-       ldrb    \tmp, [\base, #INTLVLB_OFFS]
-       strb    \tmp, [\base, #INTLVLA_OFFS]
+       .endm
 
-       /* Handle invalid vector number case */
-       cmp     \irqnr, #0
-       beq     1000f
+       .macro  test_for_ipi, irqnr, irqstat, base, tmp
+       .endm
 
-       /* Convert vector to irq number, same as the evt2irq() macro */
-       lsr     \irqnr, \irqnr, #0x5
-       subs    \irqnr, \irqnr, #16
+       .macro  test_for_ltirq, irqnr, irqstat, base, tmp
+       .endm
 
-1000:
+       .macro  arch_ret_to_user, tmp1, tmp2
        .endm