From: H. Peter Anvin <hpa@linux.intel.com>
Date: Fri, 1 Feb 2013 10:25:06 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/x86/mm' into x86/mm2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=68d00bbebb5a48b7a9056a8c03476a71ecbc30a6;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge remote-tracking branch 'origin/x86/mm' into x86/mm2

Explicitly merging these two branches due to nontrivial conflicts and
to allow further work.

Resolved Conflicts:
	arch/x86/kernel/head32.c
	arch/x86/kernel/head64.c
	arch/x86/mm/init_64.c
	arch/x86/realmode/init.c

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---

68d00bbebb5a48b7a9056a8c03476a71ecbc30a6
diff --cc arch/x86/mm/init_64.c
index e2fcbc34c9df,287c6d6a9ef1..edaa2daf4b37
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@@ -804,13 -772,10 +804,11 @@@ void set_kernel_text_ro(void
  void mark_rodata_ro(void)
  {
  	unsigned long start = PFN_ALIGN(_text);
- 	unsigned long rodata_start =
- 		((unsigned long)__start_rodata + PAGE_SIZE - 1) & PAGE_MASK;
+ 	unsigned long rodata_start = PFN_ALIGN(__start_rodata);
  	unsigned long end = (unsigned long) &__end_rodata_hpage_align;
- 	unsigned long text_end = PAGE_ALIGN((unsigned long) &__stop___ex_table);
- 	unsigned long rodata_end = PAGE_ALIGN((unsigned long) &__end_rodata);
- 	unsigned long data_start = (unsigned long) &_sdata;
+ 	unsigned long text_end = PFN_ALIGN(&__stop___ex_table);
+ 	unsigned long rodata_end = PFN_ALIGN(&__end_rodata);
 +	unsigned long all_end = PFN_ALIGN(&_end);
  
  	printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n",
  	       (end - start) >> 10);