Re: [PATCH 2/2] x86, e820 disable ACPI Memory Hotplug if memorymapping is specified by user [v2]

[Toshi Kani]

On Fri, 2014-01-10 at 14:04 -0500, Prarit Bhargava wrote:
 :
>  arch/x86/kernel/e820.c         |   10 +++++++++-
>  drivers/acpi/acpi_memhotplug.c |    7 ++++++-
>  include/linux/memory_hotplug.h |    3 +++
>  3 files changed, 18 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
> index 174da5f..747f36a 100644
> --- a/arch/x86/kernel/e820.c
> +++ b/arch/x86/kernel/e820.c
> @@ -20,6 +20,7 @@
>  #include <linux/firmware-map.h>
>  #include <linux/memblock.h>
>  #include <linux/sort.h>
> +#include <linux/memory_hotplug.h>
>  
>  #include <asm/e820.h>
>  #include <asm/proto.h>
> @@ -834,6 +835,8 @@ static int __init parse_memopt(char *p)
>  		return -EINVAL;
>  	e820_remove_range(mem_size, ULLONG_MAX - mem_size, E820_RAM, 1);
>  
> +	set_acpi_no_memhotplug();
> +

It won't build when CONFIG_ACPI_HOTPLUG_MEMORY is not defined.

Thanks,
-Toshi




--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/