diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /kernel/auditsc.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'kernel/auditsc.c')
| -rw-r--r-- | kernel/auditsc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index d7e7e637b92a..c4394abcd5e6 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
| @@ -958,7 +958,7 @@ void audit_syscall_entry(struct task_struct *tsk, int arch, int major, | |||
| 958 | * | 958 | * |
| 959 | * i386 no | 959 | * i386 no |
| 960 | * x86_64 no | 960 | * x86_64 no |
| 961 | * ppc64 yes (see arch/ppc64/kernel/misc.S) | 961 | * ppc64 yes (see arch/powerpc/platforms/iseries/misc.S) |
| 962 | * | 962 | * |
| 963 | * This also happens with vm86 emulation in a non-nested manner | 963 | * This also happens with vm86 emulation in a non-nested manner |
| 964 | * (entries without exits), so this case must be caught. | 964 | * (entries without exits), so this case must be caught. |