OMAP3: PM debug: fix build error when !CONFIG_DEBUG_FS (ae559d87) · Commits · 戴 / test

The PM debug code fails to build on when CONFIG_DEBUG_FS is not enabled. Build error log: arch/arm/mach-omap2/built-in.o: In function `omap_sram_idle': arch/arm/mach-omap2/pm34xx.c:449: undefined reference to `pm_dbg_regset_save' arch/arm/mach-omap2/pm34xx.c:460: undefined reference to `pm_dbg_regset_save' arch/arm/mach-omap2/built-in.o: In function `configure_vc': arch/arm/mach-omap2/pm34xx.c:1237: undefined reference to `pm_dbg_regset_init' arch/arm/mach-omap2/pm34xx.c:1238: undefined reference to `pm_dbg_regset_init' make: *** [.tmp_vmlinux1] Error 1 This patch fixes the above errors. Kernel booting is tested on omap zoom2 and zoom3 boards. Signed-off-by:

Manjunatha GK <manjugk@ti.com> Signed-off-by:

Kevin Hilman <khilman@deeprootsystems.com>

arch/arm/mach-omap2/pm-debug.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -604,6 +604,4 @@ static int __init pm_dbg_init(void)
		}
		arch_initcall(pm_dbg_init);

		#else
		void pm_dbg_update_time(struct powerdomain *pwrdm, int prev) {}
		#endif

arch/arm/mach-omap2/pm.h

+6 −2

Original line number	Diff line number	Diff line
		@@ -32,12 +32,16 @@ extern struct omap_dm_timer *gptimer_wakeup;
		#ifdef CONFIG_PM_DEBUG
		extern void omap2_pm_dump(int mode, int resume, unsigned int us);
		extern int omap2_pm_debug;
		#else
		#define omap2_pm_dump(mode, resume, us) do {} while (0);
		#define omap2_pm_debug 0
		#endif

		#if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS)
		extern void pm_dbg_update_time(struct powerdomain *pwrdm, int prev);
		extern int pm_dbg_regset_save(int reg_set);
		extern int pm_dbg_regset_init(int reg_set);
		#else
		#define omap2_pm_dump(mode, resume, us) do {} while (0);
		#define omap2_pm_debug 0
		#define pm_dbg_update_time(pwrdm, prev) do {} while (0);
		#define pm_dbg_regset_save(reg_set) do {} while (0);
		#define pm_dbg_regset_init(reg_set) do {} while (0);

Admin message