diff options
author | Dave Airlie <airlied@redhat.com> | 2011-05-25 14:00:49 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-06-14 09:50:12 +1000 |
commit | 7ad35cf288fd63a19bf50e490440a992de808b2b (patch) | |
tree | a240c3487926ebe62d8c10e0d1ae75db38f025e6 /arch/x86/kernel/apic | |
parent | 83533c132a55aac735028f6fb9b956e8c078db1f (diff) | |
download | kernel_samsung_smdk4412-7ad35cf288fd63a19bf50e490440a992de808b2b.zip kernel_samsung_smdk4412-7ad35cf288fd63a19bf50e490440a992de808b2b.tar.gz kernel_samsung_smdk4412-7ad35cf288fd63a19bf50e490440a992de808b2b.tar.bz2 |
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 'arch/x86/kernel/apic')
-rw-r--r-- | arch/x86/kernel/apic/x2apic_uv_x.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index b511a01..adc66c3 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -632,14 +632,14 @@ late_initcall(uv_init_heartbeat); /* Direct Legacy VGA I/O traffic to designated IOH */ int uv_set_vga_state(struct pci_dev *pdev, bool decode, - unsigned int command_bits, bool change_bridge) + unsigned int command_bits, u32 flags) { int domain, bus, rc; - PR_DEVEL("devfn %x decode %d cmd %x chg_brdg %d\n", - pdev->devfn, decode, command_bits, change_bridge); + PR_DEVEL("devfn %x decode %d cmd %x flags %d\n", + pdev->devfn, decode, command_bits, flags); - if (!change_bridge) + if (!(flags & PCI_VGA_STATE_CHANGE_BRIDGE)) return 0; if ((command_bits & PCI_COMMAND_IO) == 0) |