Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6 (b8967d88) · Commits · 戴 / test

arch/x86/kernel/acpi/boot.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,8 @@ static inline int acpi_madt_oem_check(char oem_id, char oem_table_id) { return
		#define PREFIX "ACPI: "

		int acpi_noirq; /* skip ACPI IRQ initialization */
		int acpi_pci_disabled __initdata; /* skip ACPI PCI scan and IRQ initialization */
		int acpi_pci_disabled; /* skip ACPI PCI scan and IRQ initialization */
		EXPORT_SYMBOL(acpi_pci_disabled);
		int acpi_ht __initdata = 1; /* enable HT */

		int acpi_lapic;

arch/x86/pci/irq.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -583,6 +583,10 @@ static __init int intel_router_probe(struct irq_router r, struct pci_dev route
		case PCI_DEVICE_ID_INTEL_ICH9_4:
		case PCI_DEVICE_ID_INTEL_ICH9_5:
		case PCI_DEVICE_ID_INTEL_TOLAPAI_0:
		case PCI_DEVICE_ID_INTEL_ICH10_0:
		case PCI_DEVICE_ID_INTEL_ICH10_1:
		case PCI_DEVICE_ID_INTEL_ICH10_2:
		case PCI_DEVICE_ID_INTEL_ICH10_3:
		r->name = "PIIX/ICH";
		r->get = pirq_piix_get;
		r->set = pirq_piix_set;

drivers/pci/hotplug/acpiphp_core.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -392,6 +392,9 @@ static int __init acpiphp_init(void)
		{
		info(DRIVER_DESC " version: " DRIVER_VERSION "\n");

		if (acpi_pci_disabled)
		return 0;

		acpiphp_debug = debug;

		/* read all the ACPI info from the system */
		@@ -401,6 +404,9 @@ static int __init acpiphp_init(void)

		static void __exit acpiphp_exit(void)
		{
		if (acpi_pci_disabled)
		return;

		/* deallocate internal data structures etc. */
		acpiphp_glue_exit();
		}

drivers/pci/hotplug/acpiphp_ibm.c

+17 −16

Original line number	Diff line number	Diff line
		@@ -395,33 +395,34 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle,
		{
		acpi_handle phandle = (acpi_handle )context;
		acpi_status status;
		struct acpi_device_info info;
		struct acpi_buffer info_buffer = {
		.length = sizeof(struct acpi_device_info),
		.pointer = &info,
		};
		struct acpi_device_info *info;
		struct acpi_buffer info_buffer = { ACPI_ALLOCATE_BUFFER, NULL };
		int retval = 0;

		status = acpi_get_object_info(handle, &info_buffer);
		if (ACPI_FAILURE(status)) {
		err("%s: Failed to get device information\n", __FUNCTION__);
		return 0;
		err("%s: Failed to get device information status=0x%x\n",
		__FUNCTION__, status);
		return retval;
		}
		info.hardware_id.value[sizeof(info.hardware_id.value) - 1] = '\0';

		if (info.current_status && (info.valid & ACPI_VALID_HID) &&
		(!strcmp(info.hardware_id.value, IBM_HARDWARE_ID1) \|\|
		!strcmp(info.hardware_id.value, IBM_HARDWARE_ID2))) {
		dbg("found hardware: %s, handle: %p\n", info.hardware_id.value,
		handle);
		info = info_buffer.pointer;
		info->hardware_id.value[sizeof(info->hardware_id.value) - 1] = '\0';

		if (info->current_status && (info->valid & ACPI_VALID_HID) &&
		(!strcmp(info->hardware_id.value, IBM_HARDWARE_ID1) \|\|
		!strcmp(info->hardware_id.value, IBM_HARDWARE_ID2))) {
		dbg("found hardware: %s, handle: %p\n",
		info->hardware_id.value, handle);
		*phandle = handle;
		/* returning non-zero causes the search to stop
		* and returns this value to the caller of
		* acpi_walk_namespace, but it also causes some warnings
		* in the acpi debug code to print...
		*/
		return FOUND_APCI;
		retval = FOUND_APCI;
		}
		return 0;
		kfree(info);
		return retval;
		}

		static int __init ibm_acpiphp_init(void)

drivers/pci/pci-acpi.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -158,6 +158,7 @@ run_osc_out:
		/**
		* __pci_osc_support_set - register OS support to Firmware
		* @flags: OS support bits
		* @hid: hardware ID
		*
		* Update OS support fields and doing a _OSC Query to obtain an update
		* from Firmware on supported control bits.

Admin message