Merge branch 'master' into export-slabh
[kernel.git] / arch / x86 / kernel / smpboot.c
index 6808b93..763d815 100644 (file)
@@ -49,6 +49,7 @@
 #include <linux/nmi.h>
 #include <linux/tboot.h>
 #include <linux/stackprotector.h>
+#include <linux/gfp.h>
 
 #include <asm/acpi.h>
 #include <asm/desc.h>