Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4449/1: more entries in arch/arm/boot/.gitignore
  [ARM] 4452/1: Force the literal pool dump before reloc_end
  [ARM] Update show_regs/oops register format
  [ARM] Add support for pause_on_oops and display preempt/smp options

diff --git a/arch/arm/boot/.gitignore b/arch/arm/boot/.gitignore
index 171a0853caf8caee50be7aa778867a2ae8f76870..ce1c5ff746e7d2930fc0ec2005b6e65b35bd9a91 100644 (file)
--- a/arch/arm/boot/.gitignore
+++ b/arch/arm/boot/.gitignore
@@ -1,2 +1,5 @@
 Image
 zImage
+xipImage
+bootpImage
+uImage

diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 23348e9561b92070406f4d40a7a5060190561e6e..680ea6ed77b89c746715f0a38c42142f52a0b4b3 100644 (file)
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -836,6 +836,7 @@ memdump:    mov     r12, r0
                mov     pc, r10
 #endif
 
+               .ltorg
 reloc_end:
 
                .align

diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 5d6e6523598b88359afac5ad473cc4c26dd521b2..842361777d4e63782a96535c6c50cfbf3faedd19 100644 (file)
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -28,6 +28,7 @@
 #include <linux/elfcore.h>
 #include <linux/pm.h>
 #include <linux/tick.h>
+#include <linux/utsname.h>
 
 #include <asm/leds.h>
 #include <asm/processor.h>
@@ -199,16 +200,19 @@ void machine_restart(char * __unused)
 
 void __show_regs(struct pt_regs *regs)
 {
-       unsigned long flags = condition_codes(regs);
+       unsigned long flags;
+       char buf[64];
 
-       printk("CPU: %d\n", smp_processor_id());
+       printk("CPU: %d    %s  (%s %.*s)\n",
+               smp_processor_id(), print_tainted(), init_utsname()->release,
+               (int)strcspn(init_utsname()->version, " "),
+               init_utsname()->version);
        print_symbol("PC is at %s\n", instruction_pointer(regs));
        print_symbol("LR is at %s\n", regs->ARM_lr);
-       printk("pc : [<%08lx>]    lr : [<%08lx>]    %s\n"
+       printk("pc : [<%08lx>]    lr : [<%08lx>]    psr: %08lx\n"
               "sp : %08lx  ip : %08lx  fp : %08lx\n",
-               instruction_pointer(regs),
-               regs->ARM_lr, print_tainted(), regs->ARM_sp,
-               regs->ARM_ip, regs->ARM_fp);
+               regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
+               regs->ARM_sp, regs->ARM_ip, regs->ARM_fp);
        printk("r10: %08lx  r9 : %08lx  r8 : %08lx\n",
                regs->ARM_r10, regs->ARM_r9,
                regs->ARM_r8);
@@ -218,36 +222,39 @@ void __show_regs(struct pt_regs *regs)
        printk("r3 : %08lx  r2 : %08lx  r1 : %08lx  r0 : %08lx\n",
                regs->ARM_r3, regs->ARM_r2,
                regs->ARM_r1, regs->ARM_r0);
-       printk("Flags: %c%c%c%c",
-               flags & PSR_N_BIT ? 'N' : 'n',
-               flags & PSR_Z_BIT ? 'Z' : 'z',
-               flags & PSR_C_BIT ? 'C' : 'c',
-               flags & PSR_V_BIT ? 'V' : 'v');
-       printk("  IRQs o%s  FIQs o%s  Mode %s%s  Segment %s\n",
-               interrupts_enabled(regs) ? "n" : "ff",
+
+       flags = regs->ARM_cpsr;
+       buf[0] = flags & PSR_N_BIT ? 'N' : 'n';
+       buf[1] = flags & PSR_Z_BIT ? 'Z' : 'z';
+       buf[2] = flags & PSR_C_BIT ? 'C' : 'c';
+       buf[3] = flags & PSR_V_BIT ? 'V' : 'v';
+       buf[4] = '\0';
+
+       printk("Flags: %s  IRQs o%s  FIQs o%s  Mode %s%s  Segment %s\n",
+               buf, interrupts_enabled(regs) ? "n" : "ff",
                fast_interrupts_enabled(regs) ? "n" : "ff",
                processor_modes[processor_mode(regs)],
                thumb_mode(regs) ? " (T)" : "",
                get_fs() == get_ds() ? "kernel" : "user");
-#if CONFIG_CPU_CP15
+#ifdef CONFIG_CPU_CP15
        {
                unsigned int ctrl;
-                 __asm__ (
-               "       mrc p15, 0, %0, c1, c0\n"
-               : "=r" (ctrl));
-               printk("Control: %04X\n", ctrl);
-       }
+
+               buf[0] = '\0';
 #ifdef CONFIG_CPU_CP15_MMU
-       {
-               unsigned int transbase, dac;
-                 __asm__ (
-               "       mrc p15, 0, %0, c2, c0\n"
-               "       mrc p15, 0, %1, c3, c0\n"
-               : "=r" (transbase), "=r" (dac));
-               printk("Table: %08X  DAC: %08X\n",
-                       transbase, dac);
-       }
+               {
+                       unsigned int transbase, dac;
+                       asm("mrc p15, 0, %0, c2, c0\n\t"
+                           "mrc p15, 0, %1, c3, c0\n"
+                           : "=r" (transbase), "=r" (dac));
+                       snprintf(buf, sizeof(buf), "  Table: %08x  DAC: %08x",
+                               transbase, dac);
+               }
 #endif
+               asm("mrc p15, 0, %0, c1, c0\n" : "=r" (ctrl));
+
+               printk("Control: %08x%s\n", ctrl, buf);
+       }
 #endif
 }
 

diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 10ff36e4e414f96132e0b8f45136d24fb3118a44..1b68d365d0e1e52887693122a344ec335219942f 100644 (file)
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -204,12 +204,24 @@ void show_stack(struct task_struct *tsk, unsigned long *sp)
        barrier();
 }
 
+#ifdef CONFIG_PREEMPT
+#define S_PREEMPT " PREEMPT"
+#else
+#define S_PREEMPT ""
+#endif
+#ifdef CONFIG_SMP
+#define S_SMP " SMP"
+#else
+#define S_SMP ""
+#endif
+
 static void __die(const char *str, int err, struct thread_info *thread, struct pt_regs *regs)
 {
        struct task_struct *tsk = thread->task;
        static int die_counter;
 
-       printk("Internal error: %s: %x [#%d]\n", str, err, ++die_counter);
+       printk("Internal error: %s: %x [#%d]" S_PREEMPT S_SMP "\n",
+              str, err, ++die_counter);
        print_modules();
        __show_regs(regs);
        printk("Process %s (pid: %d, stack limit = 0x%p)\n",
@@ -232,6 +244,8 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err)
 {
        struct thread_info *thread = current_thread_info();
 
+       oops_enter();
+
        console_verbose();
        spin_lock_irq(&die_lock);
        bust_spinlocks(1);
@@ -239,9 +253,13 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err)
        bust_spinlocks(0);
        spin_unlock_irq(&die_lock);
 
+       if (in_interrupt())
+               panic("Fatal exception in interrupt");
+
        if (panic_on_oops)
                panic("Fatal exception");
 
+       oops_exit();
        do_exit(SIGSEGV);
 }
 

diff --git a/include/asm-arm/ptrace.h b/include/asm-arm/ptrace.h
index 2d0dad8c10acb144b241f9088b1cf2a985e3939b..ee3d93c281d809900cd13086932755a368f18e40 100644 (file)
--- a/include/asm-arm/ptrace.h
+++ b/include/asm-arm/ptrace.h
@@ -112,9 +112,6 @@ struct pt_regs {
 #define fast_interrupts_enabled(regs) \
        (!((regs)->ARM_cpsr & PSR_F_BIT))
 
-#define condition_codes(regs) \
-       ((regs)->ARM_cpsr & (PSR_V_BIT|PSR_C_BIT|PSR_Z_BIT|PSR_N_BIT))
-       
 /* Are the current registers suitable for user mode?
  * (used to maintain security in signal handlers)
  */