diff mbox

[V6,6/7] megaraid_sas: fix TRUE and FALSE re-define build error

Message ID 1433952538-22455-7-git-send-email-Suravee.Suthikulpanit@amd.com (mailing list archive)
State Not Applicable
Delegated to: Herbert Xu
Headers show

Commit Message

Suravee Suthikulpanit June 10, 2015, 4:08 p.m. UTC 
Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Cc: Kashyap Desai <kashyap.desai@avagotech.com>
Cc: Sumit Saxena <sumit.saxena@avagotech.com>
Cc: Uday Lingala <uday.lingala@avagotech.com>
---
 drivers/scsi/megaraid/megaraid_sas_fp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Sumit Saxena June 12, 2015, 8:15 a.m. UTC | #1 
>-----Original Message-----
>From: Suravee Suthikulpanit [mailto:Suravee.Suthikulpanit@amd.com]
>Sent: Wednesday, June 10, 2015 9:39 PM
>To: rjw@rjwysocki.net; lenb@kernel.org; catalin.marinas@arm.com;
>will.deacon@arm.com; thomas.lendacky@amd.com;
>herbert@gondor.apana.org.au; davem@davemloft.net; arnd@arndb.de;
>kashyap.desai@avagotech.com; sumit.saxena@avagotech.com;
>uday.lingala@avagotech.com; vinholikatti@gmail.com
>Cc: msalter@redhat.com; hanjun.guo@linaro.org; al.stone@linaro.org;
>grant.likely@linaro.org; leo.duran@amd.com; linux-arm-
>kernel@lists.infradead.org; linux-acpi@vger.kernel.org; linux-
>kernel@vger.kernel.org; linaro-acpi@lists.linaro.org;
netdev@vger.kernel.org;
>linux-crypto@vger.kernel.org; Suravee Suthikulpanit
>Subject: [V6 PATCH 6/7] megaraid_sas: fix TRUE and FALSE re-define build
>error
>
>Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
>Cc: Kashyap Desai <kashyap.desai@avagotech.com>
>Cc: Sumit Saxena <sumit.saxena@avagotech.com>
>Cc: Uday Lingala <uday.lingala@avagotech.com>
>---
> drivers/scsi/megaraid/megaraid_sas_fp.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
>diff --git a/drivers/scsi/megaraid/megaraid_sas_fp.c
>b/drivers/scsi/megaraid/megaraid_sas_fp.c
>index 4f72287..e8b7a69 100644
>--- a/drivers/scsi/megaraid/megaraid_sas_fp.c
>+++ b/drivers/scsi/megaraid/megaraid_sas_fp.c
>@@ -66,7 +66,15 @@ MODULE_PARM_DESC(lb_pending_cmds, "Change
>raid-1 load balancing outstanding "
>
> #define ABS_DIFF(a, b)   (((a) > (b)) ? ((a) - (b)) : ((b) - (a)))
> #define MR_LD_STATE_OPTIMAL 3
>+
>+#ifdef FALSE
>+#undef FALSE
>+#endif
> #define FALSE 0
>+
>+#ifdef TRUE
>+#undef TRUE
>+#endif
> #define TRUE 1
>
> #define SPAN_DEBUG 0
Acked-by: Sumit Saxena <sumit.saxena@avagotech.com>

>--
>2.1.0
--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/scsi/megaraid/megaraid_sas_fp.c b/drivers/scsi/megaraid/megaraid_sas_fp.c
index 4f72287..e8b7a69 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fp.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fp.c
@@ -66,7 +66,15 @@  MODULE_PARM_DESC(lb_pending_cmds, "Change raid-1 load balancing outstanding "
 
 #define ABS_DIFF(a, b)   (((a) > (b)) ? ((a) - (b)) : ((b) - (a)))
 #define MR_LD_STATE_OPTIMAL 3
+
+#ifdef FALSE
+#undef FALSE
+#endif
 #define FALSE 0
+
+#ifdef TRUE
+#undef TRUE
+#endif
 #define TRUE 1
 
 #define SPAN_DEBUG 0