Merge refs/heads/upstream-fixes from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
This commit is contained in:
commit
1fdab81e67
|
@ -762,8 +762,8 @@ static inline u64 readq(void __iomem *addr)
|
|||
{
|
||||
u64 ret = 0;
|
||||
ret = readl(addr + 4);
|
||||
(u64) ret <<= 32;
|
||||
(u64) ret |= readl(addr);
|
||||
ret <<= 32;
|
||||
ret |= readl(addr);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue