diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-04-11 11:16:39 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-04-11 11:16:39 +0800 |
| commit | d83731cf53fd3af7173cab5e3f573d06ebc852be (patch) | |
| tree | d61002ed1d894fe2d9b26003a1230f05a61ed51b /arch/x86/mm/init_64.c | |
| parent | bfbd381ea0ca274e4c07ea62acaaeac31829cd5d (diff) | |
| parent | 017cfa86c2450b158d7d0336f2f3ea685da1230b (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-rtlsk-v4.1-16.04-rt
Diffstat (limited to 'arch/x86/mm/init_64.c')
| -rw-r--r-- | arch/x86/mm/init_64.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index f9977a7a9444..e10635a19727 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -1062,7 +1062,6 @@ void __init mem_init(void) mem_init_print_info(NULL); } -#ifdef CONFIG_DEBUG_RODATA const int rodata_test_data = 0xC3; EXPORT_SYMBOL_GPL(rodata_test_data); @@ -1152,8 +1151,6 @@ void mark_rodata_ro(void) (unsigned long) __va(__pa_symbol(_sdata))); } -#endif - int kern_addr_valid(unsigned long addr) { unsigned long above = ((long)addr) >> __VIRTUAL_MASK_SHIFT; |