debuggers.hg

changeset 20644:1f5f1674e53f

SRAT memory hotplug 1/2: Revert 20053:ebb07c5934c8.

Signed-off-by: Jiang, Yunhong <yunhong.jiang@intel.com>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Dec 09 10:41:37 2009 +0000 (2009-12-09)
parents 7f611de6b93c
children e5a757ce7845
files xen/arch/x86/srat.c
line diff
     1.1 --- a/xen/arch/x86/srat.c	Tue Dec 08 14:14:27 2009 +0000
     1.2 +++ b/xen/arch/x86/srat.c	Wed Dec 09 10:41:37 2009 +0000
     1.3 @@ -185,21 +185,10 @@ acpi_numa_memory_affinity_init(struct ac
     1.4  		bad_srat();
     1.5  		return;
     1.6  	}
     1.7 -	if (ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) {
     1.8 -		if (page_is_ram_type(paddr_to_pfn(start), RAM_TYPE_CONVENTIONAL))
     1.9 -			printk(KERN_INFO "SRAT: hot-pluggable zone found %"PRIx64" - %"PRIx64" \n",
    1.10 +	/* It is fine to add this area to the nodes data it will be used later*/
    1.11 +	if (ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE)
    1.12 +		printk(KERN_INFO "SRAT: hot plug zone found %"PRIx64" - %"PRIx64" \n",
    1.13  				start, end);
    1.14 -		else {
    1.15 -			/* TODO: This range contains no existing memory yet,
    1.16 -			 * and shouldn't be included in nodes' [start, end]. It
    1.17 -			 * will be covered with physical memory hotplug support
    1.18 -			 * in future.
    1.19 -			 */
    1.20 -			printk(KERN_INFO "SRAT: future hotplug zone found %"PRIx64" - %"PRIx64" \n",
    1.21 -				start, end);
    1.22 -			return;
    1.23 -		}
    1.24 -	}
    1.25  	i = conflicting_nodes(start, end);
    1.26  	if (i == node) {
    1.27  		printk(KERN_WARNING