Re: [tip:x86/urgent] x86, nx: Mark the ACPI resume trampoline codeas +x - fixed

[Marc Koschewski]

* tip-bot for H. Peter Anvin <hpa@xxxxxxxxx> [2011-02-07 09:24:55 +0000]:

Great! That one fixes ACPI S3 resume on i7.

Regards,
Marc

> Commit-ID:  d344e38b2c151ca5e5e39f562017127e93912528
> Gitweb:     http://git.kernel.org/tip/d344e38b2c151ca5e5e39f562017127e93912528
> Author:     H. Peter Anvin <hpa@xxxxxxxxx>
> AuthorDate: Sun, 6 Feb 2011 21:16:09 -0800
> Committer:  Ingo Molnar <mingo@xxxxxxx>
> CommitDate: Mon, 7 Feb 2011 09:07:13 +0100
> 
> x86, nx: Mark the ACPI resume trampoline code as +x
> 
> We reserve lowmem for the things that need it, like the ACPI
> wakeup code, way early to guarantee availability.  This happens
> before we set up the proper pagetables, so set_memory_x() has no
> effect.
> 
> Until we have a better solution, use an initcall to mark the
> wakeup code executable.
> 
> Originally-by: Matthieu Castet <castet.matthieu@xxxxxxx>
> Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
> Cc: Matthias Hopf <mhopf@xxxxxxx>
> Cc: rjw@xxxxxxx
> Cc: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
> LKML-Reference: <4D4F8019.2090104@xxxxxxxxx>
> Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
> ---
>  arch/x86/kernel/acpi/sleep.c |   13 ++++++++++---
>  1 files changed, 10 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
> index 4d9ebba..68d1537 100644
> --- a/arch/x86/kernel/acpi/sleep.c
> +++ b/arch/x86/kernel/acpi/sleep.c
> @@ -12,10 +12,8 @@
>  #include <linux/cpumask.h>
>  #include <asm/segment.h>
>  #include <asm/desc.h>
> -
> -#ifdef CONFIG_X86_32
>  #include <asm/pgtable.h>
> -#endif
> +#include <asm/cacheflush.h>
>  
>  #include "realmode/wakeup.h"
>  #include "sleep.h"
> @@ -149,6 +147,15 @@ void __init acpi_reserve_wakeup_memory(void)
>  	memblock_x86_reserve_range(mem, mem + WAKEUP_SIZE, "ACPI WAKEUP");
>  }
>  
> +int __init acpi_configure_wakeup_memory(void)
> +{
> +	if (acpi_realmode)
> +		set_memory_x(acpi_realmode, WAKEUP_SIZE >> PAGE_SHIFT);
> +
> +	return 0;
> +}
> +arch_initcall(acpi_configure_wakeup_memory);
> +
>  
>  static int __init acpi_sleep_setup(char *str)
>  {
> --
> 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/
> 
> 

-- 
Marc Koschewski
--
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/