summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-05-25 14:00:49 +1000
committerDave Airlie <airlied@redhat.com>2011-06-14 09:50:12 +1000
commit7ad35cf288fd63a19bf50e490440a992de808b2b (patch)
treea240c3487926ebe62d8c10e0d1ae75db38f025e6 /drivers/pci
parent83533c132a55aac735028f6fb9b956e8c078db1f (diff)
downloadop-kernel-dev-7ad35cf288fd63a19bf50e490440a992de808b2b.zip
op-kernel-dev-7ad35cf288fd63a19bf50e490440a992de808b2b.tar.gz
x86/uv/x2apic: update for change in pci bridge handling.
When I added 3448a19da479b6bd1e28e2a2be9fa16c6a6feb39 I forgot about the special uv handling code for this, so this patch fixes it up. Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org> Acked-by: Ingo Molnar Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 56098b3..5f10c23 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -3271,11 +3271,11 @@ void __init pci_register_set_vga_state(arch_set_vga_state_t func)
}
static int pci_set_vga_state_arch(struct pci_dev *dev, bool decode,
- unsigned int command_bits, bool change_bridge)
+ unsigned int command_bits, u32 flags)
{
if (arch_set_vga_state)
return arch_set_vga_state(dev, decode, command_bits,
- change_bridge);
+ flags);
return 0;
}
OpenPOWER on IntegriCloud