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

Commit a3ea9b58 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (49 commits)
  [PATCH] acpiphp: fix acpi_path_name
  [PATCH] ibmphp: remove TRUE and FALSE
  [PATCH] PCI Hotplug: add common acpi functions to core
  [PATCH] PCI: kzalloc() conversion in drivers/pci
  [PATCH] acpiphp: Scan slots under the nested P2P bridge
  [PATCH] PCI Hotplug: SN: Fix cleanup on hotplug removal of PPB
  [PATCH] shpchp: cleanup bus speed handling
  [PATCH] PCI: fix pci_request_region[s] arg
  [PATCH] PCI: Provide a boot parameter to disable MSI
  [PATCH] PCI: the scheduled removal of PCI_LEGACY_PROC
  [PATCH] PCI: cpqphp_ctrl.c: board_replaced(): remove dead code
  [PATCH] acpiphp: fix bridge handle
  [PATCH] acpiphp - slot management fix - V4
  [PATCH] acpi: remove dock event handling from ibm_acpi
  [PATCH] acpiphp: add dock event handling
  [PATCH] acpi: export acpi_bus_trim
  [PATCH] acpiphp: add new bus to acpi
  [PATCH] PCI: Move pci_dev_put outside a spinlock
  [PATCH] PCI: PCI/Cardbus cards hidden, needs pci=assign-busses to fix
  [PATCH] PCI: fix problems with MSI-X on ia64
  ...
parents 554f593d b2e6e3ba

Documentation/feature-removal-schedule.txt

+0 −7
Original line number Diff line number Diff line
@@ -158,13 +158,6 @@ Who: Adrian Bunk <bunk@stusta.de> 


---------------------------



What:	Legacy /proc/pci interface (PCI_LEGACY_PROC)

When:	March 2006

Why:	deprecated since 2.5.53 in favor of lspci(8)

Who:	Adrian Bunk <bunk@stusta.de>



---------------------------



What:	pci_module_init(driver)

When:	January 2007

Why:	Is replaced by pci_register_driver(pci_driver).

Documentation/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ restrictions referred to are that the relevant option is valid if: 
	MCA	MCA bus support is enabled.

	MDA	MDA console support is enabled.

	MOUSE	Appropriate mouse support is enabled.

	MSI	Message Signaled Interrupts (PCI).

	MTD	MTD support is enabled.

	NET	Appropriate network support is enabled.

	NUMA	NUMA support is enabled.
@@ -1152,6 +1153,9 @@ running once the system is up. 
				Mechanism 2.

		nommconf	[IA-32,X86_64] Disable use of MMCONFIG for PCI

				Configuration

		nomsi		[MSI] If the PCI_MSI kernel config parameter is

				enabled, this kernel boot option can be used to

				disable the use of MSI interrupts system-wide.

		nosort		[IA-32] Don't sort PCI devices according to

				order given by the PCI BIOS. This sorting is

				done to get a device order compatible with

arch/i386/kernel/efi.c

+1 −1
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ efi_initialize_iomem_resources(struct resource *code_resource, 
		if ((md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT)) >

		    0x100000000ULL)

			continue;

		res = alloc_bootmem_low(sizeof(struct resource));

		res = kzalloc(sizeof(struct resource), GFP_ATOMIC);

		switch (md->type) {

		case EFI_RESERVED_TYPE:

			res->name = "Reserved Memory";

arch/i386/kernel/setup.c

+17 −5
Original line number Diff line number Diff line
@@ -1288,7 +1288,7 @@ legacy_init_iomem_resources(struct resource *code_resource, struct resource *dat 
		struct resource *res;

		if (e820.map[i].addr + e820.map[i].size > 0x100000000ULL)

			continue;

		res = alloc_bootmem_low(sizeof(struct resource));

		res = kzalloc(sizeof(struct resource), GFP_ATOMIC);

		switch (e820.map[i].type) {

		case E820_RAM:	res->name = "System RAM"; break;

		case E820_ACPI:	res->name = "ACPI Tables"; break;
@@ -1316,13 +1316,15 @@ legacy_init_iomem_resources(struct resource *code_resource, struct resource *dat 


/*

 * Request address space for all standard resources

 *

 * This is called just before pcibios_assign_resources(), which is also

 * an fs_initcall, but is linked in later (in arch/i386/pci/i386.c).

 */

static void __init register_memory(void)

static int __init request_standard_resources(void)

{

	unsigned long gapstart, gapsize, round;

	unsigned long long last;

	int i;



	printk("Setting up standard PCI resources\n");

	if (efi_enabled)

		efi_initialize_iomem_resources(&code_resource, &data_resource);

	else
@@ -1334,6 +1336,16 @@ static void __init register_memory(void) 
	/* request I/O space for devices used on all i[345]86 PCs */

	for (i = 0; i < STANDARD_IO_RESOURCES; i++)

		request_resource(&ioport_resource, &standard_io_resources[i]);

	return 0;

}



fs_initcall(request_standard_resources);



static void __init register_memory(void)

{

	unsigned long gapstart, gapsize, round;

	unsigned long long last;

	int i;



	/*

	 * Search for the bigest gap in the low 32 bits of the e820

arch/i386/pci/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-y				:= i386.o

obj-y				:= i386.o init.o



obj-$(CONFIG_PCI_BIOS)		+= pcbios.o

obj-$(CONFIG_PCI_MMCONFIG)	+= mmconfig.o direct.o