From patchwork Thu Jan 1 00:00:02 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cyrill Gorcunov X-Patchwork-Id: 124706 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756624AbYGXLoY (ORCPT ); Thu, 24 Jul 2008 07:44:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752826AbYGXLnz (ORCPT ); Thu, 24 Jul 2008 07:43:55 -0400 Received: from ik-out-1112.google.com ([66.249.90.180]:52047 "EHLO ik-out-1112.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751212AbYGXLny (ORCPT ); Thu, 24 Jul 2008 07:43:54 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:references:user-agent:date:from:to:cc:subject :content-disposition; b=Ooluk6QoZuJ2LJuSe36/xJB27OPUH6pFxix40U9qOEESEoWNUEgOcHX/6mE4GKogzB JJpWqCrCfftYkOhlbxEqlC0zeIPDNuWDlhUbQlEJbPJLap6k3VqPMswDVa2r20t9VHCm om5Aq6GHUlvCQt1JokG/yQ77hk5r4qEexyr3g= Message-Id: <20080724114350.624430013@gmail.com> References: <20080724114302.028278487@gmail.com> User-Agent: quilt/0.46-1 Date: Thu, 01 Jan 1970 03:00:02 +0300 From: Cyrill Gorcunov To: mingo@elte.hu, linux-kernel@vger.kernel.org, macro@linux-mips.org Cc: Cyrill Gorcunov Subject: [patch 2/2] x86: apic unification - merge down enable_NMI_through_LVT0 Content-Disposition: inline; filename=x86-apic-merge-enable_NMI_through_LVT0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1551 Lines: 50 Signed-off-by: Cyrill Gorcunov --- No code change on binary level. Index: linux-2.6.git/arch/x86/kernel/apic_32.c =================================================================== --- linux-2.6.git.orig/arch/x86/kernel/apic_32.c 2008-07-24 14:16:55.000000000 +0400 +++ linux-2.6.git/arch/x86/kernel/apic_32.c 2008-07-24 14:22:00.000000000 +0400 @@ -205,11 +205,15 @@ EXPORT_SYMBOL_GPL(apic_ops); */ void __cpuinit enable_NMI_through_LVT0(void) { - unsigned int v = APIC_DM_NMI; + unsigned int v; + + /* unmask and set to NMI */ + v = APIC_DM_NMI; - /* Level triggered for 82489DX */ + /* Level triggered for 82489DX (32bit mode) */ if (!lapic_is_integrated()) v |= APIC_LVT_LEVEL_TRIGGER; + apic_write(APIC_LVT0, v); } Index: linux-2.6.git/arch/x86/kernel/apic_64.c =================================================================== --- linux-2.6.git.orig/arch/x86/kernel/apic_64.c 2008-07-24 14:16:55.000000000 +0400 +++ linux-2.6.git/arch/x86/kernel/apic_64.c 2008-07-24 14:22:09.000000000 +0400 @@ -220,6 +220,11 @@ void __cpuinit enable_NMI_through_LVT0(v /* unmask and set to NMI */ v = APIC_DM_NMI; + + /* Level triggered for 82489DX (32bit mode) */ + if (!lapic_is_integrated()) + v |= APIC_LVT_LEVEL_TRIGGER; + apic_write(APIC_LVT0, v); }