Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06262a6b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, nx: Mark the ACPI resume trampoline code as +x
parents fb2b2a1d d344e38b

arch/x86/kernel/acpi/sleep.c

+10 −3
Original line number Diff line number Diff line
@@ -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)

{