[PATCH] powerpc: RTAS delay, fix module build breaks
From: John Rose <hidden>
Date: 2006-06-15 22:33:10
Export both news RTAS delay functions, and change the scanlog module to use the new delay functions. Signed-off-by: John Rose <redacted> --- Respun against the powerpc git tree. Thanks Paul. 2_6_ppc-johnrose/arch/powerpc/kernel/rtas.c | 1 + 2_6_ppc-johnrose/arch/powerpc/platforms/pseries/scanlog.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff -puN arch/powerpc/kernel/rtas.c~finish_delay_reorg arch/powerpc/kernel/rtas.c
--- 2_6_ppc/arch/powerpc/kernel/rtas.c~finish_delay_reorg 2006-06-15 17:27:20.000000000 -0500
+++ 2_6_ppc-johnrose/arch/powerpc/kernel/rtas.c 2006-06-15 17:28:11.000000000 -0500@@ -797,6 +797,7 @@ EXPORT_SYMBOL(rtas_call); EXPORT_SYMBOL(rtas_data_buf); EXPORT_SYMBOL(rtas_data_buf_lock); EXPORT_SYMBOL(rtas_busy_delay_time); +EXPORT_SYMBOL(rtas_busy_delay); EXPORT_SYMBOL(rtas_get_sensor); EXPORT_SYMBOL(rtas_get_power_level); EXPORT_SYMBOL(rtas_set_power_level);
diff -puN arch/powerpc/platforms/pseries/scanlog.c~finish_delay_reorg arch/powerpc/platforms/pseries/scanlog.c
--- 2_6_ppc/arch/powerpc/platforms/pseries/scanlog.c~finish_delay_reorg 2006-06-15 17:28:30.000000000 -0500
+++ 2_6_ppc-johnrose/arch/powerpc/platforms/pseries/scanlog.c 2006-06-15 17:29:30.000000000 -0500@@ -107,9 +107,9 @@ static ssize_t scanlog_read(struct file /* Break to sleep default time */ break; default: - if (status > 9900 && status <= 9905) { - wait_time = rtas_extended_busy_delay_time(status); - } else { + /* Assume extended busy */ + wait_time = rtas_busy_delay_time(status); + if (!wait_time) { printk(KERN_ERR "scanlog: unknown error from rtas: %d\n", status); return -EIO; }
_