Skip to contentSkip to conversation

i386: Update defconfig

PATCH In review Andi Kleen 7 participants 30 messages Oct 21, 2006 – Oct 23, 2006 1 message not in the archive

Subsystems (4)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 20061021 [email protected]

Andi Kleen

author
#1 lore raw

PATCH 1/19 x86_64: Update defconfig

---
 arch/x86_64/defconfig |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)
arch/x86_64/defconfig +15 -15
Index: linux/arch/x86_64/defconfig
===================================================================
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19-rc1
-# Thu Oct  5 13:04:43 2006
+# Linux kernel version: 2.6.19-rc2-git4
+# Sat Oct 21 03:38:52 2006
 #
 CONFIG_X86_64=y
 CONFIG_64BIT=y
@@ -335,8 +335,8 @@ CONFIG_IPV6=y
 # CONFIG_INET6_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET6_XFRM_MODE_BEET is not set
 # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=y
 # CONFIG_IPV6_TUNNEL is not set
-# CONFIG_IPV6_SUBTREES is not set
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
@@ -438,6 +438,13 @@ CONFIG_BLK_DEV_INITRD=y
 # CONFIG_ATA_OVER_ETH is not set
 
 #
+# Misc devices
+#
+# CONFIG_IBM_ASM is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+
+#
 # ATA/ATAPI/MFM/RLL support
 #
 CONFIG_IDE=y
@@ -1008,6 +1015,7 @@ CONFIG_I2C_ISA=m
 #
 # Dallas's 1-wire bus
 #
+# CONFIG_W1 is not set
 
 #
 # Hardware Monitoring support
@@ -1059,12 +1067,6 @@ CONFIG_SENSORS_SMSC47B397=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
-# Misc devices
-#
-# CONFIG_IBM_ASM is not set
-# CONFIG_TIFM_CORE is not set
-
-#
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
@@ -1196,7 +1198,6 @@ CONFIG_USB_HIDINPUT=y
 # CONFIG_USB_ATI_REMOTE2 is not set
 # CONFIG_USB_KEYSPAN_REMOTE is not set
 # CONFIG_USB_APPLETOUCH is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
 
 #
 # USB Imaging devices
@@ -1242,6 +1243,7 @@ CONFIG_USB_MON=y
 # CONFIG_USB_APPLEDISPLAY is not set
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
 # CONFIG_USB_TEST is not set
 
 #
@@ -1318,6 +1320,7 @@ CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 # CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
 CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
 CONFIG_FS_MBCACHE=y
@@ -1341,6 +1344,7 @@ CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
 CONFIG_AUTOFS4_FS=y
 # CONFIG_FUSE_FS is not set
+CONFIG_GENERIC_ACL=y
 
 #
 # CD-ROM/DVD Filesystems
@@ -1418,7 +1422,6 @@ CONFIG_SUNRPC=y
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
 # CONFIG_9P_FS is not set
-CONFIG_GENERIC_ACL=y
 
 #
 # Partition Types
@@ -1471,10 +1474,6 @@ CONFIG_NLS_ISO8859_15=y
 CONFIG_NLS_UTF8=y
 
 #
-# Distributed Lock Manager
-#
-
-#
 # Instrumentation Support
 #
 CONFIG_PROFILING=y
@@ -1512,6 +1511,7 @@ CONFIG_DEBUG_FS=y
 CONFIG_UNWIND_INFO=y
 CONFIG_STACK_UNWIND=y
 # CONFIG_FORCED_INLINING is not set
+# CONFIG_HEADERS_CHECK is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_LKDTM is not set
 # CONFIG_DEBUG_RODATA is not set
author
#2 lore raw

PATCH 2/19 i386: Update defconfig

In reply to a message not in the archive
---
 arch/i386/defconfig |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)
arch/i386/defconfig +15 -15
Index: linux/arch/i386/defconfig
===================================================================
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19-rc1
-# Thu Oct  5 13:04:53 2006
+# Linux kernel version: 2.6.19-rc2-git4
+# Sat Oct 21 03:38:56 2006
 #
 CONFIG_X86_32=y
 CONFIG_GENERIC_TIME=y
@@ -380,8 +380,8 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=y
 CONFIG_INET6_XFRM_MODE_TUNNEL=y
 # CONFIG_INET6_XFRM_MODE_BEET is not set
 # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=y
 # CONFIG_IPV6_TUNNEL is not set
-# CONFIG_IPV6_SUBTREES is not set
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
@@ -483,6 +483,13 @@ CONFIG_BLK_DEV_INITRD=y
 # CONFIG_ATA_OVER_ETH is not set
 
 #
+# Misc devices
+#
+# CONFIG_IBM_ASM is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+
+#
 # ATA/ATAPI/MFM/RLL support
 #
 CONFIG_IDE=y
@@ -1024,6 +1031,7 @@ CONFIG_HANGCHECK_TIMER=y
 #
 # Dallas's 1-wire bus
 #
+# CONFIG_W1 is not set
 
 #
 # Hardware Monitoring support
@@ -1032,12 +1040,6 @@ CONFIG_HANGCHECK_TIMER=y
 # CONFIG_HWMON_VID is not set
 
 #
-# Misc devices
-#
-# CONFIG_IBM_ASM is not set
-# CONFIG_TIFM_CORE is not set
-
-#
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
@@ -1169,7 +1171,6 @@ CONFIG_USB_HIDINPUT=y
 # CONFIG_USB_ATI_REMOTE2 is not set
 # CONFIG_USB_KEYSPAN_REMOTE is not set
 # CONFIG_USB_APPLETOUCH is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
 
 #
 # USB Imaging devices
@@ -1215,6 +1216,7 @@ CONFIG_USB_MON=y
 # CONFIG_USB_APPLEDISPLAY is not set
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
 # CONFIG_USB_TEST is not set
 
 #
@@ -1284,6 +1286,7 @@ CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 # CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
 CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
 CONFIG_FS_MBCACHE=y
@@ -1307,6 +1310,7 @@ CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
 CONFIG_AUTOFS4_FS=y
 # CONFIG_FUSE_FS is not set
+CONFIG_GENERIC_ACL=y
 
 #
 # CD-ROM/DVD Filesystems
@@ -1384,7 +1388,6 @@ CONFIG_SUNRPC=y
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
 # CONFIG_9P_FS is not set
-CONFIG_GENERIC_ACL=y
 
 #
 # Partition Types
@@ -1437,10 +1440,6 @@ CONFIG_NLS_ISO8859_15=y
 CONFIG_NLS_UTF8=y
 
 #
-# Distributed Lock Manager
-#
-
-#
 # Instrumentation Support
 #
 CONFIG_PROFILING=y
@@ -1480,6 +1479,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_UNWIND_INFO=y
 CONFIG_STACK_UNWIND=y
 # CONFIG_FORCED_INLINING is not set
+# CONFIG_HEADERS_CHECK is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_LKDTM is not set
 CONFIG_EARLY_PRINTK=y
author
#3 lore raw

PATCH 3/19 x86_64: x86_64 hot-add memory srat.c fix

In reply to a message not in the archive

From: keith mannthey <[email protected]>

This patch corrects the logic used in srat.c to figure out what
parsing what action to take when registering hot-add areas. Hot-add areas should only be added to the node information for the MEMORY_HOTPLUG_RESERVE case. When booting MEMORY_HOTPLUG_SPARSE hot-add areas on everything but the last node are getting include in the node data and during kernel boot the pages are setup then the kernel dies when the pages are used. This patch fixes this issue.

---
srat.c | 4 ++--

 arch/x86_64/mm/srat.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86_64/mm/srat.c +2 -2
Index: linux/arch/x86_64/mm/srat.c
===================================================================
@@ -207,7 +207,7 @@ static inline int save_add_info(void)
 	return hotadd_percent > 0;
 }
 #else
-int update_end_of_memory(unsigned long end) {return 0;}
+int update_end_of_memory(unsigned long end) {return -1;}
 static int hotadd_enough_memory(struct bootnode *nd) {return 1;}
 #ifdef CONFIG_MEMORY_HOTPLUG_SPARSE
 static inline int save_add_info(void) {return 1;}
@@ -337,7 +337,7 @@ acpi_numa_memory_affinity_init(struct ac
 	push_node_boundaries(node, nd->start >> PAGE_SHIFT,
 						nd->end >> PAGE_SHIFT);
 
- 	if (ma->flags.hot_pluggable && !reserve_hotadd(node, start, end) < 0) {
+ 	if (ma->flags.hot_pluggable && (reserve_hotadd(node, start, end) < 0)) {
 		/* Ignore hotadd region. Undo damage */
 		printk(KERN_NOTICE "SRAT: Hotplug region ignored\n");
 		*nd = oldnode;
author
#4 lore raw

PATCH 4/19 x86_64: typo in __assign_irq_vector when updating pos for vector and offset

In reply to a message not in the archive

From: Yinghai Lu <[email protected]>

typo with cpu instead of new_cpu

---
 arch/x86_64/kernel/io_apic.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
arch/x86_64/kernel/io_apic.c +3 -3
Index: linux/arch/x86_64/kernel/io_apic.c
===================================================================
@@ -651,12 +651,12 @@ next:
 		if (vector == IA32_SYSCALL_VECTOR)
 			goto next;
 		for_each_cpu_mask(new_cpu, domain)
-			if (per_cpu(vector_irq, cpu)[vector] != -1)
+			if (per_cpu(vector_irq, new_cpu)[vector] != -1)
 				goto next;
 		/* Found one! */
 		for_each_cpu_mask(new_cpu, domain) {
-			pos[cpu].vector = vector;
-			pos[cpu].offset = offset;
+			pos[new_cpu].vector = vector;
+			pos[new_cpu].offset = offset;
 		}
 		if (old_vector >= 0) {
 			int old_cpu;
author
#5 lore raw

PATCH 5/19 i386: fix .cfi_signal_frame copy-n-paste error

In reply to a message not in the archive

From: Andrew Morton <[email protected]>

This was copied, pasted but not edited.

---

 arch/i386/Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/i386/Makefile +2 -2
Index: linux/arch/i386/Makefile
===================================================================
@@ -51,8 +51,8 @@ cflags-y += $(call as-instr,.cfi_startpr
 AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,)
 
 # is .cfi_signal_frame supported too?
-cflags-y += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,)
-AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,)
+cflags-y += $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=1,)
+AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=1,)
 
 CFLAGS += $(cflags-y)
 
author
#6 lore raw

PATCH 6/19 x86_64: Fix for arch/x86_64/pci/Makefile CFLAGS

In reply to a message not in the archive

From: Corey Minyard <[email protected]>

The arch/x86_64/pci directory was giving problems in a wierd cross-compile environment. The exact cause is unknown, but the Makefile used CFLAGS instead of EXTRA_CFLAGS. From what I can tell from Documentation/kbuild/makefiles.txt, CFLAGS should not be used for this, it should be EXTRA_CFLAGS. And it solves the cross-compile problem.

---

 arch/x86_64/pci/Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)
arch/x86_64/pci/Makefile +1 -1
Index: linux/arch/x86_64/pci/Makefile
===================================================================
@@ -3,7 +3,7 @@
 #
 # Reuse the i386 PCI subsystem
 #
-CFLAGS += -Iarch/i386/pci
+EXTRA_CFLAGS += -Iarch/i386/pci
 
 obj-y		:= i386.o
 obj-$(CONFIG_PCI_DIRECT)+= direct.o
author
#7 lore raw

PATCH 7/19 x86_64: fix page align in e820 allocator

In reply to a message not in the archive

From: Vivek Goyal <[email protected]>

Currently some code pieces assume that address returned by find_e820_area() are page aligned. But looks like find_e820_area() had no such intention and hence one might end up stomping over some of the data. One such case is bootmem allocator initialization code stomped over bss.

This patch modified find_e820_area() to return page aligned address. This might be little wasteful of memory but at the same time probably it is easier to handle page aligned memory.

---

 arch/x86_64/kernel/e820.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
arch/x86_64/kernel/e820.c +7 -7
Index: linux/arch/x86_64/kernel/e820.c
===================================================================
@@ -54,13 +54,13 @@ static inline int bad_addr(unsigned long
 
 	/* various gunk below that needed for SMP startup */
 	if (addr < 0x8000) { 
-		*addrp = 0x8000;
+		*addrp = PAGE_ALIGN(0x8000);
 		return 1; 
 	}
 
 	/* direct mapping tables of the kernel */
 	if (last >= table_start<<PAGE_SHIFT && addr < table_end<<PAGE_SHIFT) { 
-		*addrp = table_end << PAGE_SHIFT; 
+		*addrp = PAGE_ALIGN(table_end << PAGE_SHIFT);
 		return 1;
 	} 
 
@@ -68,18 +68,18 @@ static inline int bad_addr(unsigned long
 #ifdef CONFIG_BLK_DEV_INITRD
 	if (LOADER_TYPE && INITRD_START && last >= INITRD_START && 
 	    addr < INITRD_START+INITRD_SIZE) { 
-		*addrp = INITRD_START + INITRD_SIZE; 
+		*addrp = PAGE_ALIGN(INITRD_START + INITRD_SIZE);
 		return 1;
 	} 
 #endif
 	/* kernel code */
-	if (last >= __pa_symbol(&_text) && last < __pa_symbol(&_end)) {
-		*addrp = __pa_symbol(&_end);
+	if (last >= __pa_symbol(&_text) && addr < __pa_symbol(&_end)) {
+		*addrp = PAGE_ALIGN(__pa_symbol(&_end));
 		return 1;
 	}
 
 	if (last >= ebda_addr && addr < ebda_addr + ebda_size) {
-		*addrp = ebda_addr + ebda_size;
+		*addrp = PAGE_ALIGN(ebda_addr + ebda_size);
 		return 1;
 	}
 
@@ -152,7 +152,7 @@ unsigned long __init find_e820_area(unsi
 			continue; 
 		while (bad_addr(&addr, size) && addr+size <= ei->addr+ei->size)
 			;
-		last = addr + size;
+		last = PAGE_ALIGN(addr) + size;
 		if (last > ei->addr + ei->size)
 			continue;
 		if (last > end) 
author
#8 lore raw

PATCH 8/19 x86: Use -maccumulate-outgoing-args

In reply to a message not in the archive

This avoids some problems with gcc 4.x and earlier generating invalid unwind information. In 4.1 the option is default when unwind information is enabled.

And it seems to generate smaller code too, so it's probably a good thing on its own. With gcc 4.0:

i386:

4683198  902112  480868 6066178  5c9002 vmlinux (before)
4449895  902112  480868 5832875  5900ab vmlinux (after) 

x86-64:

4939761 1449584  648216 7037561  6b6279 vmlinux (before)
4854193 1449584  648216 6951993  6a1439 vmlinux (after) 

On 4.1 it shouldn't make much difference because it is default when unwind is enabled anyways.

Suggested by Michael Matz and Jan Beulich

---
 arch/i386/Makefile   |    4 ++++
 arch/x86_64/Makefile |    4 ++++
 2 files changed, 8 insertions(+)
arch/i386/Makefile +4 -0
Index: linux/arch/i386/Makefile
===================================================================
@@ -42,6 +42,10 @@ cflags-$(CONFIG_REGPARM) += -mregparm=3
 # temporary until string.h is fixed
 cflags-y += -ffreestanding
 
+# this works around some issues with generating unwind tables in older gccs
+# newer gccs do it by default
+cflags-y += -maccumulate-outgoing-args
+
 # 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:
 CFLAGS				+= $(shell if [ $(call cc-version) -lt 0400 ] ; then echo $(call cc-option,-fno-unit-at-a-time); fi ;)
arch/x86_64/Makefile +4 -0
Index: linux/arch/x86_64/Makefile
===================================================================
@@ -54,6 +54,10 @@ endif
 cflags-y += $(call cc-option,-funit-at-a-time)
 # prevent gcc from generating any FP code by mistake
 cflags-y += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,)
+# this works around some issues with generating unwind tables in older gccs
+# newer gccs do it by default
+cflags-y += -maccumulate-outgoing-args
+
 # do binutils support CFI?
 cflags-y += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,)
 AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,)
#9 lore raw

Re: [PATCH] [8/19] x86: Use -maccumulate-outgoing-args

Quoted 7 lines · Andi Kleen

This avoids some problems with gcc 4.x and earlier generating invalid unwind information. In 4.1 the option is default when unwind information is enabled.

And it seems to generate smaller code too, so it's probably a good thing on its own. With gcc 4.0:

That's quite odd. The gcc man page mentions that
"The drawback is a notable increase in code size." for this option. I wonder if this is just stale documentation, or there's a reason why we're special :)

Dave

Signature · 1 line
http://www.codemonkey.org.uk
author
#10 lore raw

Re: [PATCH] [8/19] x86: Use -maccumulate-outgoing-args

Quoted 6 lines · Dave Jones
Quoted 5 lines · Andi Kleen

This avoids some problems with gcc 4.x and earlier generating invalid unwind information. In 4.1 the option is default when unwind information is enabled.

Quoted 7 lines
Quoted 2 lines

And it seems to generate smaller code too, so it's probably a good thing on its own. With gcc 4.0:

That's quite odd. The gcc man page mentions that
"The drawback is a notable increase in code size." for this option. I wonder if this is just stale documentation, or there's a reason why we're special :)

I redid the measurements originally because someone else commented on this too, but I still saw the same numbers.

If someone else wants to redo them too please do
(note on gcc 4.1 you need to disable the stack unwinder or debug info first, otherwise it is a nop)

-Andi

author
#11 lore raw

PATCH 9/19 x86_64: Speed up dwarf2 unwinder

In reply to a message not in the archive

From: Jan Beulich <[email protected]>

This changes the dwarf2 unwinder to do a binary search for CIEs instead of a linear work. The linker is unfortunately not
able to build a proper lookup table at link time, instead it creates one at runtime as soon as the bootmem allocator is usable (so you'll continue using the linear lookup for the first [hopefully] few calls).
The code should be ready to utilize a build-time created table once a fixed linker becomes available.

---
 Makefile                          |    1 
 include/asm-generic/vmlinux.lds.h |   16 +
 include/linux/unwind.h            |    2 
 init/main.c                       |    1 
 kernel/unwind.c                   |  316 +++++++++++++++++++++++++++++++++-----
 5 files changed, 298 insertions(+), 38 deletions(-)
Makefile +1 -0
Index: linux/Makefile
===================================================================
@@ -499,6 +499,7 @@ endif
 
 ifdef CONFIG_UNWIND_INFO
 CFLAGS		+= -fasynchronous-unwind-tables
+LDFLAGS_vmlinux	+= --eh-frame-hdr
 endif
 
 ifdef CONFIG_DEBUG_INFO
include/asm-generic/vmlinux.lds.h +16 -0
Index: linux/include/asm-generic/vmlinux.lds.h
===================================================================
@@ -125,6 +125,10 @@
 		*(__param)						\
 		VMLINUX_SYMBOL(__stop___param) = .;			\
 	}								\
+									\
+	/* Unwind data binary search table */				\
+	EH_FRAME_HDR							\
+									\
 	__end_rodata = .;						\
 	. = ALIGN(4096);
 
@@ -157,6 +161,18 @@
 		*(.kprobes.text)					\
 		VMLINUX_SYMBOL(__kprobes_text_end) = .;
 
+#ifdef CONFIG_STACK_UNWIND
+		/* Unwind data binary search table */
+#define EH_FRAME_HDR							\
+        	.eh_frame_hdr : AT(ADDR(.eh_frame_hdr) - LOAD_OFFSET) {	\
+			VMLINUX_SYMBOL(__start_unwind_hdr) = .;		\
+			*(.eh_frame_hdr)				\
+			VMLINUX_SYMBOL(__end_unwind_hdr) = .;		\
+		}
+#else
+#define EH_FRAME_HDR
+#endif
+
 		/* DWARF debug sections.
 		Symbols in the DWARF debugging sections are relative to
 		the beginning of the section so we begin them at 0.  */
include/linux/unwind.h +2 -0
Index: linux/include/linux/unwind.h
===================================================================
@@ -26,6 +26,7 @@ struct module;
  * Initialize unwind support.
  */
 extern void unwind_init(void);
+extern void unwind_setup(void);
 
 #ifdef CONFIG_MODULES
 
@@ -73,6 +74,7 @@ extern int unwind_to_user(struct unwind_
 struct unwind_frame_info {};
 
 static inline void unwind_init(void) {}
+static inline void unwind_setup(void) {}
 
 #ifdef CONFIG_MODULES
 
init/main.c +1 -0
Index: linux/init/main.c
===================================================================
@@ -503,6 +503,7 @@ asmlinkage void __init start_kernel(void
 	printk(KERN_NOTICE);
 	printk(linux_banner);
 	setup_arch(&command_line);
+	unwind_setup();
 	setup_per_cpu_areas();
 	smp_prepare_boot_cpu();	/* arch-specific boot-cpu hooks */
 
kernel/unwind.c +278 -38

386 lines not on this page · raw message

author
#12 lore raw

PATCH 10/19 x86_64: x86_64 add NX mask for PTE entry

In reply to a message not in the archive

From: "bibo,mao" <[email protected]>

If function change_page_attr_addr calls revert_page to revert
to original pte value, mk_pte_phys does not mask NX bit. If NX bit is set on no NX hardware supported x86_64 machine, there is will be RSVD type page fault and system will crash. This patch adds NX mask bit for PTE entry.

---
 include/asm-x86_64/pgtable.h |    1 +
 1 files changed, 1 insertion(+)
include/asm-x86_64/pgtable.h +1 -0
Index: linux/include/asm-x86_64/pgtable.h
===================================================================
@@ -366,6 +366,7 @@ static inline pte_t mk_pte_phys(unsigned
 { 
 	pte_t pte;
 	pte_val(pte) = physpage | pgprot_val(pgprot); 
+	pte_val(pte) &= __supported_pte_mask;
 	return pte; 
 }
  
author
#13 lore raw

PATCH 11/19 i386: Fix fake return address

In reply to a message not in the archive

From: Jeremy Fitzhardinge <[email protected]>
The fake return address was being set to __KERNEL_PDA, rather than 0. Push it earlier while %eax still equals 0.

---
 arch/i386/kernel/head.S |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)
arch/i386/kernel/head.S +1 -1
Index: linux/arch/i386/kernel/head.S
===================================================================
@@ -317,7 +317,7 @@ is386:	movl $2,%ecx		# set MP
 	movl %eax,%gs
 	lldt %ax
 	cld			# gcc2 wants the direction flag cleared at all times
-	pushl %eax		# fake return address
+	pushl $0		# fake return address for unwinder
 #ifdef CONFIG_SMP
 	movb ready, %cl
 	movb $1, ready
#14 lore raw

Re: [PATCH] [11/19] i386: Fix fake return address

Quoted 18 lines · Andi Kleen

From: Jeremy Fitzhardinge <[email protected]>
The fake return address was being set to __KERNEL_PDA, rather than 0. Push it earlier while %eax still equals 0.

---
 arch/i386/kernel/head.S |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: linux/arch/i386/kernel/head.S
===================================================================

arch/i386/kernel/head.S is386: movl $2,%ecx # set MP · line 321

Quoted 6 lines
arch/i386/kernel/head.S +1 -1
@@ -317,7 +317,7 @@ is386:	movl $2,%ecx		# set MP
 	movl %eax,%gs
 	lldt %ax
 	cld			# gcc2 wants the direction flag cleared at all times
-	pushl %eax		# fake return address
+	pushl $0		# fake return address for unwinder
 #ifdef CONFIG_SMP

Yep, that's better than my patch, but the comment is out of date.

J

author
#15 lore raw

Re: [PATCH] [11/19] i386: Fix fake return address

Quoted 2 lines

Yep, that's better than my patch, but the comment is out of date.

Sorry, i changed it while doing a merge (original patch rejected somewhere) but forgot to adapt the description

-Andi

#16 lore raw

Re: [PATCH] [11/19] i386: Fix fake return address

In reply to Andi Kleen
Quoted 3 lines · Andi Kleen

From: Jeremy Fitzhardinge <[email protected]>
The fake return address was being set to __KERNEL_PDA, rather than 0. Push it earlier while %eax still equals 0.

There is a slight discrepancy between the description and what is really implemented by the patch.

Andreas.

Signature · 4 lines
Andreas Schwab, SuSE Labs, [email protected]
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."
author
#17 lore raw

PATCH 12/19 x86_64: Fix ENOSYS in system call tracing

In reply to a message not in the archive

From: "Jan Beulich" <[email protected]>

This patch:

- out of range system calls failing to return -ENOSYS under system call tracing

[AK: split out from another patch by Jan as separate bugfix]

---
 arch/x86_64/kernel/entry.S |    2 ++
 1 files changed, 2 insertions(+)
arch/x86_64/kernel/entry.S +2 -0
Index: linux/arch/x86_64/kernel/entry.S
===================================================================
@@ -315,6 +315,8 @@ tracesys:			 
 	LOAD_ARGS ARGOFFSET  /* reload args from stack in case ptrace changed it */
 	RESTORE_REST
 	cmpq $__NR_syscall_max,%rax
+	movq $-ENOSYS,%rcx
+	cmova %rcx,%rax
 	ja  1f
 	movq %r10,%rcx	/* fixup for C */
 	call *sys_call_table(,%rax,8)
author
#18 lore raw

PATCH 13/19 x86_64: Revert interrupt backlink changes

In reply to a message not in the archive

They break more than they fix

---
 arch/x86_64/kernel/entry.S |    3 ---
 1 files changed, 3 deletions(-)
arch/x86_64/kernel/entry.S +0 -3
Index: linux/arch/x86_64/kernel/entry.S
===================================================================
@@ -537,8 +537,6 @@ END(stub_rt_sigreturn)
 1:	incl	%gs:pda_irqcount
 	cmoveq %gs:pda_irqstackptr,%rsp
 	push    %rbp			# backlink for old unwinder
-	CFI_ADJUST_CFA_OFFSET 8
-	CFI_REL_OFFSET rbp,0
 	/*
 	 * We entered an interrupt context - irqs are off:
 	 */
@@ -1178,7 +1176,6 @@ ENTRY(call_softirq)
 	incl %gs:pda_irqcount
 	cmove %gs:pda_irqstackptr,%rsp
 	push  %rbp			# backlink for old unwinder
-	CFI_ADJUST_CFA_OFFSET    8
 	call __do_softirq
 	leaveq
 	CFI_DEF_CFA_REGISTER	rsp
author
#19 lore raw

PATCH 14/19 i386: Disable nmi watchdog on all ThinkPads

In reply to a message not in the archive

Even newer Thinkpads have bugs in SMM code that causes hangs with NMI watchdog.

---
 arch/i386/kernel/nmi.c      |   10 +++++-----
 drivers/firmware/dmi_scan.c |   20 ++++++++++++++++++++
 include/linux/dmi.h         |    2 ++
 3 files changed, 27 insertions(+), 5 deletions(-)
arch/i386/kernel/nmi.c +5 -5
Index: linux/arch/i386/kernel/nmi.c
===================================================================
@@ -219,11 +219,11 @@ static int __init check_nmi_watchdog(voi
 	int cpu;
 
 	/* Enable NMI watchdog for newer systems.
-           Actually it should be safe for most systems before 2004 too except
-	   for some IBM systems that corrupt registers when NMI happens
-	   during SMM. Unfortunately we don't have more exact information
- 	   on these and use this coarse check. */
-	if (nmi_watchdog == NMI_DEFAULT && dmi_get_year(DMI_BIOS_DATE) >= 2004)
+	   Probably safe on most older systems too, but let's be careful.
+	   IBM ThinkPads use INT10 inside SMM and that allows early NMI inside SMM
+	   which hangs the system. Disable watchdog for all thinkpads */
+	if (nmi_watchdog == NMI_DEFAULT && dmi_get_year(DMI_BIOS_DATE) >= 2004 &&
+		!dmi_name_in_vendors("ThinkPad"))
 		nmi_watchdog = NMI_LOCAL_APIC;
 
 	if ((nmi_watchdog == NMI_NONE) || (nmi_watchdog == NMI_DEFAULT))
drivers/firmware/dmi_scan.c +20 -0
Index: linux/drivers/firmware/dmi_scan.c
===================================================================
@@ -326,6 +326,26 @@ char *dmi_get_system_info(int field)
 }
 EXPORT_SYMBOL(dmi_get_system_info);
 
+
+/**
+ *	dmi_name_in_vendors - Check if string is anywhere in the DMI vendor information.
+ *	@str: 	Case sensitive Name
+ */
+int dmi_name_in_vendors(char *str)
+{
+	static int fields[] = { DMI_BIOS_VENDOR, DMI_BIOS_VERSION, DMI_SYS_VENDOR,
+				DMI_PRODUCT_NAME, DMI_PRODUCT_VERSION, DMI_BOARD_VENDOR,
+				DMI_BOARD_NAME, DMI_BOARD_VERSION, DMI_NONE };
+	int i;
+	for (i = 0; fields[i] != DMI_NONE; i++) {
+		int f = fields[i];
+		if (dmi_ident[f] && strstr(dmi_ident[f], str))
+			return 1;
+	}
+	return 0;
+}
+EXPORT_SYMBOL(dmi_name_in_vendors);
+
 /**
  *	dmi_find_device - find onboard device by type/name
  *	@type: device type or %DMI_DEV_TYPE_ANY to match all device types
include/linux/dmi.h +2 -0
Index: linux/include/linux/dmi.h
===================================================================
@@ -69,6 +69,7 @@ extern struct dmi_device * dmi_find_devi
 	struct dmi_device *from);
 extern void dmi_scan_machine(void);
 extern int dmi_get_year(int field);
+extern int dmi_name_in_vendors(char *str);
 
 #else
 
@@ -77,6 +78,7 @@ static inline char * dmi_get_system_info
 static inline struct dmi_device * dmi_find_device(int type, const char *name,
 	struct dmi_device *from) { return NULL; }
 static inline int dmi_get_year(int year) { return 0; }
+static inline int dmi_name_in_vendors(char *s) { return 0; }
 
 #endif
 
#20 lore raw

Re: [PATCH] [14/19] i386: Disable nmi watchdog on all ThinkPads

Quoted 21 lines · Andi Kleen

Even newer Thinkpads have bugs in SMM code that causes hangs with NMI watchdog.

---
 arch/i386/kernel/nmi.c      |   10 +++++-----
 drivers/firmware/dmi_scan.c |   20 ++++++++++++++++++++
 include/linux/dmi.h         |    2 ++
 3 files changed, 27 insertions(+), 5 deletions(-)

Index: linux/arch/i386/kernel/nmi.c
===================================================================

arch/i386/kernel/nmi.c +0 -1
@@ -219,11 +219,11 @@ static int __init check_nmi_watchdog(voi
 	int cpu;
 
 	/* Enable NMI watchdog for newer systems.
-           Actually it should be safe for most systems before 2004 too except

arch/i386/kernel/nmi.c static int __init check_nmi_watchdog(voi · line 227

Quoted 10 lines
arch/i386/kernel/nmi.c +5 -4
-	   for some IBM systems that corrupt registers when NMI happens
-	   during SMM. Unfortunately we don't have more exact information
- 	   on these and use this coarse check. */
-	if (nmi_watchdog == NMI_DEFAULT && dmi_get_year(DMI_BIOS_DATE) >= 2004)
+	   Probably safe on most older systems too, but let's be careful.
+	   IBM ThinkPads use INT10 inside SMM and that allows early NMI inside SMM
+	   which hangs the system. Disable watchdog for all thinkpads */
+	if (nmi_watchdog == NMI_DEFAULT && dmi_get_year(DMI_BIOS_DATE) >= 2004 &&
+		!dmi_name_in_vendors("ThinkPad"))
 		nmi_watchdog = NMI_LOCAL_APIC;

This is going to get some people scratching their heads wondering why it isn't working if they ever try nmi_watchdog on one of these. How about adding an explanitory printk ?

Dave

Signature · 1 line
http://www.codemonkey.org.uk
author
#21 lore raw

Re: [patches] Re: [PATCH] [14/19] i386: Disable nmi watchdog on all ThinkPads

Quoted 12 lines

arch/i386/kernel/nmi.c static int __init check_nmi_watchdog(voi · line 227

Quoted 8 lines
arch/i386/kernel/nmi.c +5 -1
-	if (nmi_watchdog == NMI_DEFAULT && dmi_get_year(DMI_BIOS_DATE) >= 2004)
+	   Probably safe on most older systems too, but let's be careful.
+	   IBM ThinkPads use INT10 inside SMM and that allows early NMI inside SMM
+	   which hangs the system. Disable watchdog for all thinkpads */
+	if (nmi_watchdog == NMI_DEFAULT && dmi_get_year(DMI_BIOS_DATE) >= 2004 &&
+		!dmi_name_in_vendors("ThinkPad"))
 		nmi_watchdog = NMI_LOCAL_APIC;

This is going to get some people scratching their heads wondering why it isn't working if they ever try nmi_watchdog on one of these. How about adding an explanitory printk ?

When you enable it manually then NMI_DEFAULT won't be set and this code is never executed.

BTW their machines will likely not stay up long enough that they can see the printk (unless Lenovo fixes that particular bug in the future, they are aware of it)

-Andi

#22 lore raw

Re: [patches] Re: [PATCH] [14/19] i386: Disable nmi watchdog on all ThinkPads

Quoted 13 lines · Andi Kleen
Quoted 12 lines

arch/i386/kernel/nmi.c static int __init check_nmi_watchdog(voi · line 227

Quoted 8 lines
arch/i386/kernel/nmi.c +5 -1
-	if (nmi_watchdog == NMI_DEFAULT && dmi_get_year(DMI_BIOS_DATE) >= 2004)
+	   Probably safe on most older systems too, but let's be careful.
+	   IBM ThinkPads use INT10 inside SMM and that allows early NMI inside SMM
+	   which hangs the system. Disable watchdog for all thinkpads */
+	if (nmi_watchdog == NMI_DEFAULT && dmi_get_year(DMI_BIOS_DATE) >= 2004 &&
+		!dmi_name_in_vendors("ThinkPad"))
 		nmi_watchdog = NMI_LOCAL_APIC;

This is going to get some people scratching their heads wondering why it isn't working if they ever try nmi_watchdog on one of these. How about adding an explanitory printk ?

Quoted 6 lines

When you enable it manually then NMI_DEFAULT won't be set and this code is never executed.

BTW their machines will likely not stay up long enough that they can see the printk (unless Lenovo fixes that particular bug in the future, they are aware of it)

Ouch, nasty. I'm surprised no-one complained about this earlier.

Dave

Signature · 1 line
http://www.codemonkey.org.uk
author
#23 lore raw

Re: [patches] Re: [PATCH] [14/19] i386: Disable nmi watchdog on all ThinkPads

Quoted 2 lines

Ouch, nasty. I'm surprised no-one complained about this earlier.

i386 only enabled it post 2.6.18. I suppose nobody tested ThinkPads after that.

Actually I should probably add it to 64bit too, but still waiting for at least one report (maybe maybe they have already fixed it in the Core2 capable models)

-Andi

author
#24 lore raw

PATCH 16/19 x86: Revert new unwind kernel stack termination

In reply to a message not in the archive

Jan convinced me that it was unnecessary because the assembly stubs do this already on the stack.

---
 arch/i386/kernel/process.c |    6 +-----
 arch/x86_64/kernel/entry.S |    5 -----
 2 files changed, 1 insertion(+), 10 deletions(-)
arch/i386/kernel/process.c +1 -5
Index: linux/arch/i386/kernel/process.c
===================================================================
@@ -336,7 +336,6 @@ extern void kernel_thread_helper(void);
 int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
 {
 	struct pt_regs regs;
-	int err;
 
 	memset(&regs, 0, sizeof(regs));
 
@@ -351,10 +350,7 @@ int kernel_thread(int (*fn)(void *), voi
 	regs.eflags = X86_EFLAGS_IF | X86_EFLAGS_SF | X86_EFLAGS_PF | 0x2;
 
 	/* Ok, create the new process.. */
-	err = do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, &regs, 0, NULL, NULL);
-	if (err == 0) /* terminate kernel stack */
-		task_pt_regs(current)->eip = 0;
-	return err;
+	return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, &regs, 0, NULL, NULL);
 }
 EXPORT_SYMBOL(kernel_thread);
 
arch/x86_64/kernel/entry.S +0 -5
Index: linux/arch/x86_64/kernel/entry.S
===================================================================
@@ -980,11 +980,6 @@ ENTRY(kernel_thread)
 	call do_fork
 	movq %rax,RAX(%rsp)
 	xorl %edi,%edi
-	test %rax,%rax
-	jnz  1f
-	/* terminate stack in child */
-	movq %rdi,RIP(%rsp)
-1:
 
 	/*
 	 * It isn't worth to check for reschedule here,
author
#25 lore raw

PATCH 18/19 x86_64: Overlapping program headers in physical addr space fix

In reply to a message not in the archive

From: Vivek Goyal <[email protected]>

o A recent change to vmlinux.ld.S file broke kexec as now resulting vmlinux program headers are overlapping in physical address space.

o Now all the vsyscall related sections are placed after data and after that mostly init data sections are placed. To avoid physical overlap among phdrs, there are three possible solutions.
- Place vsyscall sections also in data phdrs instead of user
- move vsyscal sections after init data in bss.
- create another phdrs say data.init and move all the sections after vsyscall into this new phdr.

o This patch implements the third solution.

---

 arch/x86_64/kernel/vmlinux.lds.S |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)
arch/x86_64/kernel/vmlinux.lds.S +2 -1
Index: linux/arch/x86_64/kernel/vmlinux.lds.S
===================================================================
@@ -17,6 +17,7 @@ PHDRS {
 	text PT_LOAD FLAGS(5);	/* R_E */
 	data PT_LOAD FLAGS(7);	/* RWE */
 	user PT_LOAD FLAGS(7);	/* RWE */
+	data.init PT_LOAD FLAGS(7);	/* RWE */
 	note PT_NOTE FLAGS(4);	/* R__ */
 }
 SECTIONS
@@ -131,7 +132,7 @@ SECTIONS
   . = ALIGN(8192);		/* init_task */
   .data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) {
 	*(.data.init_task)
-  } :data
+  }:data.init
 
   . = ALIGN(4096);
   .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) {
#26 lore raw

Re: [patches] [PATCH] [18/19] x86_64: Overlapping program headers in physical addr space fix

Quoted 8 lines
arch/x86_64/kernel/vmlinux.lds.S +1 -0
@@ -17,6 +17,7 @@ PHDRS {
 	text PT_LOAD FLAGS(5);	/* R_E */
 	data PT_LOAD FLAGS(7);	/* RWE */
 	user PT_LOAD FLAGS(7);	/* RWE */
+	data.init PT_LOAD FLAGS(7);	/* RWE */
 	note PT_NOTE FLAGS(4);	/* R__ */
 }

SECTIONS

Even though it's only cosmetic, I think it would have been more than appropriate to remove the ill 'E' permission on data with that change. (Btw., why does 'note' need 'R'?) Also, I consider the naming of the new segment misleading - just 'init' would have been more correct.

Jan

#27 lore raw

Re: [patches] [PATCH] [18/19] x86_64: Overlapping program headers in physical addr space fix

Quoted 4 lines · Jan Beulich
Quoted 4 lines
arch/x86_64/kernel/vmlinux.lds.S +0 -0
@@ -17,6 +17,7 @@ PHDRS {
 	text PT_LOAD FLAGS(5);	/* R_E */
 	data PT_LOAD FLAGS(7);	/* RWE */
 	user PT_LOAD FLAGS(7);	/* RWE */
Quoted 8 lines
Quoted 4 lines
arch/x86_64/kernel/vmlinux.lds.S +1 -0
+	data.init PT_LOAD FLAGS(7);	/* RWE */
 	note PT_NOTE FLAGS(4);	/* R__ */
 }

SECTIONS

Even though it's only cosmetic, I think it would have been more than appropriate to remove the ill 'E' permission on data with that change.

May be. I just kept it because already data segment had 'E' permissions. Ian, any reason why did you keep 'E' on data segment? If it is not intentional, I will get rid of it.

Quoted 1 line

(Btw., why does 'note' need 'R'?)

I went through the comments Ian had put in his patch. There also he mentions that people objected to 'R' permissions for note segment as it is read only by boot loader. He kept it because i386 had the similar thing.

Ian, again if there is no specific reason to keep 'R' for note, I will get rid of it.

Quoted 4 lines

Also, I
consider the naming of the new segment misleading - just 'init' would have been more correct.

I think plain "init" also does not reflect the correct name as this section is also mapping .data.init_task, .data.page_aligned and .data_nosave, which will probably never get freed. It maps smp alternatives sections which will not be freed if CPU_HOTPLUG is enabled. It also maps .bss, which will never get freed.

I think, the sections which are not being freed, should be moved up and made part of 'data' segment. Then create a segment 'init' for all the init text/data and finally create another segment say 'bss' to map bss at the end. How does this sound?

Thanks
Vivek

#28 lore raw

Re: [patches] [PATCH] [18/19] x86_64: Overlapping program headers in physical addr space fix

Quoted 14 lines · Vivek Goyal
Quoted 4 lines · Jan Beulich
Quoted 4 lines
arch/x86_64/kernel/vmlinux.lds.S +0 -0
@@ -17,6 +17,7 @@ PHDRS {
 	text PT_LOAD FLAGS(5);	/* R_E */
 	data PT_LOAD FLAGS(7);	/* RWE */
 	user PT_LOAD FLAGS(7);	/* RWE */
Quoted 8 lines
Quoted 4 lines
arch/x86_64/kernel/vmlinux.lds.S +1 -0
+	data.init PT_LOAD FLAGS(7);	/* RWE */
 	note PT_NOTE FLAGS(4);	/* R__ */
 }

SECTIONS

Even though it's only cosmetic, I think it would have been more than appropriate to remove the ill 'E' permission on data with that change.

Quoted 3 lines

May be. I just kept it because already data segment had 'E' permissions. Ian, any reason why did you keep 'E' on data segment? If it is not intentional, I will get rid of it.

I wasn't 100% sure (only 99% :-)) it was unneeded so I kept it to minimise the changes in the final image since the original .data section had it.

Quoted 9 lines
Quoted 1 line

(Btw., why does 'note' need 'R'?)

I went through the comments Ian had put in his patch. There also he mentions that people objected to 'R' permissions for note segment as it is read only by boot loader. He kept it because i386 had the similar thing.

Ian, again if there is no specific reason to keep 'R' for note, I will get rid of it.

There was a suggestion at one point that the note section was aliased by a PT_LOAD and so needed the R but it turned out that wasn't the case.

You can drop it as far as I'm concerned.

Ian.

#29 lore raw

Re: [patches] [PATCH] [18/19] x86_64: Overlapping program headers in physical addr space fix

In reply to Vivek Goyal
Quoted 10 lines

I think plain "init" also does not reflect the correct name as this section is also mapping .data.init_task, .data.page_aligned and .data_nosave, which will probably never get freed. It maps smp alternatives sections which will not be freed if CPU_HOTPLUG is enabled. It also maps .bss, which will never get freed.

I think, the sections which are not being freed, should be moved up and made part of 'data' segment. Then create a segment 'init' for all the init text/data and finally create another segment say 'bss' to map bss at the end. How does this sound?

Superb. Though I guess .bss needs no extra segment, it should simply be the last thing in the data segment.

Jan

author
#30 lore raw

PATCH 19/19 x86_64: Revert timer routing behaviour back to 2.6.16 state

In reply to a message not in the archive

By default route the 8254 over the 8259 and only disable it on ATI boards where this causes double timer interrupts.

This should unbreak some Nvidia boards where the timer doesn't seem to tick of it isn't enabled in the 8259. At least one VIA board also seemed to have a little trouble with the disabled 8259.

For 2.6.20 we'll try both dynamically without black listing, but I think for .19 this is the safer approach because it has been already well tested in earlier kernels. This also makes the x86-64 behaviour the same as i386.

Command line options can change all this of course.

---
 arch/x86_64/kernel/early-quirks.c |    9 +++++----
 arch/x86_64/kernel/io_apic.c      |    2 +-
 include/asm-x86_64/proto.h        |    2 ++
 3 files changed, 8 insertions(+), 5 deletions(-)
arch/x86_64/kernel/early-quirks.c +5 -4
Index: linux/arch/x86_64/kernel/early-quirks.c
===================================================================
@@ -61,10 +61,11 @@ static void nvidia_bugs(void)
 
 static void ati_bugs(void)
 {
-#if 1 /* for testing */
-	printk("ATI board detected\n");
-#endif
-	/* No bugs right now */
+	if (timer_over_8254 == 1) {
+		timer_over_8254 = 0;
+		printk(KERN_INFO
+	 	"ATI board detected. Disabling timer routing over 8254.\n");
+	}
 }
 
 struct chipset {
arch/x86_64/kernel/io_apic.c +1 -1
Index: linux/arch/x86_64/kernel/io_apic.c
===================================================================
@@ -57,7 +57,7 @@ static int no_timer_check;
 
 static int disable_timer_pin_1 __initdata;
 
-int timer_over_8254 __initdata = 0;
+int timer_over_8254 __initdata = 1;
 
 /* Where if anywhere is the i8259 connect in external int mode */
 static struct { int pin, apic; } ioapic_i8259 = { -1, -1 };
include/asm-x86_64/proto.h +2 -0
Index: linux/include/asm-x86_64/proto.h
===================================================================
@@ -122,6 +122,8 @@ extern int fix_aperture;
 extern int reboot_force;
 extern int notsc_setup(char *);
 
+extern int timer_over_8254;
+
 extern int gsi_irq_sharing(int gsi);
 
 extern void smp_local_timer_interrupt(void);