Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af1713e0 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: no paravirt for X86_VOYAGER or X86_VISWS
  [PATCH] i386: Fix io_apic.c warning
  [PATCH] i386: export smp_num_siblings for oprofile
  [PATCH] x86: Work around gcc 4.2 over aggressive optimizer
  [PATCH] x86: Fix boot hang due to nmi watchdog init code
  [PATCH] x86: Fix verify_quirk_intel_irqbalance()
  [PATCH] i386: Update defconfig
  [PATCH] x86-64: Update defconfig
parents 9b3a89f8 f0f32fcc

arch/i386/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ endchoice 
config PARAVIRT

	bool "Paravirtualization support (EXPERIMENTAL)"

	depends on EXPERIMENTAL

	depends on !(X86_VISWS || X86_VOYAGER)

	help

	  Paravirtualization is a way of running multiple instances of

	  Linux on the same machine, under a hypervisor.  This option

arch/i386/defconfig

+21 −7
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.19-git7

# Wed Dec  6 23:50:49 2006

# Linux kernel version: 2.6.19-git14

# Sat Dec  9 21:23:14 2006

#

CONFIG_X86_32=y

CONFIG_GENERIC_TIME=y
@@ -12,6 +12,7 @@ CONFIG_X86=y 
CONFIG_MMU=y

CONFIG_GENERIC_ISA_DMA=y

CONFIG_GENERIC_IOMAP=y

CONFIG_GENERIC_BUG=y

CONFIG_GENERIC_HWEIGHT=y

CONFIG_ARCH_MAY_HAVE_PC_FDC=y

CONFIG_DMI=y
@@ -141,6 +142,8 @@ CONFIG_X86_CMPXCHG=y 
CONFIG_X86_XADD=y

CONFIG_X86_L1_CACHE_SHIFT=7

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

# CONFIG_ARCH_HAS_ILOG2_U32 is not set

# CONFIG_ARCH_HAS_ILOG2_U64 is not set

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_X86_WP_WORKS_OK=y

CONFIG_X86_INVLPG=y
@@ -203,6 +206,7 @@ CONFIG_MTRR=y 
CONFIG_SECCOMP=y

# CONFIG_HZ_100 is not set

CONFIG_HZ_250=y

# CONFIG_HZ_300 is not set

# CONFIG_HZ_1000 is not set

CONFIG_HZ=250

# CONFIG_KEXEC is not set
@@ -563,6 +567,7 @@ CONFIG_IDEDMA_AUTO=y 
#

# CONFIG_RAID_ATTRS is not set

CONFIG_SCSI=y

# CONFIG_SCSI_TGT is not set

CONFIG_SCSI_NETLINK=y

# CONFIG_SCSI_PROC_FS is not set
@@ -583,6 +588,7 @@ CONFIG_CHR_DEV_SG=y 
# CONFIG_SCSI_MULTI_LUN is not set

# CONFIG_SCSI_CONSTANTS is not set

# CONFIG_SCSI_LOGGING is not set

# CONFIG_SCSI_SCAN_ASYNC is not set



#

# SCSI Transports
@@ -642,6 +648,7 @@ CONFIG_AIC79XX_DEBUG_MASK=0 
# CONFIG_SCSI_DC390T is not set

# CONFIG_SCSI_NSP32 is not set

# CONFIG_SCSI_DEBUG is not set

# CONFIG_SCSI_SRP is not set



#

# Serial ATA (prod) and Parallel ATA (experimental) drivers
@@ -1082,10 +1089,7 @@ CONFIG_SOUND=y 
# Open Sound System

#

CONFIG_SOUND_PRIME=y

CONFIG_OSS_OBSOLETE_DRIVER=y

# CONFIG_SOUND_BT878 is not set

# CONFIG_SOUND_EMU10K1 is not set

# CONFIG_SOUND_FUSION is not set

# CONFIG_SOUND_ES1371 is not set

CONFIG_SOUND_ICH=y

# CONFIG_SOUND_TRIDENT is not set
@@ -1094,6 +1098,11 @@ CONFIG_SOUND_ICH=y 
# CONFIG_SOUND_VIA82CXXX is not set

# CONFIG_SOUND_OSS is not set



#

# HID Devices

#

