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

Commit 46bbffad 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, mm: Unify kernel_physical_mapping_init() API
  x86, mm: Allow highmem user page tables to be disabled at boot time
  x86: Do not reserve brk for DMI if it's not going to be used
  x86: Convert tlbstate_lock to raw_spinlock
  x86: Use the generic page_is_ram()
  x86: Remove BIOS data range from e820
  Move page_is_ram() declaration to mm.h
  Generic page_is_ram: use __weak
  resources: introduce generic page_is_ram()
parents 85fe20bf c1fd1b43

Documentation/kernel-parameters.txt

+7 −0
Original line number Diff line number Diff line
@@ -2718,6 +2718,13 @@ and is between 256 and 4096 characters. It is defined in the file 
					medium is write-protected).

			Example: quirks=0419:aaf5:rl,0421:0433:rc



	userpte=

			[X86] Flags controlling user PTE allocations.



				nohigh = do not allocate PTE pages in

					HIGHMEM regardless of setting

					of CONFIG_HIGHPTE.



	vdso=		[X86,SH]

			vdso=2: enable compat VDSO (default with COMPAT_VDSO)

			vdso=1: enable VDSO (default)

arch/mips/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ void __init fixrange_init(unsigned long start, unsigned long end, 
}



#ifndef CONFIG_NEED_MULTIPLE_NODES

static int __init page_is_ram(unsigned long pagenr)

int page_is_ram(unsigned long pagenr)

{

	int i;

arch/score/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static unsigned long setup_zero_page(void) 
}



#ifndef CONFIG_NEED_MULTIPLE_NODES

static int __init page_is_ram(unsigned long pagenr)

int page_is_ram(unsigned long pagenr)

{

	if (pagenr >= min_low_pfn && pagenr < max_low_pfn)

		return 1;

arch/x86/include/asm/page_types.h

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 


#ifndef __ASSEMBLY__



extern int page_is_ram(unsigned long pagenr);

extern int devmem_is_allowed(unsigned long pagenr);



extern unsigned long max_low_pfn_mapped;

arch/x86/include/asm/pgalloc.h

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ static inline void paravirt_release_pmd(unsigned long pfn) {} 
static inline void paravirt_release_pud(unsigned long pfn) {}

#endif



/*

 * Flags to use when allocating a user page table page.

 */

extern gfp_t __userpte_alloc_gfp;



/*

 * Allocate and free page tables.

 */