diff options
| author | Mike Shaver <shaver@ingenia.com> | 1997-08-11 22:24:56 +0000 |
|---|---|---|
| committer | Mike Shaver <shaver@ingenia.com> | 1997-08-11 22:24:56 +0000 |
| commit | b185d83e11147657102decde7bc30d225ba5ee40 (patch) | |
| tree | f41ffc17b8c462d0bf4c27bbf247458df2d7f61a /arch | |
| parent | 510da6adaa8de35828c319b5ad5004e85546a695 (diff) | |
Bad Mike. Bad!
(How embarrassing.)
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/kernel/sysirix.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/arch/mips/kernel/sysirix.c b/arch/mips/kernel/sysirix.c index 6aae9bb7e..f64dc91d0 100644 --- a/arch/mips/kernel/sysirix.c +++ b/arch/mips/kernel/sysirix.c @@ -1,4 +1,4 @@ -/* $Id: sysirix.c,v 1.4 1997/08/06 19:15:08 miguel Exp $ +/* $Id: sysirix.c,v 1.5 1997/08/10 22:24:11 shaver Exp $ * sysirix.c: IRIX system call emulation. * * Copyright (C) 1996 David S. Miller @@ -25,6 +25,7 @@ #include <asm/page.h> #include <asm/pgtable.h> #include <asm/uaccess.h> +#include <asm/sgialib.h> /* 2,300 lines of complete and utter shit coming up... */ @@ -48,10 +49,10 @@ asmlinkage int irix_sysmp(struct pt_regs *regs) error = PAGE_SIZE; break; case MP_NPROCS: - error = NPROCS; + error = NR_CPUS; break; case MP_NAPROCS: - error = NPROCS; + error = NR_CPUS; break; default: printk("SYSMP[%s:%d]: Unsupported opcode %d\n", @@ -300,6 +301,7 @@ asmlinkage int irix_syssgi(struct pt_regs *regs) char *name = (char *) regs->regs[base+5]; char *buf = (char *) regs->regs[base+6]; char *value; + return -EINVAL; /* til I fix it */ retval = verify_area(VERIFY_WRITE, buf, 128); if (retval) break; @@ -316,8 +318,9 @@ asmlinkage int irix_syssgi(struct pt_regs *regs) case SGI_SETNVRAM: { char *name = (char *) regs->regs[base+5]; - char *buf = (char *) regs->regs[base+6]; - retval = prom_setenv(name, buf); + char *value = (char *) regs->regs[base+6]; + return -EINVAL; /* til I fix it */ + retval = prom_setenv(name, value); /* XXX make sure retval conforms to syssgi(2) */ printk("[%s:%d] setnvram(\"%s\", \"%s\"): retval %d", current->comm, current->pid, |