diff options
author | Konstantin Khlebnikov <khlebnikov@openvz.org> | 2012-03-21 01:56:33 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-04-10 14:44:21 -0400 |
commit | 7cfce77d779f43299c1cfeddd72462fed596c168 (patch) | |
tree | 4a884daea50b97f7448f0c200bd84ecc3642aa25 | |
parent | 72da1f20afae1bd3f7ee4a27b2b8cda8838d61ef (diff) |
[media] mm/drivers: use vm_flags_t for vma flags
Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
Cc: linux-media@vger.kernel.org
Cc: devel@driverdev.osuosl.org
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: John Stultz <john.stultz@linaro.org>
Cc: "Arve Hjønnevåg" <arve@android.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/video/omap3isp/ispqueue.h | 2 | ||||
-rw-r--r-- | drivers/staging/android/ashmem.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/omap3isp/ispqueue.h b/drivers/media/video/omap3isp/ispqueue.h index 92c5a12157d5..908dfd712e8e 100644 --- a/drivers/media/video/omap3isp/ispqueue.h +++ b/drivers/media/video/omap3isp/ispqueue.h | |||
@@ -90,7 +90,7 @@ struct isp_video_buffer { | |||
90 | void *vaddr; | 90 | void *vaddr; |
91 | 91 | ||
92 | /* For userspace buffers. */ | 92 | /* For userspace buffers. */ |
93 | unsigned long vm_flags; | 93 | vm_flags_t vm_flags; |
94 | unsigned long offset; | 94 | unsigned long offset; |
95 | unsigned int npages; | 95 | unsigned int npages; |
96 | struct page **pages; | 96 | struct page **pages; |
diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c index 9f1f27e7c86e..4511420849bc 100644 --- a/drivers/staging/android/ashmem.c +++ b/drivers/staging/android/ashmem.c | |||
@@ -269,7 +269,7 @@ out: | |||
269 | return ret; | 269 | return ret; |
270 | } | 270 | } |
271 | 271 | ||
272 | static inline unsigned long calc_vm_may_flags(unsigned long prot) | 272 | static inline vm_flags_t calc_vm_may_flags(unsigned long prot) |
273 | { | 273 | { |
274 | return _calc_vm_trans(prot, PROT_READ, VM_MAYREAD) | | 274 | return _calc_vm_trans(prot, PROT_READ, VM_MAYREAD) | |
275 | _calc_vm_trans(prot, PROT_WRITE, VM_MAYWRITE) | | 275 | _calc_vm_trans(prot, PROT_WRITE, VM_MAYWRITE) | |