diff options
| author | Tejun Heo <tj@kernel.org> | 2009-07-03 18:13:18 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-07-03 18:13:18 -0400 |
| commit | c43768cbb7655ea5ff782ae250f6e2ef4297cf98 (patch) | |
| tree | 3982e41dde3eecaa3739a5d1a8ed18d04bd74f01 /drivers/pci/intr_remapping.h | |
| parent | 1a8dd307cc0a2119be4e578c517795464e6dabba (diff) | |
| parent | 746a99a5af60ee676afa2ba469ccd1373493c7e7 (diff) | |
Merge branch 'master' into for-next
Pull linus#master to merge PER_CPU_DEF_ATTRIBUTES and alpha build fix
changes. As alpha in percpu tree uses 'weak' attribute instead of
inline assembly, there's no need for __used attribute.
Conflicts:
arch/alpha/include/asm/percpu.h
arch/mn10300/kernel/vmlinux.lds.S
include/linux/percpu-defs.h
Diffstat (limited to 'drivers/pci/intr_remapping.h')
| -rw-r--r-- | drivers/pci/intr_remapping.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/intr_remapping.h b/drivers/pci/intr_remapping.h index ca48f0df8ac9..63a263c18415 100644 --- a/drivers/pci/intr_remapping.h +++ b/drivers/pci/intr_remapping.h | |||
| @@ -3,6 +3,8 @@ | |||
| 3 | struct ioapic_scope { | 3 | struct ioapic_scope { |
| 4 | struct intel_iommu *iommu; | 4 | struct intel_iommu *iommu; |
| 5 | unsigned int id; | 5 | unsigned int id; |
| 6 | unsigned int bus; /* PCI bus number */ | ||
| 7 | unsigned int devfn; /* PCI devfn number */ | ||
| 6 | }; | 8 | }; |
| 7 | 9 | ||
| 8 | #define IR_X2APIC_MODE(mode) (mode ? (1 << 11) : 0) | 10 | #define IR_X2APIC_MODE(mode) (mode ? (1 << 11) : 0) |