8 files changed, 8 insertions, 12 deletions

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index af219e5173..8ff1c6fb5a 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -682,7 +682,7 @@ config EFI
         depends on ACPI
         default n
         ---help---
-        This enables the the kernel to boot on EFI platforms using
+        This enables the kernel to boot on EFI platforms using
         system configuration information passed to it from the firmware.
         This also enables the kernel to use any EFI runtime services that are
         available (such as the EFI variable services).
diff --git a/arch/i386/kernel/cpu/common.c b/arch/i386/kernel/cpu/common.c
index b2f24d57fd..d9f3e3c31f 100644
--- a/arch/i386/kernel/cpu/common.c
+++ b/arch/i386/kernel/cpu/common.c
@@ -669,8 +669,7 @@ old_gdt:
          */
         atomic_inc(&init_mm.mm_count);
         current->active_mm = &init_mm;
-        if (current->mm)
-                BUG();
+        BUG_ON(current->mm);
         enter_lazy_tlb(&init_mm, current);
 
         load_esp0(t, thread);
diff --git a/arch/i386/kernel/efi.c b/arch/i386/kernel/efi.c
index f943698947..8b40648d0e 100644
--- a/arch/i386/kernel/efi.c
+++ b/arch/i386/kernel/efi.c
@@ -498,8 +498,7 @@ void __init efi_enter_virtual_mode(void)
                 check_range_for_systab(md);
         }
 
-        if (!efi.systab)
-                BUG();
+        BUG_ON(!efi.systab);
 
         status = phys_efi_set_virtual_address_map(
                         memmap.desc_size * memmap.nr_map,
diff --git a/arch/i386/kernel/ldt.c b/arch/i386/kernel/ldt.c
index 983f95707e..445211eb2d 100644
--- a/arch/i386/kernel/ldt.c
+++ b/arch/i386/kernel/ldt.c
@@ -1,5 +1,5 @@
 /*
- * linux/kernel/ldt.c
+ * linux/arch/i386/kernel/ldt.c
  *
  * Copyright (C) 1992 Krishna Balasubramanian and Linus Torvalds
  * Copyright (C) 1999 Ingo Molnar <mingo@redhat.com>
diff --git a/arch/i386/mach-visws/visws_apic.c b/arch/i386/mach-visws/visws_apic.c
index 828522541a..5929f884d7 100644
--- a/arch/i386/mach-visws/visws_apic.c
+++ b/arch/i386/mach-visws/visws_apic.c
@@ -1,5 +1,5 @@
 /*
- *      linux/arch/i386/mach_visws/visws_apic.c
+ *      linux/arch/i386/mach-visws/visws_apic.c
  *
  *      Copyright (C) 1999 Bent Hagemark, Ingo Molnar
  *
diff --git a/arch/i386/mm/discontig.c b/arch/i386/mm/discontig.c
index 51e3739dd2..455597db84 100644
--- a/arch/i386/mm/discontig.c
+++ b/arch/i386/mm/discontig.c
@@ -153,8 +153,7 @@ static void __init find_max_pfn_node(int nid)
          */
         if (node_start_pfn[nid] > max_pfn)
                 node_start_pfn[nid] = max_pfn;
-        if (node_start_pfn[nid] > node_end_pfn[nid])
-                BUG();
+        BUG_ON(node_start_pfn[nid] > node_end_pfn[nid]);
 }
 
 /* 
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
index 90089c14c2..167416155e 100644
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
@@ -569,8 +569,7 @@ void __init mem_init(void)
         int bad_ppro;
 
 #ifdef CONFIG_FLATMEM
-        if (!mem_map)
-                BUG();
+        BUG_ON(!mem_map);
 #endif
         
         bad_ppro = ppro_with_ram_bug();
diff --git a/arch/i386/pci/fixup.c b/arch/i386/pci/fixup.c
index 83c3645ccc..b60d7e8689 100644
--- a/arch/i386/pci/fixup.c
+++ b/arch/i386/pci/fixup.c
@@ -393,7 +393,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_video);
  * We pretend to bring them out of full D3 state, and restore the proper
  * IRQ, PCI cache line size, and BARs, otherwise the device won't function
  * properly.  In some cases, the device will generate an interrupt on
- * the wrong IRQ line, causing any devices sharing the the line it's
+ * the wrong IRQ line, causing any devices sharing the line it's
  * *supposed* to use to be disabled by the kernel's IRQ debug code.
  */
 static u16 toshiba_line_size;