Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / arch / arm / lib / interrupts.c

diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c
index 06f46795c3f1289d98a533c5a755cb2459e3bee4..ed83043abb4d797205e29000aecf7a0dfd141e12 100644 (file)
--- a/arch/arm/lib/interrupts.c
+++ b/arch/arm/lib/interrupts.c
@@ -22,6 +22,7 @@
 #include <common.h>
 #include <asm/proc-armv/ptrace.h>
 #include <asm/u-boot-arm.h>
+#include <efi_loader.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -123,8 +124,8 @@ void bad_mode (void)
 
 void show_regs (struct pt_regs *regs)
 {
-       unsigned long flags;
-       const char *processor_modes[] = {
+       unsigned long __maybe_unused flags;
+       const char __maybe_unused *processor_modes[] = {
        "USER_26",      "FIQ_26",       "IRQ_26",       "SVC_26",
        "UK4_26",       "UK5_26",       "UK6_26",       "UK7_26",
        "UK8_26",       "UK9_26",       "UK10_26",      "UK11_26",
@@ -165,6 +166,7 @@ void show_regs (struct pt_regs *regs)
 
 void do_undefined_instruction (struct pt_regs *pt_regs)
 {
+       efi_restore_gd();
        printf ("undefined instruction\n");
        show_regs (pt_regs);
        bad_mode ();
@@ -172,6 +174,7 @@ void do_undefined_instruction (struct pt_regs *pt_regs)
 
 void do_software_interrupt (struct pt_regs *pt_regs)
 {
+       efi_restore_gd();
        printf ("software interrupt\n");
        show_regs (pt_regs);
        bad_mode ();
@@ -179,6 +182,7 @@ void do_software_interrupt (struct pt_regs *pt_regs)
 
 void do_prefetch_abort (struct pt_regs *pt_regs)
 {
+       efi_restore_gd();
        printf ("prefetch abort\n");
        show_regs (pt_regs);
        bad_mode ();
@@ -186,6 +190,7 @@ void do_prefetch_abort (struct pt_regs *pt_regs)
 
 void do_data_abort (struct pt_regs *pt_regs)
 {
+       efi_restore_gd();
        printf ("data abort\n");
        show_regs (pt_regs);
        bad_mode ();
@@ -193,6 +198,7 @@ void do_data_abort (struct pt_regs *pt_regs)
 
 void do_not_used (struct pt_regs *pt_regs)
 {
+       efi_restore_gd();
        printf ("not used\n");
        show_regs (pt_regs);
        bad_mode ();
@@ -200,6 +206,7 @@ void do_not_used (struct pt_regs *pt_regs)
 
 void do_fiq (struct pt_regs *pt_regs)
 {
+       efi_restore_gd();
        printf ("fast interrupt request\n");
        show_regs (pt_regs);
        bad_mode ();
@@ -208,6 +215,7 @@ void do_fiq (struct pt_regs *pt_regs)
 #ifndef CONFIG_USE_IRQ
 void do_irq (struct pt_regs *pt_regs)
 {
+       efi_restore_gd();
        printf ("interrupt request\n");
        show_regs (pt_regs);
        bad_mode ();