commit 41e9ee2477071265a0dfab87cece27a38c9c2f69
author Elliott Hughes <enh@google.com> Sat Dec 14 00:20:11 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Dec 14 00:20:11 2013 +0000
tree 75c16cb7eb1a230db6490ad0299c504b8cd4cab0
parent df39ce3929b2fe08ecc09740680af258a51aed63
parent feb539b6e3d81a7f0ab86b6b48056a531c4cb4ed

am feb539b6: am e1a475c0: Merge "Force alignment of data buffer used to process netlink messages"

* commit 'feb539b6e3d81a7f0ab86b6b48056a531c4cb4ed':
  Force alignment of data buffer used to process netlink messages

include/sysutils/NetlinkListener.h

diff --git a/include/sysutils/NetlinkListener.h b/include/sysutils/NetlinkListener.h
index beb8bda..6e52c3b 100644
--- a/include/sysutils/NetlinkListener.h
+++ b/include/sysutils/NetlinkListener.h
@@ -21,7 +21,7 @@
 class NetlinkEvent;
 
 class NetlinkListener : public SocketListener {
-    char mBuffer[64 * 1024];
+    char mBuffer[64 * 1024] __attribute__((aligned(4)));
     int mFormat;
 
 public: