git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
powerpc
/
platforms
/
pseries
/
scanlog.c
diff --git
a/arch/powerpc/platforms/pseries/scanlog.c
b/arch/powerpc/platforms/pseries/scanlog.c
index
5064349
..
45368a5
100644
(file)
--- a/
arch/powerpc/platforms/pseries/scanlog.c
+++ b/
arch/powerpc/platforms/pseries/scanlog.c
@@
-47,7
+47,7
@@
static struct proc_dir_entry *proc_ppc64_scan_log_dump; /* The proc file */
static ssize_t scanlog_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos)
{
static ssize_t scanlog_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos)
{
- struct inode * inode = file->f_dentry->d_inode;
+ struct inode * inode = file->f_
path.
dentry->d_inode;
struct proc_dir_entry *dp;
unsigned int *data;
int status;
struct proc_dir_entry *dp;
unsigned int *data;
int status;
@@
-107,9
+107,9
@@
static ssize_t scanlog_read(struct file *file, char __user *buf,
/* Break to sleep default time */
break;
default:
/* 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;
}
printk(KERN_ERR "scanlog: unknown error from rtas: %d\n", status);
return -EIO;
}