summaryrefslogtreecommitdiff
path: root/include/linux/personality.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-07-01 02:07:09 +0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-07-01 02:07:09 +0400
commit08fa16b6b75005c120b59d00ae42a0b7cc68db45 (patch)
treec5f22412467f72dd0c7291bbb958a9485e894f02 /include/linux/personality.h
parent1796b983cc4cbbed5e9e478b03591609a2c21987 (diff)
parent7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff)
downloadlinux-08fa16b6b75005c120b59d00ae42a0b7cc68db45.tar.xz
Merge commit 'v2.6.35-rc3' into next
Diffstat (limited to 'include/linux/personality.h')
-rw-r--r--include/linux/personality.h2
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;
extern int register_exec_domain(struct exec_domain *);
extern int unregister_exec_domain(struct exec_domain *);
-extern int __set_personality(unsigned long);
+extern int __set_personality(unsigned int);
#endif /* __KERNEL__ */