Skip to contentSkip to conversation

x86 fixes

GIT PULL Ingo Molnar 5 participants 9 messages May 4, 2008 – May 9, 2008

Subsystems (5)
x86 ACPI PCI User-mode Linux (UML) +1 more subsystems
lore
Share & tools
lore
#0 lore raw

Linus, please pull the latest x86 git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes.git for-linus

x86 fixes plus the UML Makefile fix for the inlining related bug that got triggered by OPTIMIZE_INLINING.

Ingo

------------------>
Adrian Bunk (3):
x86: make start_secondary() static
x86: make additional_cpus static
x86: video/fbdev.c: add MODULE_LICENSE

Ben (1):
x86: remove dell reboot dmi quirk board name match

Cyrill Gorcunov (2):
x86: vdso ELF handling - use SELFMAG instead of numeric constant
x86: relocs ELF handling - use SELFMAG instead of numeric constant

Ingo Molnar (2):
uml: fix gcc problem
x86: es7000 build fix

Randy Dunlap (1):
x86: fix setup printk format warning

Rusty Russell (1):
x86: fix up bootparam.h for userspace inclusion

Sam Ravnborg (1):
kbuild, suspend, x86: fix rebuild of wakeup.bin

Thomas Gleixner (2):
x86: undo visws/numaq build changes
x86: olpc build fix

 arch/um/Makefile                       |    5 ++++-
 arch/x86/Kconfig                       |    1 +
 arch/x86/boot/compressed/relocs.c      |    2 +-
 arch/x86/kernel/acpi/Makefile          |    2 +-
 arch/x86/kernel/acpi/realmode/Makefile |    5 +++--
 arch/x86/kernel/mpparse.c              |    7 +++++--
 arch/x86/kernel/reboot.c               |    1 -
 arch/x86/kernel/setup.c                |    2 +-
 arch/x86/kernel/smpboot.c              |    4 ++--
 arch/x86/mm/discontig_32.c             |   26 --------------------------
 arch/x86/pci/Makefile_32               |   12 ++++++++++--
 arch/x86/vdso/vdso32-setup.c           |    2 +-
 arch/x86/video/fbdev.c                 |    2 +-
 include/asm-x86/bootparam.h            |    8 ++++----
 14 files changed, 34 insertions(+), 45 deletions(-)
arch/um/Makefile +4 -1
index dbeab15..01b97c1 100644
@@ -77,7 +77,10 @@ include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
 KERNEL_DEFINES = $(strip -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask \
 			 -Dmktime=kernel_mktime $(ARCH_KERNEL_DEFINES))
 KBUILD_CFLAGS += $(KERNEL_DEFINES)
-KBUILD_CFLAGS += $(call cc-option,-fno-unit-at-a-time,)
+# Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use
+# a lot more stack due to the lack of sharing of stacklots:
+KBUILD_CFLAGS += $(shell if [ $(call cc-version) -lt 0400 ] ; then \
+			echo $(call cc-option,-fno-unit-at-a-time); fi ;)
 
 PHONY += linux
 
arch/x86/Kconfig +1 -0
index c3f8809..845ea2b 100644
@@ -1661,6 +1661,7 @@ config GEODE_MFGPT_TIMER
 
 config OLPC
 	bool "One Laptop Per Child support"
+	depends on MGEODE_LX
 	default n
 	help
 	  Add support for detecting the unique features of the OLPC
arch/x86/boot/compressed/relocs.c +1 -1
index d01ea42..edaadea 100644
@@ -191,7 +191,7 @@ static void read_ehdr(FILE *fp)
 		die("Cannot read ELF header: %s\n",
 			strerror(errno));
 	}
