x86info: Fix buggy pointer arithmetic

Patch 208fb9613c8c151b2885e89066a3eb22a977df6f introduced breakage on
x86_64. Fix this and also replace usage of post by pre-increment to
avoid potential issues with operator priority.

Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/rdmsr.c b/rdmsr.c
index 5f2cc10..823cab0 100644
--- a/rdmsr.c
+++ b/rdmsr.c
@@ -70,10 +70,10 @@ int read_msr(int cpu, unsigned int idx, unsigned long long *val)
 {
 	char cpuname[16];
 	unsigned char buffer[8];
-	unsigned long lo, hi;
+	unsigned long long lo, hi;
 	int fh;
 	static int nodriver=0;
-	unsigned long *ptr = (unsigned long *) buffer;
+	unsigned int *ptr = (unsigned int *) buffer;
 
 	if (nodriver==1)
 		return 0;
@@ -101,10 +101,9 @@ int read_msr(int cpu, unsigned int idx, unsigned long long *val)
 			return 0;
 		}
 
-		lo = *(ptr)++;
-		hi = *(ptr);
-		*val = hi;
-		*val = (*val<<32) | lo;
+		lo = *ptr;
+		hi = *(++ptr);
+		*val = (hi << 32) | lo;
 	}
 	if (close(fh) == -1) {
 		perror("close");