commit 80a03e29164c76b70e6dbb1d10515820cc24487a
author Stoyan Gaydarov <stoyboyker@gmail.com> Tue Mar 10 00:10:30 2009 -0500
committer Tony Luck <tony.luck@intel.com> Wed Apr 01 09:50:48 2009 -0700
tree ee9426ae7b76777169079e7120a8413384f128b6
parent ebf7649a4c6d37ce24c143001125cf29cc0bcf6a

[IA64] BUG to BUG_ON changes

Replace:

	if (test)
		BUG();

with
	BUG_ON(test);

Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

arch/ia64/kernel/module.c

diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
index 34fe425..da3b0cf 100644
--- a/arch/ia64/kernel/module.c
+++ b/arch/ia64/kernel/module.c
@@ -533,8 +533,7 @@
 			goto found;
 
 	/* Not enough GOT entries? */
-	if (e >= (struct got_entry *) (mod->arch.got->sh_addr + mod->arch.got->sh_size))
-		BUG();
+	BUG_ON(e >= (struct got_entry *) (mod->arch.got->sh_addr + mod->arch.got->sh_size));
 
 	e->val = value;
 	++mod->arch.next_got_entry;

arch/ia64/kernel/setup.c

diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 833b3ef..714066a 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -1018,8 +1018,7 @@
 					| IA64_DCR_DA | IA64_DCR_DD | IA64_DCR_LC));
 	atomic_inc(&init_mm.mm_count);
 	current->active_mm = &init_mm;
-	if (current->mm)
-		BUG();
+	BUG_ON(current->mm);
 
 	ia64_mmu_init(ia64_imva(cpu_data));
 	ia64_mca_cpu_init(ia64_imva(cpu_data));