projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
arch
/
x86
/
mm
/
init_32.c
diff --git
a/arch/x86/mm/init_32.c
b/arch/x86/mm/init_32.c
index a4bb1c7ab65eab79807ca8a9bc2dfc63ecc3ebde..bd7a9b9e2e14a595adfb1c86bbcfacb787a6579c 100644
(file)
--- a/
arch/x86/mm/init_32.c
+++ b/
arch/x86/mm/init_32.c
@@
-868,7
+868,6
@@
static noinline int do_test_wp_bit(void)
return flag;
}
-#ifdef CONFIG_DEBUG_RODATA
const int rodata_test_data = 0xC3;
EXPORT_SYMBOL_GPL(rodata_test_data);
@@
-957,5
+956,3
@@
void mark_rodata_ro(void)
if (__supported_pte_mask & _PAGE_NX)
debug_checkwx();
}
-#endif
-