CONFIG_HID=y



#

# USB support

#
@@ -1158,8 +1167,7 @@ CONFIG_USB_STORAGE=y 
# USB Input Devices

#

CONFIG_USB_HID=y

CONFIG_USB_HIDINPUT=y

# CONFIG_USB_HIDINPUT_POWERBOOK is not set

# CONFIG_USB_HID_POWERBOOK is not set

# CONFIG_HID_FF is not set

# CONFIG_USB_HIDDEV is not set

# CONFIG_USB_AIPTEK is not set
@@ -1443,6 +1451,11 @@ CONFIG_NLS_ISO8859_15=y 
# CONFIG_NLS_KOI8_U is not set

CONFIG_NLS_UTF8=y



#

# Distributed Lock Manager

#

# CONFIG_DLM is not set



#

# Instrumentation Support

#
@@ -1509,6 +1522,7 @@ CONFIG_DOUBLEFAULT=y 
#

# Library routines

#

CONFIG_BITREVERSE=y

# CONFIG_CRC_CCITT is not set

# CONFIG_CRC16 is not set

CONFIG_CRC32=y

arch/i386/kernel/io_apic.c

+1 −1
Original line number Diff line number Diff line
@@ -2485,7 +2485,7 @@ device_initcall(ioapic_init_sysfs); 
int create_irq(void)

{

	/* Allocate an unused irq */

	int irq, new, vector;

	int irq, new, vector = 0;

	unsigned long flags;



	irq = -ENOSPC;

arch/i386/kernel/nmi.c

+4 −4
Original line number Diff line number Diff line
@@ -195,6 +195,8 @@ static __cpuinit inline int nmi_known_cpu(void) 
	return 0;

}



static int endflag __initdata = 0;



#ifdef CONFIG_SMP

/* The performance counters used by NMI_LOCAL_APIC don't trigger when

 * the CPU is idle. To make sure the NMI watchdog really ticks on all
@@ -202,7 +204,6 @@ static __cpuinit inline int nmi_known_cpu(void) 
 */

static __init void nmi_cpu_busy(void *data)

{

	volatile int *endflag = data;

	local_irq_enable_in_hardirq();

	/* Intentionally don't use cpu_relax here. This is

	   to make sure that the performance counter really ticks,
@@ -210,14 +211,13 @@ static __init void nmi_cpu_busy(void *data) 
	   pause instruction. On a real HT machine this is fine because

	   all other CPUs are busy with "useless" delay loops and don't

	   care if they get somewhat less cycles. */

	while (*endflag == 0)

		barrier();

	while (endflag == 0)

		mb();

}

#endif



static int __init check_nmi_watchdog(void)

{

	volatile int endflag = 0;

	unsigned int *prev_nmi_count;

	int cpu;

arch/i386/kernel/quirks.c

+29 −4
Original line number Diff line number Diff line
@@ -10,6 +10,26 @@ 
#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_SMP) && defined(CONFIG_PCI)

static void __devinit verify_quirk_intel_irqbalance(struct pci_dev *dev)

{

	u8 config, rev;

	u32 word;



	/* BIOS may enable hardware IRQ balancing for

	 * E7520/E7320/E7525(revision ID 0x9 and below)

	 * based platforms.

	 * For those platforms, make sure that the genapic is set to 'flat'

	 */

	pci_read_config_byte(dev, PCI_CLASS_REVISION, &rev);

	if (rev > 0x9)

		return;



	/* enable access to config space*/

	pci_read_config_byte(dev, 0xf4, &config);

	pci_write_config_byte(dev, 0xf4, config|0x2);



	/* read xTPR register */

	raw_pci_ops->read(0, 0, 0x40, 0x4c, 2, &word);



	if (!(word & (1 << 13))) {

#ifdef CONFIG_X86_64

		if (genapic !=  &apic_flat)

			panic("APIC mode must be flat on this system\n");
@@ -19,6 +39,11 @@ static void __devinit verify_quirk_intel_irqbalance(struct pci_dev *dev) 
#endif

	}



	/* put back the original value for config space*/

	if (!(config & 0x2))

		pci_write_config_byte(dev, 0xf4, config);

}



void __init quirk_intel_irqbalance(void)

{

	u8 config, rev;