projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
drivers
/
iommu
/
dmar.c
diff --git
a/drivers/iommu/dmar.c
b/drivers/iommu/dmar.c
index
174bb65
..
dc7e478
100644
(file)
--- a/
drivers/iommu/dmar.c
+++ b/
drivers/iommu/dmar.c
@@
-1042,7
+1042,7
@@
int dmar_enable_qi(struct intel_iommu *iommu)
qi->desc = page_address(desc_page);
- qi->desc_status = k
m
alloc(QI_LENGTH * sizeof(int), GFP_ATOMIC);
+ qi->desc_status = k
z
alloc(QI_LENGTH * sizeof(int), GFP_ATOMIC);
if (!qi->desc_status) {
free_page((unsigned long) qi->desc);
kfree(qi);