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

Commit 6c4fa560 authored by Venkatesh Pallipadi's avatar Venkatesh Pallipadi Committed by Len Brown
Browse files

[ACPI] fix C1 patch for IA64 

http://bugzilla.kernel.org/show_bug.cgi?id=4233



Signed-off-by: default avatarVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent ef7b06cd

arch/ia64/kernel/process.c

+1 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ update_pal_halt_status(int status) 
void

default_idle (void)

{

	local_irq_enable();

	while (!need_resched())

		if (can_do_pal_halt)

			safe_halt();

arch/ia64/kernel/setup.c

+3 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ 
#include <linux/serial_core.h>

#include <linux/efi.h>

#include <linux/initrd.h>

#include <linux/platform.h>

#include <linux/pm.h>



#include <asm/ia32.h>

#include <asm/machvec.h>
@@ -779,6 +781,7 @@ cpu_init (void) 
	/* size of physical stacked register partition plus 8 bytes: */

	__get_cpu_var(ia64_phys_stacked_size_p8) = num_phys_stacked*8 + 8;

	platform_cpu_init();

	pm_idle = default_idle;

}



void