[Feature][ZXW-292]merge P56U06 version
Only Configure: No
Affected branch: master
Affected module: unknow
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: I922cf7b03b256d7dd5b0a6b73c3eac813f9512eb
diff --git a/ap/os/linux/linux-3.4.x/mm/mem_tracker.c b/ap/os/linux/linux-3.4.x/mm/mem_tracker.c
index 3963763..c823e9c 100755
--- a/ap/os/linux/linux-3.4.x/mm/mem_tracker.c
+++ b/ap/os/linux/linux-3.4.x/mm/mem_tracker.c
@@ -24,6 +24,8 @@
/*******************************************************************************
* ºê¶¨Òå *
*******************************************************************************/
+#undef CONFIG_KALLSYMS
+
#ifdef CONFIG_KALLSYMS
#define MEM_TRACKER_MAX_STACK_LEN (100) /*Õ»º¯Êý¹ì¼£µÄ×Ö·û¸öÊýÉÏÏÞ£»*/
#endif
diff --git a/ap/os/linux/linux-3.4.x/mm/slob.c b/ap/os/linux/linux-3.4.x/mm/slob.c
index f26c8d4..0ea5b38 100755
--- a/ap/os/linux/linux-3.4.x/mm/slob.c
+++ b/ap/os/linux/linux-3.4.x/mm/slob.c
@@ -952,7 +952,7 @@
slob_list = get_slob_page_list_head(sp);
#ifdef CONFIG_KMALLOC_TRACKER
- return (slob_find_general_size(sp) - 2 * sizeof(size_t));
+ return (slob_find_general_size(sp) - HEAP_SUFFIX_SIZE);
#endif
#ifdef CONFIG_DEBUG_SLOB_MARK_HEAD