diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:19 -0400 |
| commit | 646b1db4956ba8bf748b835b5eba211133d91c2e (patch) | |
| tree | 061166d873d9da9cf83044a7593ad111787076c5 /include/linux/personality.h | |
| parent | 0f2c3de2ba110626515234d5d584fb1b0c0749a2 (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into perf/core
Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.
Diffstat (limited to 'include/linux/personality.h')
| -rw-r--r-- | include/linux/personality.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/personality.h b/include/linux/personality.h index 126120819a0d..eec3bae164d4 100644 --- a/include/linux/personality.h +++ b/include/linux/personality.h | |||
| @@ -12,7 +12,7 @@ struct pt_regs; | |||
| 12 | 12 | ||
| 13 | extern int register_exec_domain(struct exec_domain *); | 13 | extern int register_exec_domain(struct exec_domain *); |
| 14 | extern int unregister_exec_domain(struct exec_domain *); | 14 | extern int unregister_exec_domain(struct exec_domain *); |
| 15 | extern int __set_personality(unsigned long); | 15 | extern int __set_personality(unsigned int); |
| 16 | 16 | ||
| 17 | #endif /* __KERNEL__ */ | 17 | #endif /* __KERNEL__ */ |
| 18 | 18 | ||