projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'mac80211-for-john-2014-11-18' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
dmar.h
diff --git
a/include/linux/dmar.h
b/include/linux/dmar.h
index 1deece46a0caa408357ffd66196423b18f2a274e..593fff99e6bf51cdc73424f57bb34921a8634376 100644
(file)
--- a/
include/linux/dmar.h
+++ b/
include/linux/dmar.h
@@
-56,13
+56,19
@@
struct dmar_drhd_unit {
struct intel_iommu *iommu;
};
struct intel_iommu *iommu;
};
+struct dmar_pci_path {
+ u8 bus;
+ u8 device;
+ u8 function;
+};
+
struct dmar_pci_notify_info {
struct pci_dev *dev;
unsigned long event;
int bus;
u16 seg;
u16 level;
struct dmar_pci_notify_info {
struct pci_dev *dev;
unsigned long event;
int bus;
u16 seg;
u16 level;
- struct
acpi_dmar_pci_path
path[];
+ struct
dmar_pci_path
path[];
} __attribute__((packed));
extern struct rw_semaphore dmar_global_lock;
} __attribute__((packed));
extern struct rw_semaphore dmar_global_lock;