-	if (memcmp(ehdr.e_ident, ELFMAG, 4) != 0) {
+	if (memcmp(ehdr.e_ident, ELFMAG, SELFMAG) != 0) {
 		die("No ELF magic\n");
 	}
 	if (ehdr.e_ident[EI_CLASS] != ELFCLASS32) {
arch/x86/kernel/acpi/Makefile +1 -1
index 7335959..fd5ca97 100644
@@ -10,5 +10,5 @@ endif
 $(obj)/wakeup_rm.o:    $(obj)/realmode/wakeup.bin
 
 $(obj)/realmode/wakeup.bin: FORCE
-	$(Q)$(MAKE) $(build)=$(obj)/realmode $@
+	$(Q)$(MAKE) $(build)=$(obj)/realmode
 
arch/x86/kernel/acpi/realmode/Makefile +3 -2
index 0929008..1c31cc0 100644
@@ -6,7 +6,8 @@
 # for more details.
 #
 
-targets		:= wakeup.bin wakeup.elf
+always		:= wakeup.bin
+targets		:= wakeup.elf wakeup.lds
 
 wakeup-y	+= wakeup.o wakemain.o video-mode.o copy.o
 
@@ -48,7 +49,7 @@ LDFLAGS_wakeup.elf	:= -T
 
 CPPFLAGS_wakeup.lds += -P -C
 
-$(obj)/wakeup.elf: $(src)/wakeup.lds $(WAKEUP_OBJS) FORCE
+$(obj)/wakeup.elf: $(obj)/wakeup.lds $(WAKEUP_OBJS) FORCE
 	$(call if_changed,ld)
 
 OBJCOPYFLAGS_wakeup.bin	:= -O binary
arch/x86/kernel/mpparse.c +5 -2
index 3e2c54d..404683b 100644
@@ -794,6 +794,11 @@ void __init find_smp_config(void)
                             ACPI-based MP Configuration
    -------------------------------------------------------------------------- */
 
+/*
+ * Keep this outside and initialized to 0, for !CONFIG_ACPI builds:
+ */
+int es7000_plat;
+
 #ifdef CONFIG_ACPI
 
 #ifdef	CONFIG_X86_IO_APIC
@@ -909,8 +914,6 @@ void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi)
 	MP_intsrc_info(&intsrc);
 }
 
