aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorNishanth Aravamudan <nacc@us.ibm.com>2011-03-14 06:36:11 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-04-27 00:18:25 -0400
commite297d9dd5cfafbeb2e7585bb444941848e030454 (patch)
tree72a38df12fb3928b3b8493ef1e783374c0892559 /drivers/infiniband
parentefcac6589a277c10060e4be44b9455cf43838dc1 (diff)
cxgb4: use pgprot_writecombine() on powerpc
Commit fe3cc0d99de6a9bf99b6c279a8afb5833888c1f7 ("powerpc: Add pgprot_writecombine") in benh's tree exposes the pgprot_writecombine() API to drivers on powerpc. cxgb4 has an open-coded version of the same, so use the common API now that it's available. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Cc: Steve Wise <swise@opengridcomputing.com> Cc: Anton Blanchard <anton@samba.org> Acked-by: Steve Wise <swise@opengridcomputing.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r--drivers/infiniband/hw/cxgb4/t4.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/cxgb4/t4.h b/drivers/infiniband/hw/cxgb4/t4.h
index 24af12fc822..c0221eec881 100644
--- a/drivers/infiniband/hw/cxgb4/t4.h
+++ b/drivers/infiniband/hw/cxgb4/t4.h
@@ -269,11 +269,8 @@ struct t4_swsqe {
269 269
270static inline pgprot_t t4_pgprot_wc(pgprot_t prot) 270static inline pgprot_t t4_pgprot_wc(pgprot_t prot)
271{ 271{
272#if defined(__i386__) || defined(__x86_64__) 272#if defined(__i386__) || defined(__x86_64__) || defined(CONFIG_PPC64)
273 return pgprot_writecombine(prot); 273 return pgprot_writecombine(prot);
274#elif defined(CONFIG_PPC64)
275 return __pgprot((pgprot_val(prot) | _PAGE_NO_CACHE) &
276 ~(pgprot_t)_PAGE_GUARDED);
277#else 274#else
278 return pgprot_noncached(prot); 275 return pgprot_noncached(prot);
279#endif 276#endif