From: Prarit Bhargava <prarit@redhat.com>
Date: Wed, 10 Jun 2009 19:41:02 +0000 (-0700)
Subject: x86: nmi: Add Intel processor 0x6f4 to NMI perfctr1 workaround
X-Git-Tag: v2.6.31-rc1~97^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe955e5c793aab398794be4c5ede172d48446c4a;p=pandora-kernel.git

x86: nmi: Add Intel processor 0x6f4 to NMI perfctr1 workaround

Expand Intel NMI perfctr1 workaround to include a Core2 processor stepping
(cpuid family-6, model-f, stepping-4).  Resolves a situation where the NMI
would not enable on these processors.

Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Acked-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: prarit@redhat.com
Cc: suresh.b.siddha@intel.com
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

Reading git-diff-tree failed