vserver 1.9.5.x5

[linux-2.6.git] / arch / arm / kernel / entry-header.S

diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
index ef152e3..4039d8c 100644 (file)
--- a/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
@@ -6,6 +6,7 @@
 #include <asm/errno.h>
 #include <asm/hardware.h>
 #include <asm/arch/irqs.h>
+#include <asm/arch/entry-macro.S>
 
 #ifndef MODE_SVC
 #define MODE_SVC 0x13
@@ -140,13 +141,6 @@
        mov     \rd, \rd, lsl #13
        .endm
 
-/*
- * Like adr, but force SVC mode (if required)
- */
-       .macro  adrsvc, cond, reg, label
-       adr\cond        \reg, \label
-       .endm
-
        .macro  alignment_trap, rbase, rtemp, sym
 #ifdef CONFIG_ALIGNMENT_TRAP
 #define OFF_CR_ALIGNMENT(x)    cr_alignment - x