Merge branch 'unlikely/sched' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted...

[~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 787a5e499dd1d395dcfdc160e4c1682913cab5b9..3f92ce07e525fd41167a64f9d7c4df1bfbe673bf 100644 (file)
--- a/arch/x86/kernel/test_nx.c
+++ b/arch/x86/kernel/test_nx.c
@@ -161,7 +161,7 @@ static int test_NX(void)
        }
 
 #endif
-       return 0;
+       return ret;
 }
 
 static void test_exit(void)