diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-18 22:00:57 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@sgi.com> | 2009-01-18 22:00:57 -0500 |
| commit | 6c5200ce3c528a8f7695ee62f33ad84d8f84d444 (patch) | |
| tree | b240465c2dadbe0366a5b66d60c4776be1b7670d /kernel/exec_domain.c | |
| parent | 9d87c3192d96ef9ac1cec8321538e9b35e90b5aa (diff) | |
| parent | f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/exec_domain.c')
| -rw-r--r-- | kernel/exec_domain.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/exec_domain.c b/kernel/exec_domain.c index 0511716e9424..667c841c2952 100644 --- a/kernel/exec_domain.c +++ b/kernel/exec_domain.c | |||
| @@ -209,8 +209,7 @@ static int __init proc_execdomains_init(void) | |||
| 209 | module_init(proc_execdomains_init); | 209 | module_init(proc_execdomains_init); |
| 210 | #endif | 210 | #endif |
| 211 | 211 | ||
| 212 | asmlinkage long | 212 | SYSCALL_DEFINE1(personality, u_long, personality) |
| 213 | sys_personality(u_long personality) | ||
| 214 | { | 213 | { |
| 215 | u_long old = current->personality; | 214 | u_long old = current->personality; |
| 216 | 215 | ||