From: Len Brown Date: Thu, 23 Oct 2008 03:57:26 +0000 (-0400) Subject: Merge branch 'linus' into test X-Git-Tag: v2.6.28-rc1~26^2~6 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=057316cc6a5b521b332a1d7ccc871cd60c904c74;p=~shefty%2Frdma-dev.git Merge branch 'linus' into test Conflicts: MAINTAINERS arch/x86/kernel/acpi/boot.c arch/x86/kernel/acpi/sleep.c drivers/acpi/Kconfig drivers/pnp/Makefile drivers/pnp/quirks.c Signed-off-by: Len Brown --- 057316cc6a5b521b332a1d7ccc871cd60c904c74 diff --cc MAINTAINERS index f9f6d4b75c5,5c3f79c2638..57ed36d474a --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -3153,11 -3173,15 +3179,20 @@@ M: olof@lixom.ne L: i2c@lm-sensors.org S: Maintained +PANASONIC LAPTOP ACPI EXTRAS DRIVER +P: Harald Welte +M: laforge@gnumonks.org +S: Maintained + + PANASONIC MN10300/AM33 PORT + P: David Howells + M: dhowells@redhat.com + P: Koichi Yasutake + M: yasutake.koichi@jp.panasonic.com + L: linux-am33-list@redhat.com (moderated for non-subscribers) + W: ftp://ftp.redhat.com/pub/redhat/gnupro/AM33/ + S: Maintained + PARALLEL PORT SUPPORT L: linux-parport@lists.infradead.org (subscribers-only) S: Orphan diff --cc arch/x86/kernel/acpi/sleep.c index 55d10cbe65b,c44cd6dbfa1..806b4e9051b --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c @@@ -97,7 -98,9 +98,9 @@@ int acpi_save_state_mem(void #else /* CONFIG_64BIT */ header->trampoline_segment = setup_trampoline() >> 4; #ifdef CONFIG_SMP - stack_start.sp = temp_stack + 4096; + stack_start.sp = temp_stack + sizeof(temp_stack); + early_gdt_descr.address = + (unsigned long)get_cpu_gdt_table(smp_processor_id()); #endif initial_code = (unsigned long)wakeup_long64; saved_magic = 0x123456789abcdef0; diff --cc drivers/pnp/Makefile index a381a92fd1b,e83f34f1b5b..8de3775ec24 --- a/drivers/pnp/Makefile +++ b/drivers/pnp/Makefile @@@ -7,3 -7,10 +7,6 @@@ obj-y := core.o card.o driver.o resour obj-$(CONFIG_PNPACPI) += pnpacpi/ obj-$(CONFIG_PNPBIOS) += pnpbios/ obj-$(CONFIG_ISAPNP) += isapnp/ + + # pnp_system_init goes after pnpacpi/pnpbios init + obj-y += system.o - -ifeq ($(CONFIG_PNP_DEBUG),y) -EXTRA_CFLAGS += -DDEBUG -endif