From 63ef318a900f1131ddf214428c52eb85d8f6b06c Mon Sep 17 00:00:00 2001
From: Dustin Brown <dustinb@codeaurora.org>
Date: Mon, 2 Apr 2018 10:57:18 -0700
Subject: [PATCH] qcacld-3.0: Enable NBUF_MEMORY_DEBUG for SLUB builds

Network buffer debugging is being featurized as a separate feature from
regular memory debugging, and being controlled via the NBUF_MEMORY_DEBUG
build config flag. Enable NBUF_MEMORY_DEBUG for SLUB DEBUG builds to
retain the existing set of build time debug features.

Change-Id: Ib2ac2823ea5231508f4cca7d718ed266acd91274
CRs-Fixed: 2216804
---
 Kbuild | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/Kbuild b/Kbuild
index 3bb2cff7f3a7..ff79014ded10 100644
--- a/Kbuild
+++ b/Kbuild
@@ -2012,14 +2012,13 @@ ifeq ($(CONFIG_FEATURE_UNIT_TEST_SUSPEND), 1)
 	CDEFINES += -DWLAN_SUSPEND_RESUME_TEST
 endif
 
-ifeq ($(CONFIG_SLUB_DEBUG_ON),y)
-CDEFINES += -DTIMER_MANAGER
-CDEFINES += -DMEMORY_DEBUG
-CDEFINES += -DCONFIG_HALT_KMEMLEAK
-endif
-
 ifdef CONFIG_LEAK_DETECTION
-	CDEFINES += -DCONFIG_LEAK_DETECTION
+CDEFINES += \
+	-DCONFIG_HALT_KMEMLEAK \
+	-DCONFIG_LEAK_DETECTION \
+	-DMEMORY_DEBUG \
+	-DNBUF_MEMORY_DEBUG \
+	-DTIMER_MANAGER
 endif
 
 ifeq ($(HAVE_CFG80211),1)