commit 282ab1b6b1a92b8cb2650c111bfab02916f8715d
author Jesse Hall <jessehall@google.com> Thu Mar 06 19:04:07 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 06 19:04:07 2014 +0000
tree 0a306fd2d586cf87f37dd9ae141ae6437e438aaa
parent b342abb6902a698963bb9d2108000da895845985
parent 5e3ac6bc7138e92fa04d7425a2a2535b9ae0e44a

Merge "gralloc: dont hardcode 32bpp as RGBX"

modules/gralloc/gr.h

diff --git a/modules/gralloc/gr.h b/modules/gralloc/gr.h
index 3a43aa7..732b6bc 100644
--- a/modules/gralloc/gr.h
+++ b/modules/gralloc/gr.h
@@ -18,11 +18,7 @@
 #define GR_H_
 
 #include <stdint.h>
-#ifdef HAVE_ANDROID_OS      // just want PAGE_SIZE define
-# include <asm/page.h>
-#else
-# include <sys/user.h>
-#endif
+#include <sys/user.h>
 #include <limits.h>
 #include <sys/cdefs.h>
 #include <hardware/gralloc.h>

modules/gralloc/gralloc_priv.h

diff --git a/modules/gralloc/gralloc_priv.h b/modules/gralloc/gralloc_priv.h
index 22a5715..2cd1007 100644
--- a/modules/gralloc/gralloc_priv.h
+++ b/modules/gralloc/gralloc_priv.h
@@ -75,7 +75,7 @@
     int     offset;
 
     // FIXME: the attributes below should be out-of-line
-    uintptr_t base;
+    uint64_t base __attribute__((aligned(8)));
     int     pid;
 
 #ifdef __cplusplus