Merge commit 'v3.4-rc4' into next

[~andy/linux] / arch / x86 / kernel / test_nx.c

diff --git a/arch/x86/kernel/test_nx.c b/arch/x86/kernel/test_nx.c
index 10b8a6f69f84d51348827655903580cdfa6a5e93..3f92ce07e525fd41167a64f9d7c4df1bfbe673bf 100644 (file)
--- a/arch/x86/kernel/test_nx.c
+++ b/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>
 
@@ -159,7 +161,7 @@ static int test_NX(void)
        }
 
 #endif
-       return 0;
+       return ret;
 }
 
 static void test_exit(void)