Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd76c079 authored by Xiaogang Cui's avatar Xiaogang Cui Committed by Aparna Das
Browse files

msm: memory_dump: move memory dump driver to drivers/soc/qcom 



Architectural changes in the ARM Linux kernel tree mandate
the eventual removal of the mach-* directories. Move the
memory dump driver to drivers/soc/qcom and the memory dump header
to include/soc/qcom to support that removal.

Change-Id: If04f6a4fcd30c864321ac0ff8c6691fc20707cc1
Signed-off-by: default avatarXiaogang Cui <xiaogang@codeaurora.org>
Signed-off-by: default avatarAparna Das <adas@codeaurora.org>
parent 678adbd0

arch/arm/mach-msm/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -1056,14 +1056,6 @@ config MSM_WATCHDOG_V2 
		deadlocks. It does not run during the bootup process, so it will

		not catch any early lockups.



config MSM_MEMORY_DUMP

	bool "MSM Memory Dump Support"

	help

		This enables memory dump feature. It allows various client

		subsystems to register respective dump regions. At the time

		of deadlocks or cpu hangs these dump regions are captured to

		give a snapshot of the system at the time of the crash.



config MSM_DLOAD_MODE

	bool "Enable download mode on crashes"

	default n

arch/arm/mach-msm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ obj-$(CONFIG_ARCH_FSM9900) += clock-fsm9900.o 
obj-$(CONFIG_ARCH_FSM9900) += clock-krait-8974.o

obj-$(CONFIG_ARCH_FSM9900) += rfic-fsm9900.o bbif-fsm9900.o

obj-$(CONFIG_MSM_WATCHDOG_V2) += msm_watchdog_v2.o

obj-$(CONFIG_MSM_MEMORY_DUMP) += msm_memory_dump.o

obj-$(CONFIG_QPNP_BMS) += bms-batterydata.o bms-batterydata-desay.o

obj-$(CONFIG_QPNP_BMS) += bms-batterydata-oem.o bms-batterydata-qrd-4v35-2000mah.o bms-batterydata-qrd-4v2-1300mah.o

obj-$(CONFIG_ARCH_APQ8084) += board-8084.o board-8084-gpiomux.o

arch/arm/mach-msm/msm_cache_dump.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -26,7 +26,7 @@ 
#include <soc/qcom/scm.h>

#include <mach/msm_cache_dump.h>

#include <mach/msm_iomap.h>

#include <mach/msm_memory_dump.h>

#include <soc/qcom/memory_dump.h>



#define L2_DUMP_OFFSET 0x14

arch/arm/mach-msm/msm_watchdog_v2.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <linux/cpu.h>

#include <linux/platform_device.h>

#include <soc/qcom/scm.h>

#include <mach/msm_memory_dump.h>

#include <soc/qcom/memory_dump.h>



#define MODULE_NAME "msm_watchdog"

#define WDT0_ACCSCSSNBARK_INT 0

drivers/coresight/coresight-etm.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <linux/coresight.h>

#include <asm/sections.h>

#include <soc/qcom/socinfo.h>

#include <mach/msm_memory_dump.h>

#include <soc/qcom/memory_dump.h>



#include "coresight-priv.h"