Commit 3596f5bb authored Jan 25, 2013 by H. Peter Anvin

Merge branch 'x86/mm' of ssh://ra.kernel.org/pub/scm/linux/kernel/git/tip/tip into x86/mm



Add missing patch from the __pa_symbol conversion series by Alexander
Duyck.

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

parents 6a3956bd 5e4bf1a5

arch/x86/kernel/head32.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ static void __init i386_default_early_setup(void)
		void __init i386_start_kernel(void)
		{
		memblock_reserve(__pa_symbol(_text),
		(phys_addr_t)__bss_stop - (phys_addr_t)_text);
		(unsigned long)__bss_stop - (unsigned long)_text);

		#ifdef CONFIG_BLK_DEV_INITRD
		/* Reserve INITRD */

arch/x86/kernel/head64.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ void __init x86_64_start_reservations(char *real_mode_data)
		copy_bootdata(__va(real_mode_data));

		memblock_reserve(__pa_symbol(_text),
		(phys_addr_t)__bss_stop - (phys_addr_t)_text);
		(unsigned long)__bss_stop - (unsigned long)_text);

		#ifdef CONFIG_BLK_DEV_INITRD
		/* Reserve INITRD */

arch/x86/mm/pgtable.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -328,7 +328,12 @@ int pmdp_set_access_flags(struct vm_area_struct *vma,
		if (changed && dirty) {
		*pmdp = entry;
		pmd_update_defer(vma->vm_mm, address, pmdp);
		flush_tlb_range(vma, address, address + HPAGE_PMD_SIZE);
		/*
		* We had a write-protection fault here and changed the pmd
		* to to more permissive. No need to flush the TLB for that,
		* #PF is architecturally guaranteed to do that and in the
		* worst-case we'll generate a spurious fault.
		*/
		}

		return changed;