diff options
author | 2011-01-14 14:12:37 +0100 | |
---|---|---|
committer | 2011-01-14 14:12:37 +0100 | |
commit | 0134e89c7bcc9fde1da962c82a120691e185619f (patch) | |
tree | 3e03335cf001019a2687d161e956de4f73379984 /arch/arm/mach-shmobile/include/mach/entry-macro.S | |
parent | netfilter: fix Kconfig dependencies (diff) | |
parent | netfilter: ebt_ip6: allow matching on ipv6-icmp types/codes (diff) | |
download | linux-dev-0134e89c7bcc9fde1da962c82a120691e185619f.tar.xz linux-dev-0134e89c7bcc9fde1da962c82a120691e185619f.zip |
Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6
Conflicts:
net/ipv4/route.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'arch/arm/mach-shmobile/include/mach/entry-macro.S')
-rw-r--r-- | arch/arm/mach-shmobile/include/mach/entry-macro.S | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/entry-macro.S b/arch/arm/mach-shmobile/include/mach/entry-macro.S index a285d13c7416..d791f10eeac7 100644 --- a/arch/arm/mach-shmobile/include/mach/entry-macro.S +++ b/arch/arm/mach-shmobile/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * 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 @@ -14,26 +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/hardware.h> -#include <mach/irqs.h> .macro disable_fiq .endm .macro get_irqnr_preamble, base, tmp - ldr \base, =INTFLGA .endm - .macro arch_ret_to_user, tmp1, tmp2 + .macro get_irqnr_and_base, irqnr, irqstat, base, tmp .endm - .macro get_irqnr_and_base, irqnr, irqstat, base, tmp - ldr \irqnr, [\base] - cmp \irqnr, #0 - beq 1000f - /* intevt to irq number */ - lsr \irqnr, \irqnr, #0x5 - subs \irqnr, \irqnr, #16 + .macro test_for_ipi, irqnr, irqstat, base, tmp + .endm -1000: + .macro test_for_ltirq, irqnr, irqstat, base, tmp + .endm + + .macro arch_ret_to_user, tmp1, tmp2 .endm |