diff options
author | John Rose <johnrose@austin.ibm.com> | 2006-06-15 18:32:15 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-06-21 01:01:27 -0400 |
commit | 7932f0b82ff1db35a5ed8d5825d51cafe15fa6db (patch) | |
tree | dea2b59f7a485a858187d57f61334da9330e6d25 /arch/powerpc/platforms | |
parent | 2ba73b1d6fa62ddaa235c3c5fdf6095cae6ba748 (diff) |
[POWERPC] RTAS delay, fix module build breaks
Export both news RTAS delay functions, and change the scanlog module to
use the new delay functions.
Signed-off-by: John Rose <johnrose@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r-- | arch/powerpc/platforms/pseries/scanlog.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/pseries/scanlog.c b/arch/powerpc/platforms/pseries/scanlog.c index 50643496eb63..77a5bb1d9c30 100644 --- a/arch/powerpc/platforms/pseries/scanlog.c +++ b/arch/powerpc/platforms/pseries/scanlog.c | |||
@@ -107,9 +107,9 @@ static ssize_t scanlog_read(struct file *file, char __user *buf, | |||
107 | /* Break to sleep default time */ | 107 | /* Break to sleep default time */ |
108 | break; | 108 | break; |
109 | default: | 109 | default: |
110 | if (status > 9900 && status <= 9905) { | 110 | /* Assume extended busy */ |
111 | wait_time = rtas_extended_busy_delay_time(status); | 111 | wait_time = rtas_busy_delay_time(status); |
112 | } else { | 112 | if (!wait_time) { |
113 | printk(KERN_ERR "scanlog: unknown error from rtas: %d\n", status); | 113 | printk(KERN_ERR "scanlog: unknown error from rtas: %d\n", status); |
114 | return -EIO; | 114 | return -EIO; |
115 | } | 115 | } |