github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-31 03:27:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge "soc: qcom: minidump_log: Fix compile issue of module minidump"

Browse Source
This commit is contained in:
qctecmdr 2022-09-09 02:00:08 -07:00 committed by Gerrit - the friendly Code Review server
commit e16cb9d685
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/soc/qcom/minidump_log.c
View File

@ -1159,7 +1159,6 @@ static void md_register_panic_data(void)
md_register_memory_dump(md_dma_buf_procs_size, "DMABUF_PROCS");
md_debugfs_dmabufprocs(minidump_dir);
}
#endif
static int register_vmap_mem(const char *name, void *virual_addr, size_t dump_len)
{
@ -1281,6 +1280,7 @@ static void md_register_module_data(void)
android_debug_for_each_module(md_get_present_module, NULL);
}
#endif
#ifdef CONFIG_QCOM_MINIDUMP_PSTORE
static void register_pstore_info(void)
@ -1384,8 +1384,8 @@ int msm_minidump_log_init(void)
#ifdef CONFIG_QCOM_MINIDUMP_FTRACE
md_register_trace_buf();
#endif
md_register_module_data();
#ifdef CONFIG_QCOM_MINIDUMP_PANIC_DUMP
md_register_module_data();
md_register_panic_data();
atomic_notifier_chain_register(&panic_notifier_list, &md_panic_blk);
#ifdef CONFIG_QCOM_MINIDUMP_PANIC_CPU_CONTEXT

7
include/soc/qcom/minidump.h
View File

@ -1,6 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#ifndef __MINIDUMP_H
@ -46,7 +47,6 @@ extern bool msm_minidump_enabled(void);
extern struct md_region *md_get_region(char *name);
extern void dump_stack_minidump(u64 sp);
extern int msm_minidump_get_available_region(void);
extern void md_dump_process(void);
#else
static inline int msm_minidump_add_region(const struct md_region *entry)
{
@ -61,6 +61,11 @@ static inline bool msm_minidump_enabled(void) { return false; }
static inline struct md_region *md_get_region(char *name) { return NULL; }
static inline void dump_stack_minidump(u64 sp) {}
static inline void add_trace_event(char *buf, size_t size) {}
#endif
#if IS_ENABLED(CONFIG_QCOM_MINIDUMP_PANIC_DUMP)
extern void md_dump_process(void);
#else
static inline void md_dump_process(void) {}
#endif