From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Oct 2010 20:18:36 +0000 (-0700)
Subject: Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.37-rc1~208
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf70030dc0b031f000c74721f2e9c88686b7da6d;hp=--cc;p=pandora-kernel.git

Merge branch 'x86-cpu-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, cpu: Fix X86_FEATURE_NOPL
  x86, cpu: Re-run get_cpu_cap() after adjusting the CPUID level
---

bf70030dc0b031f000c74721f2e9c88686b7da6d
diff --cc arch/x86/kernel/cpu/cpu.h
index f668bb1f7d43,c16456bc11a7..e765633f210e
--- a/arch/x86/kernel/cpu/cpu.h
+++ b/arch/x86/kernel/cpu/cpu.h
@@@ -32,7 -32,7 +32,8 @@@ struct cpu_dev 
  extern const struct cpu_dev *const __x86_cpu_dev_start[],
  			    *const __x86_cpu_dev_end[];
  
+ extern void get_cpu_cap(struct cpuinfo_x86 *c);
  extern void cpu_detect_cache_sizes(struct cpuinfo_x86 *c);
 +extern void get_cpu_cap(struct cpuinfo_x86 *c);
  
  #endif