Commit 95e892b9 authored by Stefan Reinauer's avatar Stefan Reinauer Committed by Stefan Reinauer
Browse files

Fix for gcc 4.4 strict aliasing rules


Corresponding to flashrom svn r714.
Signed-off-by: default avatarStefan Reinauer <stepan@coresystems.de>
Acked-by: default avatarCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
parent 34eae349
...@@ -133,7 +133,7 @@ static int fd_msr = -1; ...@@ -133,7 +133,7 @@ static int fd_msr = -1;
msr_t rdmsr(int addr) msr_t rdmsr(int addr)
{ {
uint8_t buf[8]; uint32_t buf[2];
msr_t msr = { 0xffffffff, 0xffffffff }; msr_t msr = { 0xffffffff, 0xffffffff };
if (lseek(fd_msr, (off_t) addr, SEEK_SET) == -1) { if (lseek(fd_msr, (off_t) addr, SEEK_SET) == -1) {
...@@ -143,8 +143,8 @@ msr_t rdmsr(int addr) ...@@ -143,8 +143,8 @@ msr_t rdmsr(int addr)
} }
if (read(fd_msr, buf, 8) == 8) { if (read(fd_msr, buf, 8) == 8) {
msr.lo = *(uint32_t *)buf; msr.lo = buf[0];
msr.hi = *(uint32_t *)(buf + 4); msr.hi = buf[1];
return msr; return msr;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment