Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3b86a29 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86-32, percpu: Correct the ordering of the percpu readmostly section
  x86, mm: Enable ARCH_DMA_ADDR_T_64BIT with X86_64 || HIGHMEM64G
  x86: Spread tlb flush vector between nodes
  percpu: Introduce a read-mostly percpu API
  x86, mm: Fix incorrect data type in vmalloc_sync_all()
  x86, mm: Hold mm->page_table_lock while doing vmalloc_sync
  x86, mm: Fix bogus whitespace in sync_global_pgds()
  x86-32: Fix sparse warning for the __PHYSICAL_MASK calculation
  x86, mm: Add RESERVE_BRK_ARRAY() helper
  mm, x86: Saving vmcore with non-lazy freeing of vmas
  x86, kdump: Change copy_oldmem_page() to use cached addressing
  x86, mm: fix uninitialized addr in kernel_physical_mapping_init()
  x86, kmemcheck: Remove double test
  x86, mm: Make spurious_fault check explicitly check the PRESENT bit
  x86-64, mem: Update all PGDs for direct mapping and vmemmap mapping changes
  x86, mm: Separate x86_64 vmalloc_sync_all() into separate functions
  x86, mm: Avoid unnecessary TLB flush
parents 8d8d2e9c 2aeb66d3

arch/x86/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -1163,6 +1163,9 @@ config X86_PAE 
config ARCH_PHYS_ADDR_T_64BIT

	def_bool X86_64 || X86_PAE



config ARCH_DMA_ADDR_T_64BIT

	def_bool X86_64 || HIGHMEM64G



config DIRECT_GBPAGES

	bool "Enable 1GB pages for kernel pagetables" if EMBEDDED

	default y

arch/x86/include/asm/io.h

+1 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size) 


extern void iounmap(volatile void __iomem *addr);



extern void set_iounmap_nonlazy(void);



#ifdef __KERNEL__

arch/x86/include/asm/page_types.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#define PAGE_SIZE	(_AC(1,UL) << PAGE_SHIFT)

#define PAGE_MASK	(~(PAGE_SIZE-1))



#define __PHYSICAL_MASK		((phys_addr_t)(1ULL << __PHYSICAL_MASK_SHIFT) - 1)

#define __PHYSICAL_MASK		((phys_addr_t)((1ULL << __PHYSICAL_MASK_SHIFT) - 1))

#define __VIRTUAL_MASK		((1UL << __VIRTUAL_MASK_SHIFT) - 1)



/* Cast PAGE_MASK to a signed type so that it is sign-extended if

arch/x86/include/asm/pgtable.h

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]; 
extern spinlock_t pgd_lock;

extern struct list_head pgd_list;



extern struct mm_struct *pgd_page_get_mm(struct page *page);



#ifdef CONFIG_PARAVIRT

#include <asm/paravirt.h>

#else  /* !CONFIG_PARAVIRT */
@@ -603,6 +605,8 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, 
	pte_update(mm, addr, ptep);

}



#define flush_tlb_fix_spurious_fault(vma, address)



/*

 * clone_pgd_range(pgd_t *dst, pgd_t *src, int count);

 *

arch/x86/include/asm/pgtable_64.h

+2 −0
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ static inline void native_pgd_clear(pgd_t *pgd) 
	native_set_pgd(pgd, native_make_pgd(0));

}



extern void sync_global_pgds(unsigned long start, unsigned long end);



/*

 * Conversion functions: convert a page and protection to a page entry,

 * and a page entry and page directory to the page they refer to.