diff options
| author | Johan Mossberg <johan.xx.mossberg@stericsson.com> | 2011-03-17 12:55:00 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:14:58 +0200 |
| commit | 190b28bc1b7ed0166f8cac67d5d23035cc1cd3c8 (patch) | |
| tree | 1322a40eb5f7ce478bb332e2594a5c4742131a66 | |
| parent | 9e4a49d7060497f74c79a713b656b483e9699220 (diff) | |
HWMEM: Make user space include linux/types.h
__x32 are defined in linux/types.h which is therefore needed in user space
also. This patch also adds the uncached flag when allocating the FB to
ensure we don't get a cached FB.
Depends-On: I9a45ad54a0cc8a5cdb1e3b9038ad50aeacb3f9c3
ST-Ericsson ID: AP 327001
ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10068
Change-Id: I3df94e161be96dd2f55928daab3eb20837b92c1d
Signed-off-by: Johan Mossberg <johan.xx.mossberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/18551
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
| -rw-r--r-- | drivers/video/mcde/mcde_fb.c | 5 | ||||
| -rw-r--r-- | include/linux/hwmem.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/video/mcde/mcde_fb.c b/drivers/video/mcde/mcde_fb.c index 2390bd742df..a06989ea2b0 100644 --- a/drivers/video/mcde/mcde_fb.c +++ b/drivers/video/mcde/mcde_fb.c @@ -229,9 +229,10 @@ static int reallocate_fb_mem(struct fb_info *fbi, u32 size) MCDE_FB_VYRES_MAX; #endif - alloc = hwmem_alloc(size, HWMEM_ALLOC_HINT_WRITE_COMBINE, + alloc = hwmem_alloc(size, HWMEM_ALLOC_HINT_WRITE_COMBINE | + HWMEM_ALLOC_HINT_UNCACHED, (HWMEM_ACCESS_READ | HWMEM_ACCESS_WRITE | - HWMEM_ACCESS_IMPORT), + HWMEM_ACCESS_IMPORT), HWMEM_MEM_CONTIGUOUS_SYS); if (IS_ERR(alloc)) return PTR_ERR(alloc); diff --git a/include/linux/hwmem.h b/include/linux/hwmem.h index 6756085f72a..a2eb91d9d9a 100644 --- a/include/linux/hwmem.h +++ b/include/linux/hwmem.h @@ -12,11 +12,11 @@ #ifndef _HWMEM_H_ #define _HWMEM_H_ +#include <linux/types.h> + #if !defined(__KERNEL__) && !defined(_KERNEL) -#include <stdint.h> #include <sys/types.h> #else -#include <linux/types.h> #include <linux/mm_types.h> #endif |