diff options
| author | Shivananda Hebbar <x0hebbar@ti.com> | 2011-10-25 10:51:37 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-10-25 10:51:37 +0800 |
| commit | 70620c1671efe0a50e4c50af9514d4d6a713ed1b (patch) | |
| tree | 1c4745e6b8c792305cc04bc34ba9a15625e6226c | |
| parent | 02869b6520f852dc4d6165b84d2ed3275a27a86a (diff) | |
syslink: devh: Fix build break with SYSLINK_RECOVERY disabled
If we disable SYSLINK_RECOVERY option in drivers->syslink
->SYSLINK_RECOVERY, build breaks with below errors
drivers/built-in.o: In function `devh_notification_handler':
drivers/dsp/syslink/devh/44xx/devh44xx.c:103: undefined reference to
`ipc_recover_schedule'
drivers/built-in.o: In function `devh44xx_wdt_ipc_notifier_call':
drivers/dsp/syslink/devh/44xx/devh44xx.c:244: undefined reference to
`ipc_recover_schedule'
make: *** [.tmp_vmlinux1] Error 1
Fixed by moving ipc_revover_schedule function under SYSLINK_RECOVERY Flag.
Change-Id: Idb4de38bbe1e2586eebac9f76150616ea93d56f3
Signed-off-by: Shivananda Hebbar <x0hebbar@ti.com>
| -rw-r--r-- | arch/arm/plat-omap/include/syslink/ipc.h | 3 | ||||
| -rw-r--r-- | drivers/dsp/syslink/devh/44xx/devh44xx.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/include/syslink/ipc.h b/arch/arm/plat-omap/include/syslink/ipc.h index ceb239219b7..14ac732d002 100644 --- a/arch/arm/plat-omap/include/syslink/ipc.h +++ b/arch/arm/plat-omap/include/syslink/ipc.h @@ -181,9 +181,8 @@ int ipc_unregister_notifier(struct notifier_block *nb); /* check if ipc is in recovery state */ #ifdef CONFIG_SYSLINK_RECOVERY bool ipc_recovering(void); -#endif /* Indicate to schedule the recovery mechanism */ void ipc_recover_schedule(void); - +#endif /* ifdef CONFIG_SYSLINK_RECOVERY */ #endif /* ifndef _IPC_H_ */ diff --git a/drivers/dsp/syslink/devh/44xx/devh44xx.c b/drivers/dsp/syslink/devh/44xx/devh44xx.c index 3c7ec3fc44e..92ead7d71f7 100644 --- a/drivers/dsp/syslink/devh/44xx/devh44xx.c +++ b/drivers/dsp/syslink/devh/44xx/devh44xx.c @@ -98,9 +98,10 @@ static void devh_notification_handler(u16 proc_id, u16 line_id, u32 event_id, pr_warning("Sys Error occured in Ducati for proc_id = %d\n", proc_id); +#ifdef CONFIG_SYSLINK_RECOVERY /* schedule the recovery */ ipc_recover_schedule(); - +#endif /* ifdef CONFIG_SYSLINK_RECOVERY */ devh_notify_event((struct omap_devh *)arg, DEV_SYS_ERROR); } @@ -229,9 +230,10 @@ static int devh44xx_wdt_ipc_notifier_call(struct notifier_block *nb, pr_warning("Ducati Watch Dog fired\n"); +#ifdef CONFIG_SYSLINK_RECOVERY /* schedule the recovery */ ipc_recover_schedule(); - +#endif /* ifdef CONFIG_SYSLINK_RECOVERY */ while (i--) { obj = devh_get_obj(i); devh_notify_event(obj, DEV_WATCHDOG_ERROR); |