2 files changed, 24 insertions, 15 deletions

diff --git a/arch/i386/kernel/crash.c b/arch/i386/kernel/crash.c
index 8bdb4b6af0ff..e5fab12f7926 100644
--- a/arch/i386/kernel/crash.c
+++ b/arch/i386/kernel/crash.c
@@ -31,10 +31,11 @@ note_buf_t crash_notes[NR_CPUS];
 /* This keeps a track of which one is crashing cpu. */
 static int crashing_cpu;
 
-static u32 *append_elf_note(u32 *buf,
-        char *name, unsigned type, void *data, size_t data_len)
+static u32 *append_elf_note(u32 *buf, char *name, unsigned type, void *data,
+                                                               size_t data_len)
 {
         struct elf_note note;
+
         note.n_namesz = strlen(name) + 1;
         note.n_descsz = data_len;
         note.n_type   = type;
@@ -44,26 +45,28 @@ static u32 *append_elf_note(u32 *buf,
         buf += (note.n_namesz + 3)/4;
         memcpy(buf, data, note.n_descsz);
         buf += (note.n_descsz + 3)/4;
+
         return buf;
 }
 
 static void final_note(u32 *buf)
 {
         struct elf_note note;
+
         note.n_namesz = 0;
         note.n_descsz = 0;
         note.n_type   = 0;
         memcpy(buf, &note, sizeof(note));
 }
 
-
 static void crash_save_this_cpu(struct pt_regs *regs, int cpu)
 {
         struct elf_prstatus prstatus;
         u32 *buf;
-        if ((cpu < 0) || (cpu >= NR_CPUS)) {
+
+        if ((cpu < 0) || (cpu >= NR_CPUS))
                 return;
-        }
+
         /* Using ELF notes here is opportunistic.
          * I need a well defined structure format
          * for the data I pass, and I need tags
@@ -75,9 +78,8 @@ static void crash_save_this_cpu(struct pt_regs *regs, int cpu)
         memset(&prstatus, 0, sizeof(prstatus));
         prstatus.pr_pid = current->pid;
         elf_core_copy_regs(&prstatus.pr_reg, regs);
-        buf = append_elf_note(buf, "CORE", NT_PRSTATUS,
-                &prstatus, sizeof(prstatus));
-
+        buf = append_elf_note(buf, "CORE", NT_PRSTATUS, &prstatus,
+                                sizeof(prstatus));
         final_note(buf);
 }
 
@@ -119,8 +121,8 @@ static void crash_save_self(struct pt_regs *saved_regs)
 {
         struct pt_regs regs;
         int cpu;
-        cpu = smp_processor_id();
 
+        cpu = smp_processor_id();
         if (saved_regs)
                 crash_setup_regs(&regs, saved_regs);
         else
@@ -153,6 +155,7 @@ static int crash_nmi_callback(struct pt_regs *regs, int cpu)
         /* Assume hlt works */
         __asm__("hlt");
         for(;;);
+
         return 1;
 }
 
@@ -169,8 +172,8 @@ static void smp_send_nmi_allbutself(void)
 static void nmi_shootdown_cpus(void)
 {
         unsigned long msecs;
-        atomic_set(&waiting_for_crash_ipi, num_online_cpus() - 1);
 
+        atomic_set(&waiting_for_crash_ipi, num_online_cpus() - 1);
         /* Would it be better to replace the trap vector here? */
         set_nmi_callback(crash_nmi_callback);
         /* Ensure the new callback function is set before sending
diff --git a/arch/i386/kernel/machine_kexec.c b/arch/i386/kernel/machine_kexec.c
index 671880415d1c..52ed18d8b511 100644
--- a/arch/i386/kernel/machine_kexec.c
+++ b/arch/i386/kernel/machine_kexec.c
@@ -80,7 +80,8 @@ static void identity_map_page(unsigned long address)
         /* Identity map the page table entry */
         pgtable_level1[level1_index] = address | L0_ATTR;
         pgtable_level2[level2_index] = __pa(pgtable_level1) | L1_ATTR;
-        set_64bit(&pgtable_level3[level3_index], __pa(pgtable_level2) | L2_ATTR);
+        set_64bit(&pgtable_level3[level3_index],
+                                               __pa(pgtable_level2) | L2_ATTR);
 
         /* Flush the tlb so the new mapping takes effect.
          * Global tlb entries are not flushed but that is not an issue.
@@ -139,8 +140,10 @@ static void load_segments(void)
 }
 
 typedef asmlinkage NORET_TYPE void (*relocate_new_kernel_t)(
-        unsigned long indirection_page, unsigned long reboot_code_buffer,
-        unsigned long start_address, unsigned int has_pae) ATTRIB_NORET;
+                                        unsigned long indirection_page,
+                                        unsigned long reboot_code_buffer,
+                                        unsigned long start_address,
+                                        unsigned int has_pae) ATTRIB_NORET;
 
 const extern unsigned char relocate_new_kernel[];
 extern void relocate_new_kernel_end(void);
@@ -180,20 +183,23 @@ NORET_TYPE void machine_kexec(struct kimage *image)
 {
         unsigned long page_list;
         unsigned long reboot_code_buffer;
+
         relocate_new_kernel_t rnk;
 
         /* Interrupts aren't acceptable while we reboot */
         local_irq_disable();
 
         /* Compute some offsets */
-        reboot_code_buffer = page_to_pfn(image->control_code_page) << PAGE_SHIFT;
+        reboot_code_buffer = page_to_pfn(image->control_code_page)
+                                                                << PAGE_SHIFT;
         page_list = image->head;
 
         /* Set up an identity mapping for the reboot_code_buffer */
         identity_map_page(reboot_code_buffer);
 
         /* copy it out */
-        memcpy((void *)reboot_code_buffer, relocate_new_kernel, relocate_new_kernel_size);
+        memcpy((void *)reboot_code_buffer, relocate_new_kernel,
+                                                relocate_new_kernel_size);
 
         /* The segment registers are funny things, they are
          * automatically loaded from a table, in memory wherever you