summaryrefslogtreecommitdiff
path: root/include/soc
diff options
context:
space:
mode:
authorAndy Gross <agross@codeaurora.org>2014-07-29 11:38:55 -0500
committerRohit Vaswani <rvaswani@codeaurora.org>2016-03-01 12:22:24 -0800
commitc3733bfb6eaf9eafe8e5193f6551719c8e20cef6 (patch)
treeb094dc1b4ce2ef7d6054d65ddcb3b9cf5b5a306d /include/soc
parent5ad2830ad5f9c2e74a6733a1d8c34cf6318e48c0 (diff)
soc: qcom: Add snapshot of MEMORY DUMP
This is a snapshot of the memory_dump driver as of msm-3.10 commit: acdce027751d5a7488b283f0ce3111f873a5816d (Merge "defconfig: arm64: Enable ONESHOT_SYNC for msm8994") Change-Id: I296a57ab1c491b29911413fdb4abb82fa15137c3 Signed-off-by: Andy Gross <agross@codeaurora.org> [abhimany: resolve trivial merge conflicts] Signed-off-by: Abhimanyu Kapur <abhimany@codeaurora.org>
Diffstat (limited to 'include/soc')
-rw-r--r--include/soc/qcom/memory_dump.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/soc/qcom/memory_dump.h b/include/soc/qcom/memory_dump.h
index 562d1a241879..6a0af8d0a20d 100644
--- a/include/soc/qcom/memory_dump.h
+++ b/include/soc/qcom/memory_dump.h
@@ -38,7 +38,7 @@ struct msm_client_dump {
unsigned long end_addr;
};
-#ifdef CONFIG_MSM_MEMORY_DUMP
+#ifdef CONFIG_QCOM_MEMORY_DUMP
extern int msm_dump_tbl_register(struct msm_client_dump *client_entry);
#else
static inline int msm_dump_tbl_register(struct msm_client_dump *entry)
@@ -48,7 +48,7 @@ static inline int msm_dump_tbl_register(struct msm_client_dump *entry)
#endif
-#if defined(CONFIG_MSM_MEMORY_DUMP) || defined(CONFIG_MSM_MEMORY_DUMP_V2)
+#if defined(CONFIG_QCOM_MEMORY_DUMP) || defined(CONFIG_QCOM_MEMORY_DUMP_V2)
extern uint32_t msm_dump_table_version(void);
#else
static inline uint32_t msm_dump_table_version(void)
@@ -106,7 +106,7 @@ struct msm_dump_entry {
uint64_t addr;
};
-#ifdef CONFIG_MSM_MEMORY_DUMP_V2
+#ifdef CONFIG_QCOM_MEMORY_DUMP_V2
extern int msm_dump_data_register(enum msm_dump_table_ids id,
struct msm_dump_entry *entry);
#else