diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-01-06 22:02:11 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-06 22:02:11 -0500 |
commit | c0312b33daa721a92633181fd4fe508484c81a2d (patch) | |
tree | 295b45ade75a7044066bb392eaa619a7f2c52d49 /arch/arm/mach-shmobile/entry-gic.S | |
parent | 6ef9f6fd8eb22f4838e9b0006d16936511e3f7f8 (diff) |
ARM: mach-shmobile: update for GIC changes.
This fixes up the SMP support to use the refactored GIC APIs.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/arm/mach-shmobile/entry-gic.S')
-rw-r--r-- | arch/arm/mach-shmobile/entry-gic.S | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-shmobile/entry-gic.S b/arch/arm/mach-shmobile/entry-gic.S index 6e4fa4715199..e20239b08c83 100644 --- a/arch/arm/mach-shmobile/entry-gic.S +++ b/arch/arm/mach-shmobile/entry-gic.S | |||
@@ -2,19 +2,17 @@ | |||
2 | * ARM Interrupt demux handler using GIC | 2 | * ARM Interrupt demux handler using GIC |
3 | * | 3 | * |
4 | * Copyright (C) 2010 Magnus Damm | 4 | * Copyright (C) 2010 Magnus Damm |
5 | * Copyright (C) 2010 Renesas Solutions Corp. | 5 | * Copyright (C) 2011 Paul Mundt |
6 | * Copyright (C) 2010 - 2011 Renesas Solutions Corp. | ||
6 | * | 7 | * |
7 | * This file is licensed under the terms of the GNU General Public | 8 | * This file is licensed under the terms of the GNU General Public |
8 | * License version 2. This program is licensed "as is" without any | 9 | * License version 2. This program is licensed "as is" without any |
9 | * warranty of any kind, whether express or implied. | 10 | * warranty of any kind, whether express or implied. |
10 | */ | 11 | */ |
11 | 12 | ||
13 | #include <asm/assembler.h> | ||
12 | #include <asm/entry-macro-multi.S> | 14 | #include <asm/entry-macro-multi.S> |
13 | #include <asm/hardware/gic.h> | 15 | #include <asm/hardware/gic.h> |
14 | #include <asm/hardware/entry-macro-gic.S> | 16 | #include <asm/hardware/entry-macro-gic.S> |
15 | 17 | ||
16 | .macro get_irqnr_preamble, base, tmp | ||
17 | ldr \base, =(0xf0000100) | ||
18 | .endm | ||
19 | |||
20 | arch_irq_handler shmobile_handle_irq_gic | 18 | arch_irq_handler shmobile_handle_irq_gic |