git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
usb
/
mon
/
mon_dma.c
diff --git
a/drivers/usb/mon/mon_dma.c
b/drivers/usb/mon/mon_dma.c
index
0a1367b
..
ddcfc01
100644
(file)
--- a/
drivers/usb/mon/mon_dma.c
+++ b/
drivers/usb/mon/mon_dma.c
@@
-13,7
+13,10
@@
#include <linux/usb.h> /* Only needed for declarations in usb_mon.h */
#include "usb_mon.h"
#include <linux/usb.h> /* Only needed for declarations in usb_mon.h */
#include "usb_mon.h"
-#ifdef __i386__ /* CONFIG_ARCH_I386 does not exit */
+/*
+ * PC-compatibles, are, fortunately, sufficiently cache-coherent for this.
+ */
+#if defined(__i386__) || defined(__x86_64__) /* CONFIG_ARCH_I386 doesn't exit */
#define MON_HAS_UNMAP 1
#define phys_to_page(phys) pfn_to_page((phys) >> PAGE_SHIFT)
#define MON_HAS_UNMAP 1
#define phys_to_page(phys) pfn_to_page((phys) >> PAGE_SHIFT)