From bf374b11122e92d14ab16cbcd581b6ac610e3a8a Mon Sep 17 00:00:00 2001
From: "Robert P. J. Day" <rpjday@crashcourse.ca>
Date: Thu, 13 Mar 2008 21:47:32 -0400
Subject: [PATCH] --- yaml --- r: 88883 b: refs/heads/master c:
 0054f4b708d21bd0032480cf7309d17753bc17bb h: refs/heads/master i:   88881:
 fbc57bae55fcb5103994debab63fea255fa25193   88879:
 51e73c1f01c4b0694124cf269845df3481ab9ebd v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/nmi_32.c  | 1 +
 trunk/arch/x86/kernel/test_nx.c | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fc7e0fb7eef4..41557940383d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7d909d5475bb27d261389a3902860e086b0d4c9
+refs/heads/master: 0054f4b708d21bd0032480cf7309d17753bc17bb
diff --git a/trunk/arch/x86/kernel/nmi_32.c b/trunk/arch/x86/kernel/nmi_32.c
index 9cfc094eddb0..662e63e1cd57 100644
--- a/trunk/arch/x86/kernel/nmi_32.c
+++ b/trunk/arch/x86/kernel/nmi_32.c
@@ -22,6 +22,7 @@
 #include <linux/cpumask.h>
 #include <linux/kernel_stat.h>
 #include <linux/kdebug.h>
+#include <linux/slab.h>
 
 #include <asm/smp.h>
 #include <asm/nmi.h>
diff --git a/trunk/arch/x86/kernel/test_nx.c b/trunk/arch/x86/kernel/test_nx.c
index 10b8a6f69f84..787a5e499dd1 100644
--- a/trunk/arch/x86/kernel/test_nx.c
+++ b/trunk/arch/x86/kernel/test_nx.c
@@ -11,6 +11,8 @@
  */
 #include <linux/module.h>
 #include <linux/sort.h>
+#include <linux/slab.h>
+
 #include <asm/uaccess.h>
 #include <asm/asm.h>