diff options
| author | Rajeev Kumar <rajekuma@qca.qualcomm.com> | 2014-11-07 17:07:22 -0800 |
|---|---|---|
| committer | AnjaneeDevi Kapparapu <c_akappa@qti.qualcomm.com> | 2014-11-08 18:21:47 +0530 |
| commit | 739e8a830aabd6dbe9e34dbae1fa581f40c3c900 (patch) | |
| tree | c7984d2491d916b249f16da875ba6dcd5263ad76 | |
| parent | 1d2be9fef640a6ad3829e2e333e34f94764ac788 (diff) | |
qcacld-2.0: Clean up IsMemoryDebugSupportEnabled CFG item.
In ROME based targets SLUB debug build is by default made and
tested so no need of CFG INI item to control SLUB debug feature
as its already controlled by CONFIG_SLUB_DEBUG in Kbuild. This fix
will allow us to use VOS memory debug capability even for those
memory allocations which are done during HIF PCIe probe/registration.
Change-Id: Id73e6c7ca5e8c13ca9509450a28db960baf9abc8
CRs-Fixed: 752858
| -rw-r--r-- | CORE/HDD/inc/wlan_hdd_cfg.h | 11 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_cfg.c | 9 | ||||
| -rwxr-xr-x | CORE/HDD/src/wlan_hdd_main.c | 12 |
3 files changed, 4 insertions, 28 deletions
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h index b4e41b427199..05930db731ab 100644 --- a/CORE/HDD/inc/wlan_hdd_cfg.h +++ b/CORE/HDD/inc/wlan_hdd_cfg.h @@ -2327,14 +2327,6 @@ This feature requires the dependent cfg.ini "gRoamPrefer5GHz" set to 1 */ #define CFG_RA_RATE_LIMIT_INTERVAL_DEFAULT (60)/*60 SEC*/ #endif -//Enable Memory Debug -#ifdef MEMORY_DEBUG -#define CFG_ENABLE_MEMORY_DEBUG_NAME "gEnableMemoryDebug" -#define CFG_ENABLE_MEMORY_DEBUG_MIN (0) -#define CFG_ENABLE_MEMORY_DEBUG_MAX (1) -#define CFG_ENABLE_MEMORY_DEBUG_DEFAULT (1) -#endif - #define CFG_INITIAL_DWELL_TIME_NAME "gInitialDwellTime" #define CFG_INITIAL_DWELL_TIME_DEFAULT (0) #define CFG_INITIAL_DWELL_TIME_MIN (0) @@ -3048,9 +3040,6 @@ typedef struct v_U32_t defaultRateIndex24Ghz; char overrideCountryCode[4]; -#ifdef MEMORY_DEBUG - v_BOOL_t IsMemoryDebugSupportEnabled; -#endif v_U8_t allowDFSChannelRoam; diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c index f98d9db01842..aa4bedb17048 100644 --- a/CORE/HDD/src/wlan_hdd_cfg.c +++ b/CORE/HDD/src/wlan_hdd_cfg.c @@ -3018,15 +3018,6 @@ REG_TABLE_ENTRY g_registry_table[] = VAR_FLAGS_OPTIONAL, (void *)CFG_OVERRIDE_COUNTRY_CODE_DEFAULT), -#ifdef MEMORY_DEBUG - REG_VARIABLE( CFG_ENABLE_MEMORY_DEBUG_NAME, WLAN_PARAM_Integer, - hdd_config_t, IsMemoryDebugSupportEnabled, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_ENABLE_MEMORY_DEBUG_DEFAULT, - CFG_ENABLE_MEMORY_DEBUG_MIN, - CFG_ENABLE_MEMORY_DEBUG_MAX ), -#endif - REG_VARIABLE( CFG_DEBUG_P2P_REMAIN_ON_CHANNEL_NAME, WLAN_PARAM_Integer, hdd_config_t, debugP2pRemainOnChannel, VAR_FLAGS_OPTIONAL, diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c index a6162c9cf147..ad04bde2bd44 100755 --- a/CORE/HDD/src/wlan_hdd_main.c +++ b/CORE/HDD/src/wlan_hdd_main.c @@ -11685,14 +11685,6 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc) goto err_config; } -#ifdef MEMORY_DEBUG - if (pHddCtx->cfg_ini->IsMemoryDebugSupportEnabled) - vos_mem_init(); - - hddLog(VOS_TRACE_LEVEL_INFO, "%s: gEnableMemoryDebug=%d", - __func__, pHddCtx->cfg_ini->IsMemoryDebugSupportEnabled); -#endif - /* Initialize the adf_ctx handle */ adf_ctx = vos_mem_malloc(sizeof(*adf_ctx)); @@ -12575,6 +12567,10 @@ static int hdd_driver_init( void) vos_timer_manager_init(); #endif +#ifdef MEMORY_DEBUG + vos_mem_init(); +#endif + /* Preopen VOSS so that it is ready to start at least SAL */ status = vos_preOpen(&pVosContext); |