git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/core-cleanup' into for-linus
[safe/jmp/linux-2.6]
/
arch
/
x86
/
kernel
/
amd_iommu.c
diff --git
a/arch/x86/kernel/amd_iommu.c
b/arch/x86/kernel/amd_iommu.c
index
71dfc0a
..
f854d89
100644
(file)
--- a/
arch/x86/kernel/amd_iommu.c
+++ b/
arch/x86/kernel/amd_iommu.c
@@
-18,8
+18,8
@@
*/
#include <linux/pci.h>
*/
#include <linux/pci.h>
-#include <linux/gfp.h>
#include <linux/bitmap.h>
#include <linux/bitmap.h>
+#include <linux/slab.h>
#include <linux/debugfs.h>
#include <linux/scatterlist.h>
#include <linux/dma-mapping.h>
#include <linux/debugfs.h>
#include <linux/scatterlist.h>
#include <linux/dma-mapping.h>
@@
-2187,7
+2187,7
@@
static void prealloc_protection_domains(void)
struct dma_ops_domain *dma_dom;
u16 devid;
struct dma_ops_domain *dma_dom;
u16 devid;
-
while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL
) {
+
for_each_pci_dev(dev
) {
/* Do we handle this device? */
if (!check_device(&dev->dev))
/* Do we handle this device? */
if (!check_device(&dev->dev))