summaryrefslogtreecommitdiffstats
path: root/include/linux/personality.h
diff options
context:
space:
mode:
authorChris Metcalf <cmetcalf@tilera.com>2010-06-05 10:35:29 -0400
committerChris Metcalf <cmetcalf@tilera.com>2010-06-05 10:35:29 -0400
commitcc44826a26b12b2489bc7dbb597fcdf107f2cc01 (patch)
tree98a7958212ac61345300944f512a949e5ee3e513 /include/linux/personality.h
parent482e6f8466ab1066f1a969bcdbe916b56439622c (diff)
parent7f0d384cafabfbb56663ee6944c18fc0450fc5d6 (diff)
downloadop-kernel-dev-cc44826a26b12b2489bc7dbb597fcdf107f2cc01.zip
op-kernel-dev-cc44826a26b12b2489bc7dbb597fcdf107f2cc01.tar.gz
Merge branch 'master' into for-linus
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 1261208..eec3bae 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__ */
OpenPOWER on IntegriCloud