From 27d4ffde933d917d4795723ccbf4299c7c8dbfa9 Mon Sep 17 00:00:00 2001 From: Konstantin Khlebnikov Date: Wed, 21 Mar 2012 02:56:33 -0300 Subject: [PATCH] --- yaml --- r: 306139 b: refs/heads/master c: 7cfce77d779f43299c1cfeddd72462fed596c168 h: refs/heads/master i: 306137: 79e11ac6c00d81315c83d4639e95f1c668257e2a 306135: bc24095ffefd7b5eb145ea63ff48b279956fead2 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/omap3isp/ispqueue.h | 2 +- trunk/drivers/staging/android/ashmem.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a272327c854d..805fcc6fc93a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 72da1f20afae1bd3f7ee4a27b2b8cda8838d61ef +refs/heads/master: 7cfce77d779f43299c1cfeddd72462fed596c168 diff --git a/trunk/drivers/media/video/omap3isp/ispqueue.h b/trunk/drivers/media/video/omap3isp/ispqueue.h index 92c5a12157d5..908dfd712e8e 100644 --- a/trunk/drivers/media/video/omap3isp/ispqueue.h +++ b/trunk/drivers/media/video/omap3isp/ispqueue.h @@ -90,7 +90,7 @@ struct isp_video_buffer { void *vaddr; /* For userspace buffers. */ - unsigned long vm_flags; + vm_flags_t vm_flags; unsigned long offset; unsigned int npages; struct page **pages; diff --git a/trunk/drivers/staging/android/ashmem.c b/trunk/drivers/staging/android/ashmem.c index 9f1f27e7c86e..4511420849bc 100644 --- a/trunk/drivers/staging/android/ashmem.c +++ b/trunk/drivers/staging/android/ashmem.c @@ -269,7 +269,7 @@ static loff_t ashmem_llseek(struct file *file, loff_t offset, int origin) return ret; } -static inline unsigned long calc_vm_may_flags(unsigned long prot) +static inline vm_flags_t calc_vm_may_flags(unsigned long prot) { return _calc_vm_trans(prot, PROT_READ, VM_MAYREAD) | _calc_vm_trans(prot, PROT_WRITE, VM_MAYWRITE) |