Commit df133e8f 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/tip 

Pull x86 mm updates from Ingo Molnar:
 "This tree includes the following changes:

   - fix memory hotplug
   - fix hibernation bootup memory layout assumptions
   - fix hyperv numa guest kernel messages
   - remove dead code
   - update documentation"

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Update memory map description to list hypervisor-reserved area
  x86/mm, hibernate: Do not assume the first e820 area to be RAM
  x86/mm/numa: Drop dead code and rename setup_node_data() to setup_alloc_data()
  x86/mm/hotplug: Modify PGD entry when removing memory
  x86/mm/hotplug: Pass sync_global_pgds() a correct argument in remove_pagetable()
  x86: Remove set_pmd_pfn
parents e3438330 beb9147e

Documentation/x86/x86_64/mm.txt

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 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

ffff800000000000 - ffff87ffffffffff (=43 bits) guard hole, reserved for hypervisor

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

ffffc80000000000 - ffffc8ffffffffff (=40 bits) hole

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

arch/x86/include/asm/numa.h

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#ifdef CONFIG_NUMA



#define NR_NODE_MEMBLKS		(MAX_NUMNODES*2)

#define ZONE_ALIGN (1UL << (MAX_ORDER+PAGE_SHIFT))



/*

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

arch/x86/include/asm/pgtable_32.h

+0 −3
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ static inline void pgtable_cache_init(void) { } 
static inline void check_pgt_cache(void) { }

void paging_init(void);



extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);





/*

 * Define this if things work differently on an i386 and an i486:

 * it will (on an i486) warn about kernel memory accesses that are

arch/x86/include/asm/pgtable_64.h

+2 −1
Original line number Diff line number Diff line
@@ -116,7 +116,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);

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

			     int removed);



/*

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

arch/x86/kernel/e820.c

+3 −4
Original line number Diff line number Diff line
@@ -682,15 +682,14 @@ void __init parse_e820_ext(u64 phys_addr, u32 data_len) 
 * hibernation (32 bit) or software suspend and suspend to RAM (64 bit).

 *

 * This function requires the e820 map to be sorted and without any

 * overlapping entries and assumes the first e820 area to be RAM.

 * overlapping entries.

 */

void __init e820_mark_nosave_regions(unsigned long limit_pfn)

{

	int i;

	unsigned long pfn;

	unsigned long pfn = 0;



	pfn = PFN_DOWN(e820.map[0].addr + e820.map[0].size);

	for (i = 1; i < e820.nr_map; i++) {

	for (i = 0; i < e820.nr_map; i++) {

		struct e820entry *ei = &e820.map[i];



		if (pfn < PFN_UP(ei->addr))

CRA Git | Maintained and supported by SUSTech CRA and CCSE