lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

Browse Source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  x86/PCI/ACPI: fix type mismatch
  PCI: fix new kernel-doc warning
  PCI: Fix warning in drivers/pci/probe.c on sparc64
This commit is contained in:
Linus Torvalds
2011-06-24 08:36:16 -07:00
parent 143e859d05 6e33a852a3
commit 12f1ba5a7d
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/pci/acpi.c
View File

@@ -188,7 +188,7 @@ static bool resource_contains(struct resource *res, resource_size_t point)
return false; return false;
} }
static void coalesce_windows(struct pci_root_info *info, int type) static void coalesce_windows(struct pci_root_info *info, unsigned long type)
{ {
int i, j; int i, j;
struct resource *res1, *res2; struct resource *res1, *res2;

2
drivers/pci/pci.c
View File

@@ -3284,7 +3284,7 @@ static int pci_set_vga_state_arch(struct pci_dev *dev, bool decode,
* @dev: the PCI device * @dev: the PCI device
* @decode: true = enable decoding, false = disable decoding * @decode: true = enable decoding, false = disable decoding
* @command_bits: PCI_COMMAND_IO and/or PCI_COMMAND_MEMORY * @command_bits: PCI_COMMAND_IO and/or PCI_COMMAND_MEMORY
* @change_bridge_flags: traverse ancestors and change bridges * @flags: traverse ancestors and change bridges
* CHANGE_BRIDGE_ONLY / CHANGE_BRIDGE * CHANGE_BRIDGE_ONLY / CHANGE_BRIDGE
*/ */
int pci_set_vga_state(struct pci_dev *dev, bool decode, int pci_set_vga_state(struct pci_dev *dev, bool decode,

2
drivers/pci/probe.c
View File

@@ -168,7 +168,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
res->flags |= pci_calc_resource_flags(l) | IORESOURCE_SIZEALIGN; res->flags |= pci_calc_resource_flags(l) | IORESOURCE_SIZEALIGN;
if (type == pci_bar_io) { if (type == pci_bar_io) {
l &= PCI_BASE_ADDRESS_IO_MASK; l &= PCI_BASE_ADDRESS_IO_MASK;
mask = PCI_BASE_ADDRESS_IO_MASK & IO_SPACE_LIMIT; mask = PCI_BASE_ADDRESS_IO_MASK & (u32) IO_SPACE_LIMIT;
} else { } else {
l &= PCI_BASE_ADDRESS_MEM_MASK; l &= PCI_BASE_ADDRESS_MEM_MASK;
mask = (u32)PCI_BASE_ADDRESS_MEM_MASK; mask = (u32)PCI_BASE_ADDRESS_MEM_MASK;