Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: x86: avoid high BIOS area when allocating address space x86: avoid E820 regions when allocating address space x86: avoid low BIOS area when allocating address space resources: add arch hook for preventing allocation in reserved areas Revert "resources: support allocating space within a region from the top down" Revert "PCI: allocate bus resources from the top down" Revert "x86/PCI: allocate space from the end of a region, not the beginning" Revert "x86: allocate space within a region top-down" Revert "PCI: fix pci_bus_alloc_resource() hang, prefer positive decode" PCI: Update MCP55 quirk to not affect non HyperTransport variants
No related branches found
No related tags found
Showing
- Documentation/kernel-parameters.txt 0 additions, 5 deletionsDocumentation/kernel-parameters.txt
- arch/x86/include/asm/e820.h 3 additions, 0 deletionsarch/x86/include/asm/e820.h
- arch/x86/kernel/Makefile 1 addition, 0 deletionsarch/x86/kernel/Makefile
- arch/x86/kernel/resource.c 48 additions, 0 deletionsarch/x86/kernel/resource.c
- arch/x86/kernel/setup.c 0 additions, 1 deletionarch/x86/kernel/setup.c
- arch/x86/pci/i386.c 5 additions, 13 deletionsarch/x86/pci/i386.c
- drivers/pci/bus.c 5 additions, 76 deletionsdrivers/pci/bus.c
- drivers/pci/quirks.c 3 additions, 0 deletionsdrivers/pci/quirks.c
- include/linux/ioport.h 1 addition, 1 deletioninclude/linux/ioport.h
- kernel/resource.c 10 additions, 94 deletionskernel/resource.c
Loading
Please register or sign in to comment