diff options
| author | x0182794 <volodymyr.mieshkov@ti.com> | 2012-06-07 14:38:24 +0300 |
|---|---|---|
| committer | Ziyann <jaraidaniel@gmail.com> | 2014-10-01 12:58:47 +0200 |
| commit | 0fcd16f62a54384ec1273750517c08a200d23be6 (patch) | |
| tree | 0aa0307e82f3ff3ab60f2e17634bdccb4ae72064 | |
| parent | 00621ad5671e195f7e899343c52f334556378cd8 (diff) | |
| download | kernel_samsung_tuna-0fcd16f62a54384ec1273750517c08a200d23be6.zip kernel_samsung_tuna-0fcd16f62a54384ec1273750517c08a200d23be6.tar.gz kernel_samsung_tuna-0fcd16f62a54384ec1273750517c08a200d23be6.tar.bz2 | |
Fix disabling printk's build error.
Disabling printk's via CONFIG_PRINTK in the menuconfig gives the build error:
arch/arm/common/built-in.o: In function `end_syslog_dump':
~/a-3.0/arch/arm/common/fiq_debugger.c:524: undefined reference to `log_buf_copy'
arch/arm/common/built-in.o: In function `begin_syslog_dump':
~/a-3.0/arch/arm/common/fiq_debugger.c:514: undefined reference to `do_syslog'
arch/arm/common/built-in.o: In function `dump_kernel_log':
~/a-3.0/arch/arm/common/fiq_debugger.c:208: undefined reference to `log_buf_copy'
make: *** [.tmp_vmlinux1] Error 1
This was tested on both the 4AI.1.2 and 4AI.1.3 releases with the same result.
Change-Id: I432408bdd4ee07a261d11ca6710a56164512438b
Signed-off-by: Volodymyr Mieshkov <volodymyr.mieshkov@ti.com>
Signed-off-by: x0182794 <volodymyr.mieshkov@ti.com>
| -rw-r--r-- | arch/arm/common/fiq_debugger.c | 14 | ||||
| -rw-r--r-- | arch/arm/include/asm/fiq_debugger.h | 6 |
2 files changed, 18 insertions, 2 deletions
diff --git a/arch/arm/common/fiq_debugger.c b/arch/arm/common/fiq_debugger.c index 3ed18ae..3a70827 100644 --- a/arch/arm/common/fiq_debugger.c +++ b/arch/arm/common/fiq_debugger.c @@ -49,6 +49,18 @@ #define THREAD_INFO(sp) ((struct thread_info *) \ ((unsigned long)(sp) & ~(THREAD_SIZE - 1))) +#ifndef CONFIG_PRINTK +static int do_syslog(int type, char __user *bug, int count) +{ + return -1; +} + +static int log_buf_copy(char *dest, int idx, int len) +{ + return -1; +} +#endif + struct fiq_debugger_state { struct fiq_glue_handler handler; @@ -190,7 +202,6 @@ static void debug_prompt(struct fiq_debugger_state *state) debug_puts(state, "debug> "); } -int log_buf_copy(char *dest, int idx, int len); static void dump_kernel_log(struct fiq_debugger_state *state) { char buf[1024]; @@ -508,7 +519,6 @@ static void end_syslog_dump(struct fiq_debugger_state *state) state->syslog_dumping = false; } #else -extern int do_syslog(int type, char __user *bug, int count); static void begin_syslog_dump(struct fiq_debugger_state *state) { do_syslog(5 /* clear */, NULL, 0); diff --git a/arch/arm/include/asm/fiq_debugger.h b/arch/arm/include/asm/fiq_debugger.h index 4d27488..72ea6a2 100644 --- a/arch/arm/include/asm/fiq_debugger.h +++ b/arch/arm/include/asm/fiq_debugger.h @@ -61,4 +61,10 @@ struct fiq_debugger_pdata { void (*force_irq_ack)(struct platform_device *pdev, unsigned int irq); }; +#ifdef CONFIG_PRINTK +extern int log_buf_copy(char *dest, int idx, int len); +extern int do_syslog(int type, char __user *bug, int count); +#endif + + #endif |