Merge branch 'sh/dwarf-unwinder'

[pandora-kernel.git] / arch / arm / kernel / unwind.c

diff --git a/arch/arm/kernel/unwind.c b/arch/arm/kernel/unwind.c
index dd56e11..39baf11 100644 (file)
--- a/arch/arm/kernel/unwind.c
+++ b/arch/arm/kernel/unwind.c
@@ -62,7 +62,11 @@ struct unwind_ctrl_block {
 };
 
 enum regs {
+#ifdef CONFIG_THUMB2_KERNEL
+       FP = 7,
+#else
        FP = 11,
+#endif
        SP = 13,
        LR = 14,
        PC = 15