diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-01-25 05:54:33 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-01-25 05:54:33 -0500 |
| commit | 5b74f9e0e005baf12a2df6aaeef7d7134137792b (patch) | |
| tree | d3cef2c8c91fb415533e028bf55cc348d8818431 /kernel/exec_domain.c | |
| parent | e3ee1e123183ca9847e74b7b8e2694c9e3b817a6 (diff) | |
| parent | f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b (diff) | |
Merge branch 'linus' into timers/hrtimers
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 | ||