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

Commit bb776296 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: (22 commits)
  x86: fix system without memory on node0
  x86, mm: Fix node_possible_map logic
  mm, x86: remove MEMORY_HOTPLUG_RESERVE related code
  x86: make sparse mem work in non-NUMA mode
  x86: process.c, remove useless headers
  x86: merge process.c a bit
  x86: use sparse_memory_present_with_active_regions() on UMA
  x86: unify 64-bit UMA and NUMA paging_init()
  x86: Allow 1MB of slack between the e820 map and SRAT, not 4GB
  x86: Sanity check the e820 against the SRAT table using e820 map only
  x86: clean up and and print out initial max_pfn_mapped
  x86/pci: remove rounding quirk from e820_setup_gap()
  x86, e820, pci: reserve extra free space near end of RAM
  x86: fix typo in address space documentation
  x86: 46 bit physical address support on 64 bits
  x86, mm: fault.c, use printk_once() in is_errata93()
  x86: move per-cpu mmu_gathers to mm/init.c
  x86: move max_pfn_mapped and max_low_pfn_mapped to setup.c
  x86: unify noexec handling
  x86: remove (null) in /sys kernel_page_tables
  ...
parents 48c72d1a 35d5a9a6

Documentation/x86/x86_64/boot-options.txt

+0 −5
Original line number Diff line number Diff line
@@ -150,11 +150,6 @@ NUMA 
		Otherwise, the remaining system RAM is allocated to an

		additional node.



  numa=hotadd=percent

		Only allow hotadd memory to preallocate page structures upto

		percent of already available memory.

		numa=hotadd=0 will disable hotadd memory.



ACPI



  acpi=off	Don't enable ACPI

Documentation/x86/x86_64/mm.txt

+5 −4
Original line number Diff line number Diff line
@@ -6,10 +6,11 @@ Virtual memory map with 4 level page tables: 
0000000000000000 - 00007fffffffffff (=47 bits) user space, different per mm

hole caused by [48:63] sign extension

ffff800000000000 - ffff80ffffffffff (=40 bits) guard hole

ffff880000000000 - ffffc0ffffffffff (=57 TB) direct mapping of all phys. memory

ffffc10000000000 - ffffc1ffffffffff (=40 bits) hole

ffffc20000000000 - ffffe1ffffffffff (=45 bits) vmalloc/ioremap space

ffffe20000000000 - ffffe2ffffffffff (=40 bits) virtual memory map (1TB)

ffff880000000000 - ffffc7ffffffffff (=64 TB) direct mapping of all phys. memory

ffffc80000000000 - ffffc8ffffffffff (=40 bits) hole

ffffc90000000000 - ffffe8ffffffffff (=45 bits) vmalloc/ioremap space

ffffe90000000000 - ffffe9ffffffffff (=40 bits) hole

ffffea0000000000 - ffffeaffffffffff (=40 bits) virtual memory map (1TB)

... unused hole ...

ffffffff80000000 - ffffffffa0000000 (=512 MB)  kernel text mapping, from phys 0

ffffffffa0000000 - fffffffffff00000 (=1536 MB) module mapping space

arch/x86/include/asm/numa_64.h

+7 −3
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ extern int compute_hash_shift(struct bootnode *nodes, int numblks, 
extern void numa_init_array(void);

extern int numa_off;



extern void srat_reserve_add_area(int nodeid);

extern int hotadd_percent;



extern s16 apicid_to_node[MAX_LOCAL_APIC];



extern unsigned long numa_free_all_bootmem(void);
@@ -27,6 +24,13 @@ extern void setup_node_bootmem(int nodeid, unsigned long start, 
			       unsigned long end);



#ifdef CONFIG_NUMA

/*

 * Too small node sizes may confuse the VM badly. Usually they

 * result from BIOS bugs. So dont recognize nodes as standalone

 * NUMA entities that have less than this amount of RAM listed:

 */

#define NODE_MIN_SIZE (4*1024*1024)



extern void __init init_cpu_to_node(void);

extern void __cpuinit numa_set_node(int cpu, int node);

extern void __cpuinit numa_clear_node(int cpu);

arch/x86/include/asm/page_32_types.h

+0 −4
Original line number Diff line number Diff line
@@ -54,10 +54,6 @@ extern unsigned int __VMALLOC_RESERVE; 
extern int sysctl_legacy_va_layout;



extern void find_low_pfn_range(void);

extern unsigned long init_memory_mapping(unsigned long start,

					 unsigned long end);

extern void initmem_init(unsigned long, unsigned long);

extern void free_initmem(void);

extern void setup_bootmem_allocator(void);



#endif	/* !__ASSEMBLY__ */

arch/x86/include/asm/page_64_types.h

+1 −7
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#define __START_KERNEL		(__START_KERNEL_map + __PHYSICAL_START)

#define __START_KERNEL_map	_AC(0xffffffff80000000, UL)



/* See Documentation/x86_64/mm.txt for a description of the memory map. */

/* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */

#define __PHYSICAL_MASK_SHIFT	46

#define __VIRTUAL_MASK_SHIFT	48
@@ -63,12 +63,6 @@ extern unsigned long __phys_addr(unsigned long); 


#define vmemmap ((struct page *)VMEMMAP_START)



extern unsigned long init_memory_mapping(unsigned long start,

					 unsigned long end);



extern void initmem_init(unsigned long start_pfn, unsigned long end_pfn);

extern void free_initmem(void);



extern void init_extra_mapping_uc(unsigned long phys, unsigned long size);

extern void init_extra_mapping_wb(unsigned long phys, unsigned long size);