-int es7000_plat;
-
 void __init mp_config_acpi_legacy_irqs(void)
 {
 	struct mpc_config_intsrc intsrc;
arch/x86/kernel/reboot.c +0 -1
index 07c6d42..f6be7d5 100644
@@ -149,7 +149,6 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
 			DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 745"),
-			DMI_MATCH(DMI_BOARD_NAME, "0WF810"),
 		},
 	},
 	{       /* Handle problems with rebooting on Dell Optiplex 745's DFF*/
arch/x86/kernel/setup.c +1 -1
index c0c68c1..cc6f5eb 100644
@@ -95,7 +95,7 @@ void __init setup_per_cpu_areas(void)
 
 	/* Copy section for each CPU (we discard the original) */
 	size = PERCPU_ENOUGH_ROOM;
-	printk(KERN_INFO "PERCPU: Allocating %lu bytes of per cpu data\n",
+	printk(KERN_INFO "PERCPU: Allocating %zd bytes of per cpu data\n",
 			  size);
 
 	for_each_possible_cpu(i) {
arch/x86/kernel/smpboot.c +2 -2
index 84241a2..6b087ab 100644
@@ -299,7 +299,7 @@ static void __cpuinit smp_callin(void)
 /*
  * Activate a secondary processor.
  */
-void __cpuinit start_secondary(void *unused)
+static void __cpuinit start_secondary(void *unused)
 {
 	/*
 	 * Don't put *anything* before cpu_init(), SMP booting is too
@@ -1306,7 +1306,7 @@ static void remove_siblinginfo(int cpu)
 	cpu_clear(cpu, cpu_sibling_setup_map);
 }
 
-int additional_cpus __initdata = -1;
+static int additional_cpus __initdata = -1;
 
 static __init int setup_additional_cpus(char *s)
 {
arch/x86/mm/discontig_32.c +0 -26
index 1837885..914ccf9 100644
@@ -476,29 +476,3 @@ int memory_add_physaddr_to_nid(u64 addr)
 
 EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
 #endif
-
-#ifndef CONFIG_HAVE_ARCH_PARSE_SRAT
-/*
- * XXX FIXME: Make SLIT table parsing available to 32-bit NUMA
- *
- * These stub functions are needed to compile 32-bit NUMA when SRAT is
- * not set. There are functions in srat_64.c for parsing this table
- * and it may be possible to make them common functions.
- */
-void acpi_numa_slit_init (struct acpi_table_slit *slit)
-{
-	printk(KERN_INFO "ACPI: No support for parsing SLIT table\n");
-}
-
-void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa)
-{
-}
-
-void acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma)
-{
-}
-
-void acpi_numa_arch_fixup(void)
-{
-}
-#endif /* CONFIG_HAVE_ARCH_PARSE_SRAT */
arch/x86/pci/Makefile_32 +10 -2
index 7fa5198..89ec35d 100644
@@ -6,11 +6,19 @@ obj-$(CONFIG_PCI_DIRECT)	+= direct.o
 obj-$(CONFIG_PCI_OLPC)		+= olpc.o
 
 pci-y				:= fixup.o
+
+# Do not change the ordering here. There is a nasty init function
+# ordering dependency which breaks when you move acpi.o below
+# legacy/irq.o
 pci-$(CONFIG_ACPI)		+= acpi.o
 pci-y				+= legacy.o irq.o
 
-pci-$(CONFIG_X86_VISWS)		+= visws.o fixup.o
-pci-$(CONFIG_X86_NUMAQ)		+= numa.o irq.o
+# Careful: VISWS and NUMAQ overrule the pci-y above. The colons are
+# therefor correct. This needs a proper fix by distangling the code.
+pci-$(CONFIG_X86_VISWS)		:= visws.o fixup.o
+pci-$(CONFIG_X86_NUMAQ)		:= numa.o irq.o
+
+# Necessary for NUMAQ as well
 pci-$(CONFIG_NUMA)		+= mp_bus_to_node.o
 
 obj-y				+= $(pci-y) common.o early.o
arch/x86/vdso/vdso32-setup.c +1 -1
index 4dceeb1..cf058fe 100644
@@ -162,7 +162,7 @@ static __init void relocate_vdso(Elf32_Ehdr *ehdr)
 	Elf32_Shdr *shdr;
 	int i;
 
-	BUG_ON(memcmp(ehdr->e_ident, ELFMAG, 4) != 0 ||
+	BUG_ON(memcmp(ehdr->e_ident, ELFMAG, SELFMAG) != 0 ||
 	       !elf_check_arch_ia32(ehdr) ||
 	       ehdr->e_type != ET_DYN);
 
arch/x86/video/fbdev.c +1 -1
index 4db42bf..6952768 100644
@@ -1,5 +1,4 @@
 /*
- *
  * Copyright (C) 2007 Antonino Daplas <[email protected]>
  *
  * This file is subject to the terms and conditions of the GNU General Public
@@ -29,3 +28,4 @@ int fb_is_primary_device(struct fb_info *info)
 	return retval;
 }
 EXPORT_SYMBOL(fb_is_primary_device);
+MODULE_LICENSE("GPL");
include/asm-x86/bootparam.h +4 -4
index e865990..f62f473 100644
@@ -14,10 +14,10 @@
 
 /* extensible setup data list node */
 struct setup_data {
-	u64 next;
-	u32 type;
-	u32 len;
-	u8 data[0];
+	__u64 next;
+	__u32 type;
+	__u32 len;
+	__u8 data[0];
 };
 
 struct setup_header {
#1 lore raw
Quoted 8 lines · Ingo Molnar

...
Thomas Gleixner (2):
...
x86: olpc build fix
...

arch/x86/Kconfig config GEODE_MFGPT_TIMER · line 1666

Quoted 7 lines
arch/x86/Kconfig +1 -0
@@ -1661,6 +1661,7 @@ config GEODE_MFGPT_TIMER
 
 config OLPC
 	bool "One Laptop Per Child support"
+	depends on MGEODE_LX
 	default n
 	help
...

This patch not only excludes OLPC and code depending on it (currently BATTERY_OLPC) from all{mod,yes}config builds (where it built fine) but also makes it very hard for generic distribution kernels to support the OLPC.

The commit comment does not indicate what the actual problem was, and if this patch was sent to linux-kernel I must have missed it.

What exactly was the build problem?
Can we fix it in a less invasive way?

Thanks in advance
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#2 lore raw
Quoted 22 lines · On Mon, 5 May 2008 18:12:02 +0300 Adrian Bunk <[email protected]> wrote:
Quoted 8 lines · Ingo Molnar

...
Thomas Gleixner (2):
...
x86: olpc build fix
...

arch/x86/Kconfig config GEODE_MFGPT_TIMER · line 1666

Quoted 7 lines
arch/x86/Kconfig +1 -0
@@ -1661,6 +1661,7 @@ config GEODE_MFGPT_TIMER
 
 config OLPC
 	bool "One Laptop Per Child support"
+	depends on MGEODE_LX
 	default n
 	help
...

This patch not only excludes OLPC and code depending on it (currently BATTERY_OLPC) from all{mod,yes}config builds (where it built fine) but also makes it very hard for generic distribution kernels to support the OLPC.

Quoted 5 lines

The commit comment does not indicate what the actual problem was, and if this patch was sent to linux-kernel I must have missed it.

What exactly was the build problem?
Can we fix it in a less invasive way?

Also, it would've been nice to have been CC'd on this; I didn't see it until it was committed.

#3 lore raw
Quoted 25 lines · Andres Salomon
Quoted 22 lines · On Mon, 5 May 2008 18:12:02 +0300 Adrian Bunk <[email protected]> wrote:
Quoted 8 lines · Ingo Molnar

...
Thomas Gleixner (2):
...
x86: olpc build fix
...

arch/x86/Kconfig config GEODE_MFGPT_TIMER · line 1666

Quoted 7 lines
arch/x86/Kconfig +1 -0
@@ -1661,6 +1661,7 @@ config GEODE_MFGPT_TIMER
 
 config OLPC
 	bool "One Laptop Per Child support"
+	depends on MGEODE_LX
 	default n
 	help
...

This patch not only excludes OLPC and code depending on it (currently BATTERY_OLPC) from all{mod,yes}config builds (where it built fine) but also makes it very hard for generic distribution kernels to support the OLPC.

Quoted 8 lines
Quoted 5 lines

The commit comment does not indicate what the actual problem was, and if this patch was sent to linux-kernel I must have missed it.

What exactly was the build problem?
Can we fix it in a less invasive way?

Also, it would've been nice to have been CC'd on this; I didn't see it until it was committed.

Sorry, this should not have gone mainline. We had your patch queued (via Andrew) and it had testing failures, which we sent to you. One workaround was that build patch. When we dropped your patch we forgot to remove the workaround as well.

Thanks,

tglx

#4 lore raw
Quoted 32 lines · On Tue, 6 May 2008 14:49:07 +0200 (CEST) Thomas Gleixner <[email protected]>…
Quoted 31 lines · Andres Salomon
Quoted 27 lines · On Mon, 5 May 2008 18:12:02 +0300 Adrian Bunk <[email protected]> wrote:
Quoted 8 lines · Ingo Molnar

...
Thomas Gleixner (2):
...
x86: olpc build fix
...

arch/x86/Kconfig config GEODE_MFGPT_TIMER · line 1666

Quoted 7 lines
arch/x86/Kconfig +1 -0
@@ -1661,6 +1661,7 @@ config GEODE_MFGPT_TIMER
 
 config OLPC
 	bool "One Laptop Per Child support"
+	depends on MGEODE_LX
 	default n
 	help
...

This patch not only excludes OLPC and code depending on it (currently BATTERY_OLPC) from all{mod,yes}config builds (where it built fine) but also makes it very hard for generic distribution kernels to support the OLPC.

The commit comment does not indicate what the actual problem was, and if this patch was sent to linux-kernel I must have missed it.

What exactly was the build problem?
Can we fix it in a less invasive way?

Quoted 8 lines
Quoted 2 lines

Also, it would've been nice to have been CC'd on this; I didn't see it until it was committed.

Sorry, this should not have gone mainline. We had your patch queued (via Andrew) and it had testing failures, which we sent to you. One workaround was that build patch. When we dropped your patch we forgot to remove the workaround as well.

Will it be removed, then? I haven't seen any explanation of its benefits, and Adrian's point about not catching build failures in olpc_battery is valid.

#5 lore raw
Quoted 9 lines · Andres Salomon
Quoted 5 lines

Sorry, this should not have gone mainline. We had your patch queued (via Andrew) and it had testing failures, which we sent to you. One workaround was that build patch. When we dropped your patch we forgot to remove the workaround as well.

Will it be removed, then? I haven't seen any explanation of its benefits, and Adrian's point about not catching build failures in olpc_battery is valid.

Yes, it's scheduled for the next pull request. What's the state of the build failures of your original patch ?

Thanks,
tglx

#6 lore raw
Quoted 11 lines · On Wed, 7 May 2008 21:08:40 +0200 (CEST) Thomas Gleixner <[email protected]>…
Quoted 9 lines · Andres Salomon
Quoted 5 lines

Sorry, this should not have gone mainline. We had your patch queued (via Andrew) and it had testing failures, which we sent to you. One workaround was that build patch. When we dropped your patch we forgot to remove the workaround as well.

Will it be removed, then? I haven't seen any explanation of its benefits, and Adrian's point about not catching build failures in olpc_battery is valid.

Quoted 5 lines

Yes, it's scheduled for the next pull request. What's the state of the build failures of your original patch ?

Thanks,
tglx

They're queued up in Andrew's tree, I believe. You were also CC'd;
Message-ID: <20080504104756.3d7b6842@ephemeral>. It wasn't CC'd to lkml, unfortunately.

#7 lore raw
Quoted 17 lines · On Wed, 7 May 2008 15:48:18 -0400 Andres Salomon <[email protected]> wrote:
Quoted 14 lines · On Wed, 7 May 2008 21:08:40 +0200 (CEST) Thomas Gleixner <[email protected]>…
Quoted 9 lines · Andres Salomon
Quoted 5 lines

Sorry, this should not have gone mainline. We had your patch queued (via Andrew) and it had testing failures, which we sent to you. One workaround was that build patch. When we dropped your patch we forgot to remove the workaround as well.

Will it be removed, then? I haven't seen any explanation of its benefits, and Adrian's point about not catching build failures in olpc_battery is valid.

Yes, it's scheduled for the next pull request. What's the state of the build failures of your original patch ?

Quoted 7 lines
Quoted 2 lines

Thanks,
tglx

They're queued up in Andrew's tree, I believe. You were also CC'd;
Message-ID: <20080504104756.3d7b6842@ephemeral>. It wasn't CC'd to lkml, unfortunately.

These?

x86-geode-cache-results-from-geode_has_vsa2-and-uninline.patch x86-geode-define-geode_has_vsa2-even-if-config_mgeode_lx-is-not-set.patch

I have them queued up as for-git-x86. I'll send them over..

#8 lore raw
In reply to Andres Salomon
Quoted 38 lines · Andres Salomon
Quoted 35 lines · On Tue, 6 May 2008 14:49:07 +0200 (CEST) Thomas Gleixner <[email protected]>…
Quoted 33 lines · Andres Salomon
Quoted 22 lines · On Mon, 5 May 2008 18:12:02 +0300 Adrian Bunk <[email protected]> wrote:
Quoted 8 lines · Ingo Molnar

...
Thomas Gleixner (2):
...
x86: olpc build fix
...

arch/x86/Kconfig config GEODE_MFGPT_TIMER · line 1666

Quoted 7 lines
arch/x86/Kconfig +1 -0
@@ -1661,6 +1661,7 @@ config GEODE_MFGPT_TIMER
 
 config OLPC
 	bool "One Laptop Per Child support"
+	depends on MGEODE_LX
 	default n
 	help
...

This patch not only excludes OLPC and code depending on it (currently BATTERY_OLPC) from all{mod,yes}config builds (where it built fine) but also makes it very hard for generic distribution kernels to support the OLPC.

Quoted 5 lines

The commit comment does not indicate what the actual problem was, and if this patch was sent to linux-kernel I must have missed it.

What exactly was the build problem?
Can we fix it in a less invasive way?

Also, it would've been nice to have been CC'd on this; I didn't see it until it was committed.

Quoted 7 lines
Quoted 5 lines

Sorry, this should not have gone mainline. We had your patch queued (via Andrew) and it had testing failures, which we sent to you. One workaround was that build patch. When we dropped your patch we forgot to remove the workaround as well.

Will it be removed, then? [...]

yes, it's all lined up for the next x86 pull.

Ingo