The patch titled
     Fix build failure when CONFIG_INFINIBAND_IPOIB_CM is not defined
has been added to the -mm tree.  Its filename is
     fix-build-failure-when-config_infiniband_ipoib_cm-is-not-defined.patch

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

------------------------------------------------------
Subject: Fix build failure when CONFIG_INFINIBAND_IPOIB_CM is not defined
From: [EMAIL PROTECTED] (Tony Breeds)

Fixes:
  CC [M]  drivers/infiniband/ulp/ipoib/ipoib_main.o
drivers/infiniband/ulp/ipoib/ipoib_main.c: In function `ipoib_init_module':
drivers/infiniband/ulp/ipoib/ipoib_main.c:1269: error: invalid lvalue in 
assignment

In the case where CONFIG_INFINIBAND_IPOIB_CM is not defined ipoib_max_conn_qp 
is #defined to 0.

Signed-off-by: Tony Breeds <[EMAIL PROTECTED]>
Cc: Roland Dreier <[EMAIL PROTECTED]>
Cc: Mel Gorman <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 drivers/infiniband/ulp/ipoib/ipoib_main.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff -puN 
drivers/infiniband/ulp/ipoib/ipoib_main.c~fix-build-failure-when-config_infiniband_ipoib_cm-is-not-defined
 drivers/infiniband/ulp/ipoib/ipoib_main.c
--- 
a/drivers/infiniband/ulp/ipoib/ipoib_main.c~fix-build-failure-when-config_infiniband_ipoib_cm-is-not-defined
+++ a/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -1265,8 +1265,9 @@ static int __init ipoib_init_module(void
        ipoib_sendq_size = roundup_pow_of_two(ipoib_sendq_size);
        ipoib_sendq_size = min(ipoib_sendq_size, IPOIB_MAX_QUEUE_SIZE);
        ipoib_sendq_size = max(ipoib_sendq_size, IPOIB_MIN_QUEUE_SIZE);
-
+#ifdef CONFIG_INFINIBAND_IPOIB_CM
        ipoib_max_conn_qp = min(ipoib_max_conn_qp, IPOIB_CM_MAX_CONN_QP);
+#endif
 
        ret = ipoib_register_debugfs();
        if (ret)
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

origin.patch
fix-build-failure-when-config_infiniband_ipoib_cm-is-not-defined.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to