From 1e1f14db947cf05509d73052e9b18a06594693d1 Mon Sep 17 00:00:00 2001 From: John Rose Date: Thu, 15 Jun 2006 17:32:15 -0500 Subject: [PATCH] --- yaml --- r: 28770 b: refs/heads/master c: 7932f0b82ff1db35a5ed8d5825d51cafe15fa6db h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/rtas.c | 1 + trunk/arch/powerpc/platforms/pseries/scanlog.c | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1ebe68783a25..af3bb822f2d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ba73b1d6fa62ddaa235c3c5fdf6095cae6ba748 +refs/heads/master: 7932f0b82ff1db35a5ed8d5825d51cafe15fa6db diff --git a/trunk/arch/powerpc/kernel/rtas.c b/trunk/arch/powerpc/kernel/rtas.c index fd15e3e3bb33..17dc79198515 100644 --- a/trunk/arch/powerpc/kernel/rtas.c +++ b/trunk/arch/powerpc/kernel/rtas.c @@ -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 --git a/trunk/arch/powerpc/platforms/pseries/scanlog.c b/trunk/arch/powerpc/platforms/pseries/scanlog.c index 50643496eb63..77a5bb1d9c30 100644 --- a/trunk/arch/powerpc/platforms/pseries/scanlog.c +++ b/trunk/arch/powerpc/platforms/pseries/scanlog.c @@ -107,9 +107,9 @@ static ssize_t scanlog_read(struct file *file, char __user *buf, /* 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; }