Automatic merge with /usr/src/ntfs-2.6.git. (4ff4258a) · Commits · 戴 / test

arch/i386/Kconfig

+1 −1

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

	config PCI_MMCONFIG		config PCI_MMCONFIG
	bool		bool
	depends on PCI && (PCI_GOMMCONFIG \|\| (PCI_GOANY && ACPI))		depends on PCI && ACPI && (PCI_GOMMCONFIG \|\| PCI_GOANY)
	select ACPI_BOOT		select ACPI_BOOT
	default y		default y

+1 −1

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

	#define MAX_CACHE_LEAVES 4		#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)		static int __devinit cpuid4_cache_lookup(int index, struct _cpuid4_info *this_leaf)
	{		{

+3 −1

Original line number	Original line	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]);		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);		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) {		if (c->x86_num_cores > 1) {
	for (i = 0; i < NR_CPUS; i++) {		for (i = 0; i < NR_CPUS; i++) {

+0 −5

Original line number	Original line	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)		static int pirq_enable_irq(struct pci_dev *dev)
	{		{
	u8 pin;		u8 pin;
	extern int via_interrupt_line_quirk;
	struct pci_dev *temp_dev;		struct pci_dev *temp_dev;

	pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);		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",		printk(KERN_WARNING "PCI: No IRQ known for interrupt pin %c of device %s.%s\n",
	'A' + pin, pci_name(dev), msg);		'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;		return 0;
	}		}

+2 −2

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

	config PCI_8260		config PCI_8260
	bool		bool
	depends on PCI && 8260 && !8272		depends on PCI && 8260
	default y		default y

	config 8260_PCI9		config 8260_PCI9
	bool " Enable workaround for MPC826x erratum PCI 9"		bool " Enable workaround for MPC826x erratum PCI 9"
	depends on PCI_8260		depends on PCI_8260 && !ADS8272
	default y		default y

	choice		choice