diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-07-20 14:56:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-07-20 14:56:40 +0000 |
| commit | e308faf24f68e262d92d294a01ddca7a17e76762 (patch) | |
| tree | 22c47cb315811834861f013067878ff664e95abd /drivers/sbus/char/openprom.c | |
| parent | 30c6397ce63178fcb3e7963ac247f0a03132aca9 (diff) | |
Sync with Linux 2.1.46.
Diffstat (limited to 'drivers/sbus/char/openprom.c')
| -rw-r--r-- | drivers/sbus/char/openprom.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c index 548abb601..75b950071 100644 --- a/drivers/sbus/char/openprom.c +++ b/drivers/sbus/char/openprom.c @@ -137,6 +137,7 @@ static int openprom_sunos_ioctl(struct inode * inode, struct file * file, struct openpromio *opp; unsigned long flags; int bufsize, len, error = 0; + extern char saved_command_line[]; if (cmd == OPROMSETOPT) bufsize = getstrings((void *)arg, &opp); @@ -172,7 +173,7 @@ static int openprom_sunos_ioctl(struct inode * inode, struct file * file, case OPROMNXTOPT: case OPROMNXTPROP: save_and_cli(flags); - buf = prom_nextprop(node, opp->oprom_array); + buf = prom_nextprop(node, opp->oprom_array, buffer); restore_flags(flags); len = strlen(buf); @@ -229,9 +230,7 @@ static int openprom_sunos_ioctl(struct inode * inode, struct file * file, break; case OPROMGETBOOTARGS: - save_and_cli(flags); - buf = prom_getbootargs(); - restore_flags(flags); + buf = saved_command_line; len = strlen(buf); @@ -315,6 +314,7 @@ static int openprom_bsd_ioctl(struct inode * inode, struct file * file, unsigned long flags; int error, node, len; char *str, *tmp; + char buffer[64]; switch (cmd) { case OPIOCGET: @@ -378,7 +378,7 @@ static int openprom_bsd_ioctl(struct inode * inode, struct file * file, return error; save_and_cli(flags); - tmp = prom_nextprop(op.op_nodeid,str); + tmp = prom_nextprop(op.op_nodeid,str,buffer); restore_flags(flags); if (tmp) { |