From 88bd0fbb67c21fc6fa9aaf36e1db939e234ed48a Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Tue, 8 Feb 2011 23:41:35 +0100
Subject: [PATCH] --- yaml --- r: 241676 b: refs/heads/master c:
 c41b93fb8551148a93d3bba870365e8489317f02 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/ia64/include/asm/acpi.h | 4 ++--
 trunk/arch/ia64/kernel/acpi.c      | 5 -----
 trunk/arch/x86/include/asm/acpi.h  | 3 +--
 trunk/arch/x86/kernel/acpi/sleep.c | 8 --------
 trunk/drivers/acpi/sleep.c         | 4 ----
 6 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index 6b6aedb27c52..fb63c65b8714 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c19f9a84ec807da57fd75bbd9a3f2b8269611f79
+refs/heads/master: c41b93fb8551148a93d3bba870365e8489317f02
diff --git a/trunk/arch/ia64/include/asm/acpi.h b/trunk/arch/ia64/include/asm/acpi.h
index 837dc82a013e..db3986a71af8 100644
--- a/trunk/arch/ia64/include/asm/acpi.h
+++ b/trunk/arch/ia64/include/asm/acpi.h
@@ -128,9 +128,9 @@ static inline const char *acpi_get_sysname (void)
 int acpi_request_vector (u32 int_type);
 int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
 
-/* routines for saving/restoring kernel state */
+/* Routine for saving kernel state during suspend. */
 extern int acpi_save_state_mem(void);
-extern void acpi_restore_state_mem(void);
+
 extern unsigned long acpi_wakeup_address;
 
 /*
diff --git a/trunk/arch/ia64/kernel/acpi.c b/trunk/arch/ia64/kernel/acpi.c
index 90ebceb899a0..7cf2d10c0677 100644
--- a/trunk/arch/ia64/kernel/acpi.c
+++ b/trunk/arch/ia64/kernel/acpi.c
@@ -1040,11 +1040,6 @@ EXPORT_SYMBOL(acpi_unregister_ioapic);
  */
 int acpi_save_state_mem(void) { return 0; } 
 
-/*
- * acpi_restore_state()
- */
-void acpi_restore_state_mem(void) {}
-
 /*
  * do_suspend_lowlevel()
  */
diff --git a/trunk/arch/x86/include/asm/acpi.h b/trunk/arch/x86/include/asm/acpi.h
index 211ca3f7fd16..47981f0d121b 100644
--- a/trunk/arch/x86/include/asm/acpi.h
+++ b/trunk/arch/x86/include/asm/acpi.h
@@ -112,9 +112,8 @@ static inline void acpi_disable_pci(void)
 	acpi_noirq_set();
 }
 
-/* routines for saving/restoring kernel state */
+/* Routine for saving kernel state during suspend. */
 extern int acpi_save_state_mem(void);
-extern void acpi_restore_state_mem(void);
 
 extern unsigned long acpi_wakeup_address;
 
diff --git a/trunk/arch/x86/kernel/acpi/sleep.c b/trunk/arch/x86/kernel/acpi/sleep.c
index 68d1537b8c81..c27a483094b1 100644
--- a/trunk/arch/x86/kernel/acpi/sleep.c
+++ b/trunk/arch/x86/kernel/acpi/sleep.c
@@ -110,14 +110,6 @@ int acpi_save_state_mem(void)
 	return 0;
 }
 
-/*
- * acpi_restore_state - undo effects of acpi_save_state_mem
- */
-void acpi_restore_state_mem(void)
-{
-}
-
-
 /**
  * acpi_reserve_wakeup_memory - do _very_ early ACPI initialisation
  *
diff --git a/trunk/drivers/acpi/sleep.c b/trunk/drivers/acpi/sleep.c
index d6a8cd14de2e..67dcd3886563 100644
--- a/trunk/drivers/acpi/sleep.c
+++ b/trunk/drivers/acpi/sleep.c
@@ -293,10 +293,6 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
 	local_irq_restore(flags);
 	printk(KERN_DEBUG "Back to C!\n");
 
-	/* restore processor state */
-	if (acpi_state == ACPI_STATE_S3)
-		acpi_restore_state_mem();
-
 	suspend_nvs_restore();
 
 	return ACPI_SUCCESS(status) ? 0 : -EFAULT;