git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.34-rc6'
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
cpuid.c
diff --git
a/arch/x86/kernel/cpuid.c
b/arch/x86/kernel/cpuid.c
index 83e5e628de73a7234f90c2f7130e98fa4df4fe4e..8b862d5900fe4a29b6bc100770e371db41ee0d91 100644
(file)
--- a/
arch/x86/kernel/cpuid.c
+++ b/
arch/x86/kernel/cpuid.c
@@
-40,6
+40,7
@@
#include <linux/cpu.h>
#include <linux/notifier.h>
#include <linux/uaccess.h>
+#include <linux/gfp.h>
#include <asm/processor.h>
#include <asm/msr.h>