git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
x86_64
/
kernel
/
io_apic.c
diff --git
a/arch/x86_64/kernel/io_apic.c
b/arch/x86_64/kernel/io_apic.c
index
2fceed5
..
f7625f3
100644
(file)
--- a/
arch/x86_64/kernel/io_apic.c
+++ b/
arch/x86_64/kernel/io_apic.c
@@
-237,6
+237,7
@@
void __init check_ioapic(void)
for (func = 0; func < 8; func++) {
u32 class;
u32 vendor;
for (func = 0; func < 8; func++) {
u32 class;
u32 vendor;
+ u8 type;
class = read_pci_config(num,slot,func,
PCI_CLASS_REVISION);
if (class == 0xffffffff)
class = read_pci_config(num,slot,func,
PCI_CLASS_REVISION);
if (class == 0xffffffff)
@@
-258,7
+259,7
@@
void __init check_ioapic(void)
iommu_aperture_disabled = 1;
}
#endif
iommu_aperture_disabled = 1;
}
#endif
- /* FALL THROUGH */
+ return;
case PCI_VENDOR_ID_NVIDIA:
#ifndef CONFIG_SMP
printk(KERN_INFO
case PCI_VENDOR_ID_NVIDIA:
#ifndef CONFIG_SMP
printk(KERN_INFO
@@
-270,8
+271,8
@@
void __init check_ioapic(void)
}
/* No multi-function device? */
}
/* No multi-function device? */
-
u8
type = read_pci_config_byte(num,slot,func,
-
PCI_HEADER_TYPE);
+ type = read_pci_config_byte(num,slot,func,
+ PCI_HEADER_TYPE);
if (!(type & 0x80))
break;
}
if (!(type & 0x80))
break;
}