From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161050AbWJKNkP (ORCPT ); Wed, 11 Oct 2006 09:40:15 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1161052AbWJKNkO (ORCPT ); Wed, 11 Oct 2006 09:40:14 -0400 Received: from amsfep19-int.chello.nl ([213.46.243.16]:8010 "EHLO amsfep17-int.chello.nl") by vger.kernel.org with ESMTP id S1161050AbWJKNkL (ORCPT ); Wed, 11 Oct 2006 09:40:11 -0400 Subject: [PATCH] lockdep: annotate i386 apm From: Peter Zijlstra To: linux-kernel Cc: sfr@canb.auug.org.au, Andrew Morton , Ingo Molnar Content-Type: text/plain Date: Wed, 11 Oct 2006 15:40:22 +0200 Message-Id: <1160574022.2006.82.camel@taijtu> Mime-Version: 1.0 X-Mailer: Evolution 2.6.3 (2.6.3-1.fc5.5) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Lockdep doesn't like to enable interrupts when they are enabled already. BUG: warning at kernel/lockdep.c:1814/trace_hardirqs_on() (Not tainted) [] show_trace_log_lvl+0x58/0x16a [] show_trace+0xd/0x10 [] dump_stack+0x19/0x1b [] trace_hardirqs_on+0xa2/0x11e [] apm_bios_call_simple+0xcd/0xfd [] apm+0x92/0x5b1 [] kernel_thread_helper+0x5/0xb DWARF2 unwinder stuck at kernel_thread_helper+0x5/0xb Leftover inexact backtrace: [] show_trace+0xd/0x10 [] dump_stack+0x19/0x1b [] trace_hardirqs_on+0xa2/0x11e [] apm_bios_call_simple+0xcd/0xfd [] apm+0x92/0x5b1 [] kernel_thread_helper+0x5/0xb Signed-off-by: Peter Zijlstra --- arch/i386/kernel/apm.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) Index: linux-2.6.18.noarch/arch/i386/kernel/apm.c =================================================================== --- linux-2.6.18.noarch.orig/arch/i386/kernel/apm.c +++ linux-2.6.18.noarch/arch/i386/kernel/apm.c @@ -539,11 +539,22 @@ static inline void apm_restore_cpus(cpum * Also, we KNOW that for the non error case of apm_bios_call, there * is no useful data returned in the low order 8 bits of eax. */ -#define APM_DO_CLI \ - if (apm_info.allow_ints) \ - local_irq_enable(); \ - else \ - local_irq_disable(); +#define APM_DO_CLI \ + do { \ + if (apm_info.allow_ints) { \ + if (irqs_disabled_flags(flags)) \ + local_irq_enable(); \ + } else \ + local_irq_disable(); \ + } while (0) + +#define APM_DO_STI \ + do { \ + if (irqs_disabled_flags(flags)) \ + local_irq_disable(); \ + else if (irqs_disabled()) \ + local_irq_enable(); \ + } while (0) #ifdef APM_ZERO_SEGS # define APM_DECL_SEGS \ @@ -600,7 +611,7 @@ static u8 apm_bios_call(u32 func, u32 eb APM_DO_SAVE_SEGS; apm_bios_call_asm(func, ebx_in, ecx_in, eax, ebx, ecx, edx, esi); APM_DO_RESTORE_SEGS; - local_irq_restore(flags); + APM_DO_STI; gdt[0x40 / 8] = save_desc_40; put_cpu(); apm_restore_cpus(cpus); @@ -644,7 +655,7 @@ static u8 apm_bios_call_simple(u32 func, APM_DO_SAVE_SEGS; error = apm_bios_call_simple_asm(func, ebx_in, ecx_in, eax); APM_DO_RESTORE_SEGS; - local_irq_restore(flags); + APM_DO_STI; gdt[0x40 / 8] = save_desc_40; put_cpu(); apm_restore_cpus(cpus);