From ac08bac91ce66dddf85a96ae7facd2c2d2794d7c Mon Sep 17 00:00:00 2001 From: Thadeu Lima de Souza Cascardo Date: Mon, 28 May 2012 08:52:05 +0000 Subject: [PATCH] --- yaml --- r: 309487 b: refs/heads/master c: a0c6ffbcfe600606b2d913dded4dc6b37b3bbbfd h: refs/heads/master i: 309485: 8dd48663592c4546d87507a8fb317049db25828d 309483: 5f4562725b9f19021bca723a9a278bb7c1996211 309479: d75326b6d2a6a0166e2c4a792365e3bc8f4c92ad 309471: 13112f5ba6c711e4feda1f6d749740344c5bb907 v: v3 --- [refs] | 2 +- trunk/net/rds/ib.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 02da91fb5d7a..1087c02081a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c51ce49735c183ef2592db70f918ee698716276b +refs/heads/master: a0c6ffbcfe600606b2d913dded4dc6b37b3bbbfd diff --git a/trunk/net/rds/ib.h b/trunk/net/rds/ib.h index edfaaaf164eb..8d2b3d5a7c21 100644 --- a/trunk/net/rds/ib.h +++ b/trunk/net/rds/ib.h @@ -186,8 +186,7 @@ struct rds_ib_device { struct work_struct free_work; }; -#define pcidev_to_node(pcidev) pcibus_to_node(pcidev->bus) -#define ibdev_to_node(ibdev) pcidev_to_node(to_pci_dev(ibdev->dma_device)) +#define ibdev_to_node(ibdev) dev_to_node(ibdev->dma_device) #define rdsibdev_to_node(rdsibdev) ibdev_to_node(rdsibdev->dev) /* bits for i_ack_flags */