From f821a594ac4987ad289c9d8945ce9e21273fd8fd Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Sun, 14 Oct 2007 19:20:30 +0100
Subject: [PATCH] --- yaml --- r: 68679 b: refs/heads/master c:
 bef1bc95f32bd7603c3682dbb8695cf4d5841732 h: refs/heads/master i:   68677:
 a8aad3dd2a51adee785255a46f471158f0d4255a   68675:
 0af30aec06bfafa465bd5488507761468b30de03   68671:
 25292c48664d32e5e8193ca2e1de558d8e8134e1 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/ibm_newemac/core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 60aae1267f34..3971f5c1f43f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52d4e661ac92ab8e1a312fe527221a1311fe4cda
+refs/heads/master: bef1bc95f32bd7603c3682dbb8695cf4d5841732
diff --git a/trunk/drivers/net/ibm_newemac/core.c b/trunk/drivers/net/ibm_newemac/core.c
index 8ea500961871..7a5aabd01e05 100644
--- a/trunk/drivers/net/ibm_newemac/core.c
+++ b/trunk/drivers/net/ibm_newemac/core.c
@@ -1534,7 +1534,7 @@ static inline int emac_rx_sg_append(struct emac_instance *dev, int slot)
 			dev_kfree_skb(dev->rx_sg_skb);
 			dev->rx_sg_skb = NULL;
 		} else {
-			cacheable_memcpy(dev->rx_sg_skb->tail,
+			cacheable_memcpy(skb_tail_pointer(dev->rx_sg_skb),
 					 dev->rx_skb[slot]->data, len);
 			skb_put(dev->rx_sg_skb, len);
 			emac_recycle_rx_skb(dev, slot, len);