diff --git a/[refs] b/[refs] index f0906b04e8c5..3a78e1828ac2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1a9e91e426a78728c0e815b0355a7c0374d1088 +refs/heads/master: ab65b87093a38ad8565780494c74bd7afd79ad9a diff --git a/trunk/include/asm-arm/arch-ns9xxx/entry-macro.S b/trunk/include/asm-arm/arch-ns9xxx/entry-macro.S index 86aec87303e4..5c706dd2379c 100644 --- a/trunk/include/asm-arm/arch-ns9xxx/entry-macro.S +++ b/trunk/include/asm-arm/arch-ns9xxx/entry-macro.S @@ -12,13 +12,13 @@ #include .macro get_irqnr_preamble, base, tmp + ldr \base, =SYS_ISRADDR .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)] cmp \irqstat, #0 ldrne \irqnr, [\base]