git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
apic
/
x2apic_uv_x.c
diff --git
a/arch/x86/kernel/apic/x2apic_uv_x.c
b/arch/x86/kernel/apic/x2apic_uv_x.c
index
b511a01
..
adc66c3
100644
(file)
--- 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,
/* 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;
{
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)
return 0;
if ((command_bits & PCI_COMMAND_IO) == 0)