diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 08:51:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 08:51:55 -0700 |
| commit | d7ef64a9f9987b29e3d911369a9d40122d5be2dd (patch) | |
| tree | c674cbed424876b95ddb23ec99344574be0dab39 /arch/x86/kernel/test_nx.c | |
| parent | ff2a9941ca27ab18169d17b3803aca68b154951c (diff) | |
| parent | 6ec5ff4bc3a90b7716eadc4c8a686e904131f03a (diff) | |
| download | kernel_samsung_tuna-d7ef64a9f9987b29e3d911369a9d40122d5be2dd.zip kernel_samsung_tuna-d7ef64a9f9987b29e3d911369a9d40122d5be2dd.tar.gz kernel_samsung_tuna-d7ef64a9f9987b29e3d911369a9d40122d5be2dd.tar.bz2 | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Eliminate various 'set but not used' warnings
x86, SMEP: Fix section mismatch warnings
x86, amd: Use _safe() msr access for GartTlbWlk disable code
Diffstat (limited to 'arch/x86/kernel/test_nx.c')
| -rw-r--r-- | arch/x86/kernel/test_nx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/test_nx.c b/arch/x86/kernel/test_nx.c index 787a5e4..3f92ce0 100644 --- 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) |