Merge tiger.hpl.hp.com:/data1/bk/vanilla/linux-2.6.0-test9

into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5

Merge tiger.hpl.hp.com:/data1/bk/vanilla/linux-2.6.0-test9
into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5
44ec9088 · David Mosberger · 018c8581 · 75251f62 · 44ec9088
Commit 44ec9088 authored Oct 26, 2003 by David Mosberger
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

arch/ia64/kernel/perfmon.c arch/ia64/kernel/perfmon.c +1 -1

No files found.
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -5787,7 +5787,7 @@ pfm_save_regs(struct task_struct *task)
 	 */
 	psr = pfm_get_psr();

-	BUG_ON(foo & (IA64_PSR_I));
+	BUG_ON(psr & (IA64_PSR_I));

 	/*
 	 * stop monitoring: