diff --git a/[refs] b/[refs] index c2757ed0396c..b988d9ce5ce3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d836cae4f683211f14c1fd8184f478622b185164 +refs/heads/master: 0f0d84e52cb2a6e0b1d101484a92121410135da1 diff --git a/trunk/drivers/net/macb.c b/trunk/drivers/net/macb.c index 3496d19c55e1..25b559b5d5ed 100644 --- a/trunk/drivers/net/macb.c +++ b/trunk/drivers/net/macb.c @@ -264,7 +264,7 @@ static void macb_update_stats(struct macb *bp) WARN_ON((unsigned long)(end - p - 1) != (MACB_TPF - MACB_PFR) / 4); for(; p < end; p++, reg++) - *p += readl(reg); + *p += __raw_readl(reg); } static void macb_periodic_task(struct work_struct *work) diff --git a/trunk/drivers/net/macb.h b/trunk/drivers/net/macb.h index e3fcb2e06fdc..27bf0ae0f0bb 100644 --- a/trunk/drivers/net/macb.h +++ b/trunk/drivers/net/macb.h @@ -250,9 +250,9 @@ /* Register access macros */ #define macb_readl(port,reg) \ - readl((port)->regs + MACB_##reg) + __raw_readl((port)->regs + MACB_##reg) #define macb_writel(port,reg,value) \ - writel((value), (port)->regs + MACB_##reg) + __raw_writel((value), (port)->regs + MACB_##reg) struct dma_desc { u32 addr;