This patch removes a variable which was not used in two functions.
Yet another code cleanup, nothing really significant.

Please note that I could not test this on x86_64. I don't have the
hardware for it.

Karol Swietlicki

Signed-off-by: Karol Swietlicki <[EMAIL PROTECTED]>
---

diff -upNr linux-2.6.24-rc1/arch/um/kernel/process.c
linux-2.6.23/arch/um/kernel/process.c
--- linux-2.6.24-rc1/arch/um/kernel/process.c   2007-10-24
05:50:57.000000000 +0200
+++ linux-2.6.23/arch/um/kernel/process.c       2007-11-07 19:01:28.000000000 
+0100
@@ -83,7 +83,7 @@ static inline void set_current(struct ta
                { external_pid(task), task });
 }

-extern void arch_switch_to(struct task_struct *from, struct task_struct *to);
+extern void arch_switch_to(struct task_struct *to);

 void *_switch_to(void *prev, void *next, void *last)
 {
@@ -99,7 +99,7 @@ void *_switch_to(void *prev, void *next,
                switch_threads(&from->thread.switch_buf,
                               &to->thread.switch_buf);

-               arch_switch_to(current->thread.prev_sched, current);
+               arch_switch_to(current);

                if (current->thread.saved_task)
                        show_regs(&(current->thread.regs));
@@ -173,7 +170,7 @@ void fork_handler(void)
         * arch_switch_to isn't needed. We could want to apply this to
         * improve performance. -bb
         */
-       arch_switch_to(current->thread.prev_sched, current);
+       arch_switch_to(current);

        current->thread.prev_sched = NULL;

 int arch_handle_signal(int sig, struct uml_pt_regs *regs)
diff -upNr linux-2.6.24-rc1/arch/um/sys-i386/ptrace.c
linux-2.6.23/arch/um/sys-i386/ptrace.c
--- linux-2.6.24-rc1/arch/um/sys-i386/ptrace.c  2007-10-24
05:50:57.000000000 +0200
+++ linux-2.6.23/arch/um/sys-i386/ptrace.c      2007-11-07 19:00:52.000000000 
+0100
@@ -8,11 +8,11 @@
 #include "asm/uaccess.h"
 #include "skas.h"

-extern int arch_switch_tls(struct task_struct *from, struct task_struct *to);
+extern int arch_switch_tls(struct task_struct *to);

-void arch_switch_to(struct task_struct *from, struct task_struct *to)
+void arch_switch_to(struct task_struct *to)
 {
-       int err = arch_switch_tls(from, to);
+       int err = arch_switch_tls(to);
        if (!err)
                return;

diff -upNr linux-2.6.24-rc1/arch/um/sys-i386/tls.c
linux-2.6.23/arch/um/sys-i386/tls.c
--- linux-2.6.24-rc1/arch/um/sys-i386/tls.c     2007-10-24 05:50:57.000000000 
+0200
+++ linux-2.6.23/arch/um/sys-i386/tls.c 2007-11-07 19:01:56.000000000 +0100
@@ -172,7 +172,7 @@ void clear_flushed_tls(struct task_struc
  * SKAS patch.
  */

-int arch_switch_tls(struct task_struct *from, struct task_struct *to)
+int arch_switch_tls(struct task_struct *to)
 {
        if (!host_supports_tls)
                return 0;
Files linux-2.6.24-rc1/arch/um/sys-i386/user-offsets.gcno and
linux-2.6.23/arch/um/sys-i386/user-offsets.gcno differ
diff -upNr linux-2.6.24-rc1/arch/um/sys-x86_64/syscalls.c
linux-2.6.23/arch/um/sys-x86_64/syscalls.c
--- linux-2.6.24-rc1/arch/um/sys-x86_64/syscalls.c      2007-10-24
05:50:57.000000000 +0200
+++ linux-2.6.23/arch/um/sys-x86_64/syscalls.c  2007-11-07
18:57:42.000000000 +0100
@@ -105,7 +105,7 @@ long sys_clone(unsigned long clone_flags
        return ret;
 }

-void arch_switch_to(struct task_struct *from, struct task_struct *to)
+void arch_switch_to(struct task_struct *to)
 {
        if ((to->thread.arch.fs == 0) || (to->mm == NULL))
                return;

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

Reply via email to