diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /drivers/usb/mon | |
parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) |
Patched in Tegra support.
Diffstat (limited to 'drivers/usb/mon')
-rw-r--r-- | drivers/usb/mon/mon_bin.c | 3 | ||||
-rw-r--r-- | drivers/usb/mon/mon_stat.c | 1 | ||||
-rw-r--r-- | drivers/usb/mon/mon_text.c | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c index 9a62e89d6dc..a04b2ff9dd8 100644 --- a/drivers/usb/mon/mon_bin.c +++ b/drivers/usb/mon/mon_bin.c | |||
@@ -11,7 +11,6 @@ | |||
11 | #include <linux/types.h> | 11 | #include <linux/types.h> |
12 | #include <linux/fs.h> | 12 | #include <linux/fs.h> |
13 | #include <linux/cdev.h> | 13 | #include <linux/cdev.h> |
14 | #include <linux/export.h> | ||
15 | #include <linux/usb.h> | 14 | #include <linux/usb.h> |
16 | #include <linux/poll.h> | 15 | #include <linux/poll.h> |
17 | #include <linux/compat.h> | 16 | #include <linux/compat.h> |
@@ -1247,7 +1246,7 @@ static int mon_bin_mmap(struct file *filp, struct vm_area_struct *vma) | |||
1247 | { | 1246 | { |
1248 | /* don't do anything here: "fault" will set up page table entries */ | 1247 | /* don't do anything here: "fault" will set up page table entries */ |
1249 | vma->vm_ops = &mon_bin_vm_ops; | 1248 | vma->vm_ops = &mon_bin_vm_ops; |
1250 | vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; | 1249 | vma->vm_flags |= VM_RESERVED; |
1251 | vma->vm_private_data = filp->private_data; | 1250 | vma->vm_private_data = filp->private_data; |
1252 | mon_bin_vma_open(vma); | 1251 | mon_bin_vma_open(vma); |
1253 | return 0; | 1252 | return 0; |
diff --git a/drivers/usb/mon/mon_stat.c b/drivers/usb/mon/mon_stat.c index ebd6189a501..e5ce42bd316 100644 --- a/drivers/usb/mon/mon_stat.c +++ b/drivers/usb/mon/mon_stat.c | |||
@@ -9,7 +9,6 @@ | |||
9 | 9 | ||
10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
11 | #include <linux/slab.h> | 11 | #include <linux/slab.h> |
12 | #include <linux/export.h> | ||
13 | #include <linux/usb.h> | 12 | #include <linux/usb.h> |
14 | #include <linux/fs.h> | 13 | #include <linux/fs.h> |
15 | #include <asm/uaccess.h> | 14 | #include <asm/uaccess.h> |
diff --git a/drivers/usb/mon/mon_text.c b/drivers/usb/mon/mon_text.c index ad408251d95..1c3afcc11bd 100644 --- a/drivers/usb/mon/mon_text.c +++ b/drivers/usb/mon/mon_text.c | |||
@@ -9,7 +9,6 @@ | |||
9 | #include <linux/usb.h> | 9 | #include <linux/usb.h> |
10 | #include <linux/slab.h> | 10 | #include <linux/slab.h> |
11 | #include <linux/time.h> | 11 | #include <linux/time.h> |
12 | #include <linux/export.h> | ||
13 | #include <linux/mutex.h> | 12 | #include <linux/mutex.h> |
14 | #include <linux/debugfs.h> | 13 | #include <linux/debugfs.h> |
15 | #include <linux/scatterlist.h> | 14 | #include <linux/scatterlist.h> |