diff options
| author | Dave Kleikamp <shaggy@linux.vnet.ibm.com> | 2009-02-02 14:40:55 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@linux.vnet.ibm.com> | 2009-02-02 14:40:55 -0500 |
| commit | 8db0c5d5ef3ab99fe9e5151872b75f45c4282e3c (patch) | |
| tree | da9759151e00221c58cdd9f4de893c0b08753670 /kernel/exec_domain.c | |
| parent | 1ad53a98c927a9b5b1b57288ac0edec562fbcf8d (diff) | |
| parent | 45c82b5a770be66845687a7d027c8b52946d59af (diff) | |
Merge branch 'master' of /home/shaggy/git/linus-clean/
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 | ||