diff options
| -rw-r--r-- | arch/x86/kernel/apic/x2apic_uv_x.c | 8 | ||||
| -rw-r--r-- | drivers/pci/pci.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index b511a011b7d0..adc66c3a1fef 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); | |||
| 632 | 632 | ||
| 633 | /* Direct Legacy VGA I/O traffic to designated IOH */ | 633 | /* Direct Legacy VGA I/O traffic to designated IOH */ |
| 634 | int uv_set_vga_state(struct pci_dev *pdev, bool decode, | 634 | int uv_set_vga_state(struct pci_dev *pdev, bool decode, |
| 635 | unsigned int command_bits, bool change_bridge) | 635 | unsigned int command_bits, u32 flags) |
| 636 | { | 636 | { |
| 637 | int domain, bus, rc; | 637 | int domain, bus, rc; |
| 638 | 638 | ||
| 639 | PR_DEVEL("devfn %x decode %d cmd %x chg_brdg %d\n", | 639 | PR_DEVEL("devfn %x decode %d cmd %x flags %d\n", |
| 640 | pdev->devfn, decode, command_bits, change_bridge); | 640 | pdev->devfn, decode, command_bits, flags); |
| 641 | 641 | ||
| 642 | if (!change_bridge) | 642 | if (!(flags & PCI_VGA_STATE_CHANGE_BRIDGE)) |
| 643 | return 0; | 643 | return 0; |
| 644 | 644 | ||
| 645 | if ((command_bits & PCI_COMMAND_IO) == 0) | 645 | if ((command_bits & PCI_COMMAND_IO) == 0) |
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 56098b3e17c0..5f10c23dff94 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) | |||
| 3271 | } | 3271 | } |
| 3272 | 3272 | ||
| 3273 | static int pci_set_vga_state_arch(struct pci_dev *dev, bool decode, | 3273 | static int pci_set_vga_state_arch(struct pci_dev *dev, bool decode, |
| 3274 | unsigned int command_bits, bool change_bridge) | 3274 | unsigned int command_bits, u32 flags) |
| 3275 | { | 3275 | { |
| 3276 | if (arch_set_vga_state) | 3276 | if (arch_set_vga_state) |
| 3277 | return arch_set_vga_state(dev, decode, command_bits, | 3277 | return arch_set_vga_state(dev, decode, command_bits, |
| 3278 | change_bridge); | 3278 | flags); |
| 3279 | return 0; | 3279 | return 0; |
| 3280 | } | 3280 | } |
| 3281 | 3281 | ||
