Messages in this thread Patch in this message | | | Date | Fri, 13 Jun 2008 20:34:33 +0200 | From | Ingo Molnar <> | Subject | Re: improved smpboot integration |
| |
* Glauber Costa <gcosta@redhat.com> wrote:
> Ingo, please pull the latest master git tree from: > > git://git.kernel.org/pub/scm/linux/kernel/git/glommer/linux-2.6-integration.git master > > into your tip/master tree
thanks. I'm still testing it - found one problem so far, see the fix below.
btw., it makes sense to test-pull your own URIs to check it's all correct - the correct URI above is:
git://git.kernel.org/pub/scm/linux/kernel/git/glommer/linux-2.6-x86-integration.git master
Ingo
---------------> commit 25acfcc76e4ca3120d5ac36be17ff2c3319421b0 Author: Ingo Molnar <mingo@elte.hu> Date: Fri Jun 13 20:31:54 2008 +0200
x86: fix sleep.c build error fix: arch/x86/kernel/acpi/sleep.c: In function ‘acpi_save_state_mem': arch/x86/kernel/acpi/sleep.c:75: error: ‘stack_start' undeclared (first use in this function) arch/x86/kernel/acpi/sleep.c:75: error: (Each undeclared identifier is reported only once arch/x86/kernel/acpi/sleep.c:75: error: for each function it appears in.)
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c index 0103af2..cd1edab 100644 --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c @@ -72,7 +72,9 @@ int acpi_save_state_mem(void) saved_magic = 0x12345678; #else /* CONFIG_64BIT */ header->trampoline_segment = setup_trampoline() >> 4; +#ifdef CONFIG_SMP stack_start.sp = temp_stack + 4096; +#endif initial_code = (unsigned long)wakeup_long64; saved_magic = 0x123456789abcdef0; #endif /* CONFIG_64BIT */ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |