Commit 5d6aaf3f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6 

* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6:
  [PATCH] x86-64: Revert timer routing behaviour back to 2.6.16 state
  [PATCH] x86-64: Overlapping program headers in physical addr space fix
  [PATCH] x86-64: Put more than one cpu in TARGET_CPUS
  [PATCH] x86: Revert new unwind kernel stack termination
  [PATCH] x86-64: Use irq_domain in ioapic_retrigger_irq
  [PATCH] i386: Disable nmi watchdog on all ThinkPads
  [PATCH] x86-64: Revert interrupt backlink changes
  [PATCH] x86-64: Fix ENOSYS in system call tracing
  [PATCH] i386: Fix fake return address
  [PATCH] x86-64: x86_64 add NX mask for PTE entry
  [PATCH] x86-64: Speed up dwarf2 unwinder
  [PATCH] x86: Use -maccumulate-outgoing-args
  [PATCH] x86-64: fix page align in e820 allocator
  [PATCH] x86-64: Fix for arch/x86_64/pci/Makefile CFLAGS
  [PATCH] i386: fix .cfi_signal_frame copy-n-paste error
  [PATCH] x86-64: typo in __assign_irq_vector when updating pos for vector and offset
  [PATCH] x86-64: x86_64 hot-add memory srat.c fix
  [PATCH] i386: Update defconfig
  [PATCH] x86-64: Update defconfig
parents fc22617e e70ea8c0

Makefile

+1 −0
Original line number Diff line number Diff line
@@ -499,6 +499,7 @@ endif 


ifdef CONFIG_UNWIND_INFO

CFLAGS		+= -fasynchronous-unwind-tables

LDFLAGS_vmlinux	+= --eh-frame-hdr

endif



ifdef CONFIG_DEBUG_INFO

arch/i386/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -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 ;)
@@ -51,8 +55,8 @@ 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,)



# 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)

arch/i386/defconfig

+15 −15
Original line number Diff line number Diff line 
#

# 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
@@ -482,6 +482,13 @@ CONFIG_BLK_DEV_INITRD=y 
# CONFIG_CDROM_PKTCDVD is not set

# 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

#
@@ -1024,6 +1031,7 @@ CONFIG_HANGCHECK_TIMER=y 
#

# Dallas's 1-wire bus

#

# CONFIG_W1 is not set



#

# Hardware Monitoring support
@@ -1031,12 +1039,6 @@ CONFIG_HANGCHECK_TIMER=y 
# CONFIG_HWMON is not set

# CONFIG_HWMON_VID is not set



#

# Misc devices

#

# CONFIG_IBM_ASM is not set

# CONFIG_TIFM_CORE is not set



#

# Multimedia devices

#
@@ -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
@@ -1436,10 +1439,6 @@ CONFIG_NLS_ISO8859_15=y 
# CONFIG_NLS_KOI8_U is not set

CONFIG_NLS_UTF8=y



#

# Distributed Lock Manager

#



#

# Instrumentation Support

#
@@ -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

arch/i386/kernel/head.S

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/i386/kernel/nmi.c

+5 −5
Original line number Diff line number Diff line
@@ -219,11 +219,11 @@ static int __init check_nmi_watchdog(void) 
	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))

CRA Git | Maintained and supported by SUSTech CRA and CCSE