[mmotm] pm-acpi-hibernation-utilize-hardware-signature.patch causes build error

[mmotm] pm-acpi-hibernation-utilize-hardware-signature.patch causes build error

[Valdis.Kletnieks]

[-- Attachment #1: Type: text/plain, Size: 447 bytes --]

Patch pm-acpi-hibernation-utilize-hardware-signature.patch in the 07/11 mmotm
causes a link error:

  LD      .tmp_vmlinux1
arch/x86/kernel/built-in.o: In function `acpi_sleep_setup':
sleep.c:(.init.text+0x6854): undefined reference to `acpi_no_s4_hw_signature'

Not at all surprising, since the patch doesn't actually include a body
for the function, only references.  Did a (hopefully) previous patch that
added the body get lost along the way?

[-- Attachment #2: Type: application/pgp-signature, Size: 226 bytes --]

Re: [mmotm] pm-acpi-hibernation-utilize-hardware-signature.patch causes build error

[Shaohua Li]

On Sun, 2008-07-13 at 04:44 -0400, Valdis.Kletnieks@vt.edu wrote:
> Patch pm-acpi-hibernation-utilize-hardware-signature.patch in the 07/11 mmotm
> causes a link error:
> 
>   LD      .tmp_vmlinux1
> arch/x86/kernel/built-in.o: In function `acpi_sleep_setup':
> sleep.c:(.init.text+0x6854): undefined reference to `acpi_no_s4_hw_signature'
> 
> Not at all surprising, since the patch doesn't actually include a body
> for the function, only references.  Did a (hopefully) previous patch that
> added the body get lost along the way?
this should fix it.

---
 arch/x86/kernel/acpi/sleep.c |    2 ++
 1 file changed, 2 insertions(+)

Index: linux-next/arch/x86/kernel/acpi/sleep.c
===================================================================
--- linux-next.orig/arch/x86/kernel/acpi/sleep.c	2008-07-14 11:02:28.000000000 +0800
+++ linux-next/arch/x86/kernel/acpi/sleep.c	2008-07-14 11:03:08.000000000 +0800
@@ -140,8 +140,10 @@ static int __init acpi_sleep_setup(char 
 			acpi_realmode_flags |= 2;
 		if (strncmp(str, "s3_beep", 7) == 0)
 			acpi_realmode_flags |= 4;
+#ifdef CONFIG_HIBERNATION
 		if (strncmp(str, "s4_nohwsig", 10) == 0)
 			acpi_no_s4_hw_signature();
+#endif
 		if (strncmp(str, "old_ordering", 12) == 0)
 			acpi_old_suspend_ordering();
 		str = strchr(str, ',');