lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeature', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/detect-hyper', 'x86/doc', 'x86/dumpstack', 'x86/early-printk', 'x86/fpu', 'x86/idle', 'x86/io', 'x86/memory-corruption-check', 'x86/microcode', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/pat2', 'x86/pci-ioapic-boot-irq-quirks', 'x86/ptrace', 'x86/quirks', 'x86/reboot', 'x86/setup-memory', 'x86/signal', 'x86/sparse-fixes', 'x86/time', 'x86/uv' and 'x86/xen' into x86/core

Browse Source
This commit is contained in:
Ingo Molnar
2008-12-23 16:27:23 +01:00
parent 3d44cc3e01 1ccedb7cdb 34945ede31 d437797406 c415b3dce3 beeb4195cb f269b07e86 4e42ebd57b e1286f2c68 878719e831 fd28a5b58d adf77bac05 8f2466f45f 93093d099e bb5574608a f34a10bd9f b6fd6f2673 30604bb410 5b9a0e14eb 67bac792cd 7a9787e1eb f4166c54bf 69b88afa8d 8daa19051e 3e1e9002aa 8403295e0f 4db646b1af 205516c12d c8182f0016 ecbf29cdb3
commit fa623d1b02
173 changed files with 4121 additions and 3195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/pci.h
View File

@ -134,6 +134,11 @@ enum pci_dev_flags {
PCI_DEV_FLAGS_NO_D3 = (__force pci_dev_flags_t) 2,
};
enum pci_irq_reroute_variant {
INTEL_IRQ_REROUTE_VARIANT = 1,
MAX_IRQ_REROUTE_VARIANTS = 3
};
typedef unsigned short __bitwise pci_bus_flags_t;
enum pci_bus_flags {
PCI_BUS_FLAGS_NO_MSI = (__force pci_bus_flags_t) 1,
@ -218,6 +223,7 @@ struct pci_dev {
unsigned int no_msi:1; /* device may not use msi */
unsigned int block_ucfg_access:1; /* userspace config space access is blocked */
unsigned int broken_parity_status:1; /* Device generates false positive parity */
unsigned int irq_reroute_variant:2; /* device needs IRQ rerouting variant */
unsigned int msi_enabled:1;
unsigned int msix_enabled:1;
unsigned int ari_enabled:1; /* ARI forwarding */