History

Merge branch 'pci/resource' into next

* pci/resource: PCI: Don't resize resources when realigning all devices in system PCI: Don't reassign resources that are already aligned PCI: Factor pci_reassigndev_resource_alignment() powerpc/powernv: Override pcibios_default_alignment() to force PCI devices to be page aligned PCI: Add pcibios_default_alignment() for arch-specific alignment control PCI: Fix calculation of bridge window's size and alignment PCI: Ignore requested alignment for IOV BARs PCI: Make PCI_ROM_ADDRESS_MASK a 32-bit constant

Bjorn Helgaas committed 9 years ago

Commit 78f09832 parents acc886e e3adec78 files · +104 −31Browse files

Showing the changes to include/uapi/linux (1 of 8 files). Show all

Unified · Split

include/uapi/linux/pci_regs.h+1−1
@@ -114,7 +114,7 @@ · 113 unmodified lines
114114 #define PCI_SUBSYSTEM_ID 0x2e
115115 #define PCI_ROM_ADDRESS 0x30 /* Bits 31..11 are address, 10..1 reserved */
116116 #define PCI_ROM_ADDRESS_ENABLE 0x01
117−#define PCI_ROM_ADDRESS_MASK (~0x7ffUL)
117+#define PCI_ROM_ADDRESS_MASK (~0x7ffU)
118118
119119 #define PCI_CAPABILITY_LIST 0x34 /* Offset of first capability list entry */
120120