diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
| commit | 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch) | |
| tree | 2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /kernel/acct.c | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'kernel/acct.c')
| -rw-r--r-- | kernel/acct.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/kernel/acct.c b/kernel/acct.c index 7e64105a8..fdadf7a9f 100644 --- a/kernel/acct.c +++ b/kernel/acct.c @@ -150,12 +150,12 @@ asmlinkage long sys_acct(const char *name) { struct file *file = NULL, *old_acct = NULL; char *tmp; - int error = -EPERM; + int error; - lock_kernel(); if (!capable(CAP_SYS_PACCT)) - goto out; + return -EPERM; + lock_kernel(); if (name) { tmp = getname(name); error = PTR_ERR(tmp); @@ -257,8 +257,6 @@ static comp_t encode_comp_t(unsigned long value) * into the accounting file. This function should only be called from * do_exit(). */ -#define KSTK_EIP(stack) (((unsigned long *)(stack))[1019]) -#define KSTK_ESP(stack) (((unsigned long *)(stack))[1022]) /* * do_acct_process does all actual work. |