commit 5fd236057b99940a6e6157d4756562feea61b596
author Linux Build Service Account <lnxbuild@localhost> Fri Sep 14 19:43:37 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Sep 14 19:43:37 2018 -0700
tree 6d77bdba9b1d4715c3aec8dfd3037a676b3f8460
parent 8181cef67a82d4328745c7d4f5a7c9a333f27dd1
parent d58ec8fb63546089fcee2f3128c48a5a1b5320c0

Merge "commonsys-intf: display: Add support to query display wb capabilities" into display-android-commonsys.lnx.1.0

gralloc/gr_priv_handle.h

diff --git a/gralloc/gr_priv_handle.h b/gralloc/gr_priv_handle.h
index 964bed0..39e5e20 100644
--- a/gralloc/gr_priv_handle.h
+++ b/gralloc/gr_priv_handle.h
@@ -33,6 +33,7 @@
 
 #define PRIV_HANDLE_CONST(exp) static_cast<const private_handle_t *>(exp)
 
+#pragma pack(push, 4)
 struct private_handle_t : public native_handle_t {
   enum {
     PRIV_FLAGS_FRAMEBUFFER = 0x00000001,
@@ -75,15 +76,15 @@
   int format;
   int buffer_type;
   unsigned int layer_count;
-  uint64_t id __attribute__((aligned(8)));
-  uint64_t usage __attribute__((aligned(8)));
+  uint64_t id;
+  uint64_t usage;
 
   unsigned int size;
   unsigned int offset;
   unsigned int offset_metadata;
-  uint64_t base __attribute__((aligned(8)));
-  uint64_t base_metadata __attribute__((aligned(8)));
-  uint64_t gpuaddr __attribute__((aligned(8)));
+  uint64_t base;
+  uint64_t base_metadata;
+  uint64_t gpuaddr;
 
   static const int kNumFds = 2;
   static const int kMagic = 'gmsm';
@@ -173,5 +174,6 @@
 
   uint64_t GetBackingstore() const { return id; }
 };
+#pragma pack(pop)
 
 #endif  // __GR_PRIV_HANDLE_H__