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

Commit edb3e182 authored by Jeff Garzik's avatar Jeff Garzik Committed by Jeff Garzik
Browse files

Automatic merge of... 

Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
parents 8973a585 5e485b79

arch/i386/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1163,7 +1163,7 @@ config PCI_DIRECT 


config PCI_MMCONFIG

	bool

	depends on PCI && (PCI_GOMMCONFIG || (PCI_GOANY && ACPI))

	depends on PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)

	select ACPI_BOOT

	default y

arch/i386/kernel/cpu/intel_cacheinfo.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ struct _cpuid4_info { 
};



#define MAX_CACHE_LEAVES		4

static unsigned short __devinitdata	num_cache_leaves;

static unsigned short			num_cache_leaves;



static int __devinit cpuid4_cache_lookup(int index, struct _cpuid4_info *this_leaf)

{

arch/i386/kernel/smpboot.c

+3 −1
Original line number Diff line number Diff line
@@ -1074,8 +1074,10 @@ static void __init smp_boot_cpus(unsigned int max_cpus) 
			cpu_set(cpu, cpu_sibling_map[cpu]);

		}



		if (siblings != smp_num_siblings)

		if (siblings != smp_num_siblings) {

			printk(KERN_WARNING "WARNING: %d siblings found for CPU%d, should be %d\n", siblings, cpu, smp_num_siblings);

			smp_num_siblings = siblings;

		}



		if (c->x86_num_cores > 1) {

			for (i = 0; i < NR_CPUS; i++) {

arch/i386/pci/irq.c

+0 −5
Original line number Diff line number Diff line
@@ -1029,7 +1029,6 @@ void pcibios_penalize_isa_irq(int irq) 
static int pirq_enable_irq(struct pci_dev *dev)

{

	u8 pin;

	extern int via_interrupt_line_quirk;

	struct pci_dev *temp_dev;



	pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
@@ -1084,10 +1083,6 @@ static int pirq_enable_irq(struct pci_dev *dev) 
		printk(KERN_WARNING "PCI: No IRQ known for interrupt pin %c of device %s.%s\n",

		       'A' + pin, pci_name(dev), msg);

	}

	/* VIA bridges use interrupt line for apic/pci steering across

	   the V-Link */

	else if (via_interrupt_line_quirk)

		pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq & 15);

	return 0;

}

arch/ppc/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -1143,12 +1143,12 @@ config PCI_QSPAN 


config PCI_8260

	bool

	depends on PCI && 8260 && !8272

	depends on PCI && 8260

	default y



config 8260_PCI9

	bool "  Enable workaround for MPC826x erratum PCI 9"

	depends on PCI_8260

	depends on PCI_8260 && !ADS8272

	default y



choice