diff options
| author | David Sin <davidsin@ti.com> | 2011-12-16 14:10:58 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-12-26 22:33:17 +0800 |
| commit | 3ec29e08a84410156188fc7f6b2179604c9d45e3 (patch) | |
| tree | 154e47a68155518ef2e80d8ae7e99ecc031ca834 | |
| parent | 7b0491fb21aea7ac7a4b98155c426937d2fe67e6 (diff) | |
TILER: Include header when using mm_struct
Build fails without this when using omap3 defconfig.
Signed-off-by: David Sin <davidsin@ti.com>
TILER: Use unlocked ioctl
Use .unlocked_ioctl and change return value to long
Signed-off-by: David Sin <davidsin@ti.com>
TILER: Add semi-colon to fix compile error
Add semi-colon to fix error: two or more data types in
declaration specifiers
Signed-off-by: David Sin <davidsin@ti.com>
| -rw-r--r-- | drivers/media/video/tiler/tiler-iface.c | 9 | ||||
| -rw-r--r-- | drivers/media/video/tiler/tiler-main.c | 1 | ||||
| -rw-r--r-- | drivers/media/video/tiler/tmm-pat.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/tiler/tiler-iface.c b/drivers/media/video/tiler/tiler-iface.c index f7a1be7131e..9a967bcffd0 100644 --- a/drivers/media/video/tiler/tiler-iface.c +++ b/drivers/media/video/tiler/tiler-iface.c @@ -325,8 +325,7 @@ static s32 tiler_mmap(struct file *filp, struct vm_area_struct *vma) } /* ioctl handler */ -static s32 tiler_ioctl(struct inode *ip, struct file *filp, u32 cmd, - unsigned long arg) +static long tiler_ioctl(struct file *filp, u32 cmd, unsigned long arg) { pgd_t *pgd; pmd_t *pmd; @@ -608,10 +607,10 @@ static s32 tiler_release(struct inode *ip, struct file *filp) /* tiler driver file operations */ static const struct file_operations tiler_fops = { - .open = tiler_open, - .ioctl = tiler_ioctl, + .open = tiler_open, + .unlocked_ioctl = tiler_ioctl, .release = tiler_release, - .mmap = tiler_mmap, + .mmap = tiler_mmap, }; /* initialize tiler interface */ diff --git a/drivers/media/video/tiler/tiler-main.c b/drivers/media/video/tiler/tiler-main.c index 19e838f9ec3..4d33d09fc73 100644 --- a/drivers/media/video/tiler/tiler-main.c +++ b/drivers/media/video/tiler/tiler-main.c @@ -30,6 +30,7 @@ #include <linux/dma-mapping.h> /* dma_alloc_coherent */ #include <linux/pagemap.h> /* page_cache_release() */ #include <linux/slab.h> +#include <linux/sched.h> #include <mach/dmm.h> #include "tmm.h" diff --git a/drivers/media/video/tiler/tmm-pat.c b/drivers/media/video/tiler/tmm-pat.c index d33866b125e..bc28ae4f6ec 100644 --- a/drivers/media/video/tiler/tmm-pat.c +++ b/drivers/media/video/tiler/tmm-pat.c @@ -33,7 +33,7 @@ static u32 cache_limit = CONFIG_TILER_CACHE_LIMIT << 20; param_check_uint(cache, &cache_limit); module_param_call(cache, param_set_mem, param_get_uint, &cache_limit, 0644); -__MODULE_PARM_TYPE(cache, "uint") +__MODULE_PARM_TYPE(cache, "uint"); MODULE_PARM_DESC(cache, "Cache free pages if total memory is under this limit"); /* global state - statically initialized */ |