diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-30 16:30:48 -0500 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2012-03-24 19:29:55 -0400 |
commit | c2220b2a124d2fe7b0074b23680177c8e905a76c (patch) | |
tree | f88ed3858ce65669134888f64193ab139a8a95dc /arch/um | |
parent | 28a12cb598e55ca9e1c577899d6624e6a83cdc56 (diff) |
um: kill HOST_TASK_PID
just provide get_current_pid() to the userland side of things
instead of get_current() + manual poking in its results
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um')
-rw-r--r-- | arch/um/include/shared/common-offsets.h | 2 | ||||
-rw-r--r-- | arch/um/include/shared/kern_util.h | 2 | ||||
-rw-r--r-- | arch/um/kernel/process.c | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/arch/um/include/shared/common-offsets.h b/arch/um/include/shared/common-offsets.h index d7fe563aa7e7..40db8f71deae 100644 --- a/arch/um/include/shared/common-offsets.h +++ b/arch/um/include/shared/common-offsets.h | |||
@@ -2,8 +2,6 @@ | |||
2 | 2 | ||
3 | DEFINE(KERNEL_MADV_REMOVE, MADV_REMOVE); | 3 | DEFINE(KERNEL_MADV_REMOVE, MADV_REMOVE); |
4 | 4 | ||
5 | OFFSET(HOST_TASK_PID, task_struct, pid); | ||
6 | |||
7 | DEFINE(UM_KERN_PAGE_SIZE, PAGE_SIZE); | 5 | DEFINE(UM_KERN_PAGE_SIZE, PAGE_SIZE); |
8 | DEFINE(UM_KERN_PAGE_MASK, PAGE_MASK); | 6 | DEFINE(UM_KERN_PAGE_MASK, PAGE_MASK); |
9 | DEFINE(UM_KERN_PAGE_SHIFT, PAGE_SHIFT); | 7 | DEFINE(UM_KERN_PAGE_SHIFT, PAGE_SHIFT); |
diff --git a/arch/um/include/shared/kern_util.h b/arch/um/include/shared/kern_util.h index 0f1483852460..00965d06d2ca 100644 --- a/arch/um/include/shared/kern_util.h +++ b/arch/um/include/shared/kern_util.h | |||
@@ -48,7 +48,7 @@ extern void do_uml_exitcalls(void); | |||
48 | * GFP_ATOMIC. | 48 | * GFP_ATOMIC. |
49 | */ | 49 | */ |
50 | extern int __cant_sleep(void); | 50 | extern int __cant_sleep(void); |
51 | extern void *get_current(void); | 51 | extern int get_current_pid(void); |
52 | extern int copy_from_user_proc(void *to, void *from, int size); | 52 | extern int copy_from_user_proc(void *to, void *from, int size); |
53 | extern int cpu(void); | 53 | extern int cpu(void); |
54 | extern char *uml_strdup(const char *string); | 54 | extern char *uml_strdup(const char *string); |
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index 69f24905abdc..f386d04a84a5 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c | |||
@@ -126,9 +126,9 @@ void exit_thread(void) | |||
126 | { | 126 | { |
127 | } | 127 | } |
128 | 128 | ||
129 | void *get_current(void) | 129 | int get_current_pid(void) |
130 | { | 130 | { |
131 | return current; | 131 | return task_pid_nr(current); |
132 | } | 132 | } |
133 | 133 | ||
134 | /* | 134 | /* |