commit 177861d98f0a44bb94c6d9a2fed176fa4a226dbf
author Elliott Hughes <enh@google.com> Sat Apr 04 00:39:46 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Apr 04 00:39:46 2015 +0000
tree 12b3c3b311d02e9ca566ff24443d266129e0adec
parent 5bbd68d6447c532a76aaa5a5d811a48f55ff18f3
parent 2d4cf62a2cdfbfbbca5757eb7dd1498d118bf7c9

am 2d4cf62a: am 8d9f899a: am 031fec0b: Merge "ServiceManager: Print kernel/userspace binder version"

* commit '2d4cf62a2cdfbfbbca5757eb7dd1498d118bf7c9':
  ServiceManager: Print kernel/userspace binder version

cmds/servicemanager/binder.c

diff --git a/cmds/servicemanager/binder.c b/cmds/servicemanager/binder.c
index d1ab05f..6eecee1 100644
--- a/cmds/servicemanager/binder.c
+++ b/cmds/servicemanager/binder.c
@@ -113,7 +113,9 @@
 
     if ((ioctl(bs->fd, BINDER_VERSION, &vers) == -1) ||
         (vers.protocol_version != BINDER_CURRENT_PROTOCOL_VERSION)) {
-        fprintf(stderr, "binder: driver version differs from user space\n");
+        fprintf(stderr,
+                "binder: kernel driver version (%d) differs from user space version (%d)\n",
+                vers.protocol_version, BINDER_CURRENT_PROTOCOL_VERSION);
         goto fail_open;
     }