uml: remove task_protections

Replaced task_protections with stack_protections since they do the same
thing, and task_protections was misnamed anyway.

This needs THREAD_SIZE, so that's imported via common-offsets.h

Also tidied up the code in the vicinity.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

3 files changed, 3 insertions, 3 deletions

diff --git a/arch/um/kernel/tt/exec_kern.c b/arch/um/kernel/tt/exec_kern.c
index 98e21743e604..40126cb51801 100644
--- a/arch/um/kernel/tt/exec_kern.c
+++ b/arch/um/kernel/tt/exec_kern.c
@@ -57,7 +57,7 @@ void flush_thread_tt(void)
         enable_timer();
         free_page(stack);
         protect_memory(uml_reserved, high_physmem - uml_reserved, 1, 1, 0, 1);
-        task_protections((unsigned long) current_thread);
+        stack_protections((unsigned long) current_thread);
         force_flush_all();
         unblock_signals();
 }
diff --git a/arch/um/kernel/tt/process_kern.c b/arch/um/kernel/tt/process_kern.c
index c631303cb800..74347adf81bf 100644
--- a/arch/um/kernel/tt/process_kern.c
+++ b/arch/um/kernel/tt/process_kern.c
@@ -209,7 +209,7 @@ void finish_fork_handler(int sig)
         if(current->mm != current->parent->mm)
                 protect_memory(uml_reserved, high_physmem - uml_reserved, 1, 
                                1, 0, 1);
-        task_protections((unsigned long) current_thread);
+        stack_protections((unsigned long) current_thread);
 
         free_page(current->thread.temp_stack);
         local_irq_disable();
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
index 1cf954a47fd7..ecc458fe51b9 100644
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@ -459,7 +459,7 @@ int __init linux_main(int argc, char **argv)
 
         uml_postsetup();
 
-        task_protections((unsigned long) &init_thread_info);
+        stack_protections((unsigned long) &init_thread_info);
         os_flush_stdout();
 
         return CHOOSE_MODE(start_uml_tt(), start_uml_skas());