The patch titled
pm-acpi-hibernation-utilize-hardware-signature.patch causes build error
has been added to the -mm tree. Its filename is
pm-acpi-hibernation-utilize-hardware-signaturepatch-causes-build-error.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: pm-acpi-hibernation-utilize-hardware-signature.patch causes build error
From: Shaohua Li <shaohua.li@xxxxxxxxx>
On Sun, 2008-07-13 at 04:44 -0400, Valdis.Kletnieks@xxxxxx 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.
Reported-by: <Valdis.Kletnieks@xxxxxx>
Cc: Shaohua Li <shaohua.li@xxxxxxxxx>
Cc: Rafael J. Wysocki <rjw@xxxxxxx>
Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
Cc: Len Brown <lenb@xxxxxxxxxx>
Cc: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/kernel/acpi/sleep.c | 2 ++
1 file changed, 2 insertions(+)
diff -puN arch/x86/kernel/acpi/sleep.c~pm-acpi-hibernation-utilize-hardware-signaturepatch-causes-build-error arch/x86/kernel/acpi/sleep.c
--- a/arch/x86/kernel/acpi/sleep.c~pm-acpi-hibernation-utilize-hardware-signaturepatch-causes-build-error
+++ a/arch/x86/kernel/acpi/sleep.c
@@ -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, ',');
_
Patches currently in -mm which might be from shaohua.li@xxxxxxxxx are
linux-next.patch
pm-serio-speed-up-resume.patch
pm-acpi-hibernation-utilize-hardware-signature.patch
pm-acpi-hibernation-utilize-hardware-signaturepatch-causes-build-error.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
