diff options
Diffstat (limited to 'kernel/exec_domain.c')
| -rw-r--r-- | kernel/exec_domain.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kernel/exec_domain.c b/kernel/exec_domain.c index c35452cadded..dd62f8e714ca 100644 --- a/kernel/exec_domain.c +++ b/kernel/exec_domain.c | |||
| @@ -27,7 +27,7 @@ static struct exec_domain *exec_domains = &default_exec_domain; | |||
| 27 | static DEFINE_RWLOCK(exec_domains_lock); | 27 | static DEFINE_RWLOCK(exec_domains_lock); |
| 28 | 28 | ||
| 29 | 29 | ||
| 30 | static u_long ident_map[32] = { | 30 | static unsigned long ident_map[32] = { |
| 31 | 0, 1, 2, 3, 4, 5, 6, 7, | 31 | 0, 1, 2, 3, 4, 5, 6, 7, |
| 32 | 8, 9, 10, 11, 12, 13, 14, 15, | 32 | 8, 9, 10, 11, 12, 13, 14, 15, |
| 33 | 16, 17, 18, 19, 20, 21, 22, 23, | 33 | 16, 17, 18, 19, 20, 21, 22, 23, |
| @@ -56,10 +56,10 @@ default_handler(int segment, struct pt_regs *regp) | |||
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | static struct exec_domain * | 58 | static struct exec_domain * |
| 59 | lookup_exec_domain(u_long personality) | 59 | lookup_exec_domain(unsigned int personality) |
| 60 | { | 60 | { |
| 61 | struct exec_domain * ep; | 61 | unsigned int pers = personality(personality); |
| 62 | u_long pers = personality(personality); | 62 | struct exec_domain *ep; |
| 63 | 63 | ||
| 64 | read_lock(&exec_domains_lock); | 64 | read_lock(&exec_domains_lock); |
| 65 | for (ep = exec_domains; ep; ep = ep->next) { | 65 | for (ep = exec_domains; ep; ep = ep->next) { |
| @@ -70,7 +70,7 @@ lookup_exec_domain(u_long personality) | |||
| 70 | 70 | ||
| 71 | #ifdef CONFIG_MODULES | 71 | #ifdef CONFIG_MODULES |
| 72 | read_unlock(&exec_domains_lock); | 72 | read_unlock(&exec_domains_lock); |
| 73 | request_module("personality-%ld", pers); | 73 | request_module("personality-%d", pers); |
| 74 | read_lock(&exec_domains_lock); | 74 | read_lock(&exec_domains_lock); |
| 75 | 75 | ||
| 76 | for (ep = exec_domains; ep; ep = ep->next) { | 76 | for (ep = exec_domains; ep; ep = ep->next) { |
| @@ -135,7 +135,7 @@ unregister: | |||
| 135 | } | 135 | } |
| 136 | 136 | ||
| 137 | int | 137 | int |
| 138 | __set_personality(u_long personality) | 138 | __set_personality(unsigned int personality) |
| 139 | { | 139 | { |
| 140 | struct exec_domain *ep, *oep; | 140 | struct exec_domain *ep, *oep; |
| 141 | 141 | ||
| @@ -188,9 +188,9 @@ static int __init proc_execdomains_init(void) | |||
| 188 | module_init(proc_execdomains_init); | 188 | module_init(proc_execdomains_init); |
| 189 | #endif | 189 | #endif |
| 190 | 190 | ||
| 191 | SYSCALL_DEFINE1(personality, u_long, personality) | 191 | SYSCALL_DEFINE1(personality, unsigned int, personality) |
| 192 | { | 192 | { |
| 193 | u_long old = current->personality; | 193 | unsigned int old = current->personality; |
| 194 | 194 | ||
| 195 | if (personality != 0xffffffff) { | 195 | if (personality != 0xffffffff) { |
| 196 | set_personality(personality); | 196 | set_personality(personality); |
| @@ -198,7 +198,7 @@ SYSCALL_DEFINE1(personality, u_long, personality) | |||
| 198 | return -EINVAL; | 198 | return -EINVAL; |
| 199 | } | 199 | } |
| 200 | 200 | ||
| 201 | return (long)old; | 201 | return old; |
| 202 | } | 202 | } |
| 203 | 203 | ||
| 204 | 204 | ||
