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

Commit ca3a3f54 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: boot_marker: change module load order"

parents ddbb8a84 27916750

drivers/soc/qcom/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ obj-$(CONFIG_MSM_INRUSH_CURRENT_MITIGATION) += inrush-current-mitigation.o 
obj-$(CONFIG_MSM_GLADIATOR_ERP) += gladiator_erp.o

obj-$(CONFIG_MSM_GLADIATOR_ERP_V2) += gladiator_erp_v2.o

obj-$(CONFIG_ARM64) += idle-v8.o cpu_ops.o

obj-$(CONFIG_MSM_BOOT_STATS) += boot_stats.o

obj-$(CONFIG_MSM_BOOT_TIME_MARKER) += boot_marker.o

obj-$(CONFIG_MSM_RUN_QUEUE_STATS) += msm_rq_stats.o

obj-$(CONFIG_CPU_V7) += idle-v7.o

obj-$(CONFIG_QCOM_GSBI)	+=	qcom_gsbi.o
@@ -26,6 +24,8 @@ obj-$(CONFIG_MSM_HVC) += hvc.o 
obj-$(CONFIG_MSM_CPU_PWR_CTL) += cpu_pwr_ctl.o

obj-$(CONFIG_MSM_CACHE_M4M_ERP64) += cache_m4m_erp64.o

obj-$(CONFIG_SOC_BUS)  +=      socinfo.o

obj-$(CONFIG_MSM_BOOT_STATS) += boot_stats.o

obj-$(CONFIG_MSM_BOOT_TIME_MARKER) += boot_marker.o

obj-$(CONFIG_MSM_HYP_DEBUG) += hyp-debug.o

obj-$(CONFIG_ARCH_MSM8996) += kryo-l2-accessors.o

obj-$(CONFIG_MSM_RPM_SMD) +=	rpm-smd.o

drivers/soc/qcom/boot_marker.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static int __init init_bootkpi(void) 
	set_bootloader_stats();

	return 0;

}

module_init(init_bootkpi);

subsys_initcall(init_bootkpi);



static void __exit exit_bootkpi(void)

{