From 4d773c46ead9a3c23ee71484c4f37df125791720 Mon Sep 17 00:00:00 2001 From: Daniel Walker Date: Sat, 12 Sep 2009 10:40:20 -0700 Subject: [PATCH] --- yaml --- r: 164291 b: refs/heads/master c: c2777f98c205148f1a0d4f9ac03b9cb20b39b2da h: refs/heads/master i: 164289: d4ffcb6dacb4119a423e1d71f4e95d52b619c1eb 164287: 3d99317865d3be1bb76db581ac746b4233720417 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/apic/apic.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8719a0becae7..b3aa8eba6484 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc3eb7076b2b808f79abd4bd33b6a7feebb6f5d5 +refs/heads/master: c2777f98c205148f1a0d4f9ac03b9cb20b39b2da diff --git a/trunk/arch/x86/kernel/apic/apic.c b/trunk/arch/x86/kernel/apic/apic.c index 159740decc41..79e5b92a5800 100644 --- a/trunk/arch/x86/kernel/apic/apic.c +++ b/trunk/arch/x86/kernel/apic/apic.c @@ -1196,8 +1196,7 @@ void __cpuinit setup_local_APIC(void) * Double-check whether this APIC is really registered. * This is meaningless in clustered apic mode, so we skip it. */ - if (!apic->apic_id_registered()) - BUG(); + BUG_ON(!apic->apic_id_registered()); /* * Intel recommends to set DFR, LDR and TPR before enabling