xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'linus' into WIP.x86/boot, to fix up conflicts and to pick up updates

Browse Source 
Conflicts:
	arch/x86/xen/setup.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2017-03-01 09:02:26 +01:00
parent e22af0be2c 2d6be4abf5
commit 0871d5a66d
10951 changed files with 457964 additions and 203995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/mm/init_32.c
View File

@@ -864,9 +864,6 @@ static noinline int do_test_wp_bit(void)
return flag;
}
const int rodata_test_data = 0xC3;
EXPORT_SYMBOL_GPL(rodata_test_data);
int kernel_set_to_readonly __read_mostly;
void set_kernel_text_rw(void)
@@ -939,7 +936,6 @@ void mark_rodata_ro(void)
set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n",
size >> 10);
rodata_test();
#ifdef CONFIG_CPA_DEBUG
printk(KERN_INFO "Testing CPA: undo %lx-%lx\n", start, start + size);