View | Details | Raw Unified
Collapse All | Expand All

(-) file_not_specified_in_diff (+48 lines)
 Lines 16-21    Link Here 
#include <linux/string.h>
#include <linux/string.h>
#include <linux/kexec.h>
#include <linux/kexec.h>
#include <linux/module.h>
#include <linux/module.h>
#include <linux/mm.h>
#include <asm/pgtable.h>
#include <asm/pgtable.h>
#include <asm/page.h>
#include <asm/page.h>
 Lines 293-298   void __init e820_reserve_resources(void) Link Here 
	}
	}
}
}
/* Mark pages corresponding to given address range as nosave */
static void __init
e820_mark_nosave_range(unsigned long start, unsigned long end)
{
	unsigned long pfn, max_pfn;
	if (start >= end)
		return;
	printk("Nosave address range: %016lx - %016lx\n", start, end);
	max_pfn = end >> PAGE_SHIFT;
	for (pfn = start >> PAGE_SHIFT; pfn < max_pfn; pfn++)
		if (pfn_valid(pfn))
			SetPageNosave(pfn_to_page(pfn));
}
/*
 * Find the ranges of physical addresses that do not correspond to
 * e820 RAM areas and mark the corresponding pages as nosave for software
 * suspend and suspend to RAM.
 *
 * This function requires the e820 map to be sorted and without any
 * overlapping entries and assumes the first e820 area to be RAM.
 */
void __init e820_mark_nosave_regions(void)
{
	int i;
	unsigned long paddr;
	paddr = round_down(e820.map[0].addr + e820.map[0].size, PAGE_SIZE);
	for (i = 1; i < e820.nr_map; i++) {
		struct e820entry *ei = &e820.map[i];
		if (paddr < ei->addr)
			e820_mark_nosave_range(paddr,
					round_up(ei->addr, PAGE_SIZE));
		paddr = round_down(ei->addr + ei->size, PAGE_SIZE);
		if (ei->type != E820_RAM)
			e820_mark_nosave_range(round_up(ei->addr, PAGE_SIZE),
					paddr);
		if (paddr >= (end_pfn << PAGE_SHIFT))
			break;
	}
}
/*
/*
 * Add a memory region to the kernel e820 map.
 * Add a memory region to the kernel e820 map.
 */
 */
(-) linux-2.6.18-rc1-mm2/arch/x86_64/kernel/setup.c (+1 lines)
 Lines 684-689   void __init setup_arch(char **cmdline_p) Link Here 
	probe_roms();
	probe_roms();
	e820_reserve_resources();
	e820_reserve_resources();
	e820_mark_nosave_regions();
	request_resource(&iomem_resource, &video_ram_resource);
	request_resource(&iomem_resource, &video_ram_resource);
(-) linux-2.6.18-rc1-mm2/include/asm-x86_64/e820.h (-1 / +1 lines)
 Lines 46-51   extern void setup_memory_region(void); Link Here 
extern void contig_e820_setup(void);
extern void contig_e820_setup(void);
extern unsigned long e820_end_of_ram(void);
extern unsigned long e820_end_of_ram(void);
extern void e820_reserve_resources(void);
extern void e820_reserve_resources(void);
extern void e820_mark_nosave_regions(void);
extern void e820_print_map(char *who);
extern void e820_print_map(char *who);
extern int e820_any_mapped(unsigned long start, unsigned long end, unsigned type);
extern int e820_any_mapped(unsigned long start, unsigned long end, unsigned type);
extern int e820_all_mapped(unsigned long start, unsigned long end, unsigned type);
extern int e820_all_mapped(unsigned long start, unsigned long end, unsigned type);