Richard Weinberger | 29 Mar 19:18 2012
Picon

[PATCH 1/2] um: Disintegrate asm/system.h

Signed-off-by: Richard Weinberger <richard <at> nod.at>
Reported-by: Toralf Förster <toralf.foerster <at> gmx.de>
CC: dhowells <at> redhat.com
---
 arch/um/drivers/mconsole_kern.c |    1 +
 arch/um/include/asm/Kbuild      |    2 +-
 arch/x86/um/asm/barrier.h       |   75 +++++++++++++++++++++
 arch/x86/um/asm/switch_to.h     |    7 ++
 arch/x86/um/asm/system.h        |  135 ---------------------------------------
 5 files changed, 84 insertions(+), 136 deletions(-)
 create mode 100644 arch/x86/um/asm/barrier.h
 create mode 100644 arch/x86/um/asm/switch_to.h
 delete mode 100644 arch/x86/um/asm/system.h

diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
index e672bd6..43b39d6 100644
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
 <at>  <at>  -22,6 +22,7  <at>  <at> 
 #include <linux/workqueue.h>
 #include <linux/mutex.h>
 #include <asm/uaccess.h>
+#include <asm/switch_to.h>

 #include "init.h"
 #include "irq_kern.h"
diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild
index 8419f5c..bb5d6e6 100644
--- a/arch/um/include/asm/Kbuild
+++ b/arch/um/include/asm/Kbuild
(Continue reading)

Richard Weinberger | 29 Mar 19:18 2012
Picon

[PATCH 2/2] um: Use asm-generic/switch_to.h

Signed-off-by: Richard Weinberger <richard <at> nod.at>
---
 arch/um/include/asm/Kbuild  |    1 +
 arch/um/kernel/process.c    |    6 +-----
 arch/x86/um/asm/switch_to.h |    7 -------
 3 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 arch/x86/um/asm/switch_to.h

diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild
index bb5d6e6..fff2435 100644
--- a/arch/um/include/asm/Kbuild
+++ b/arch/um/include/asm/Kbuild
 <at>  <at>  -1,3 +1,4  <at>  <at> 
 generic-y += bug.h cputime.h device.h emergency-restart.h futex.h hardirq.h
 generic-y += hw_irq.h irq_regs.h kdebug.h percpu.h sections.h topology.h xor.h
 generic-y += ftrace.h pci.h io.h param.h delay.h mutex.h current.h exec.h
+generic-y += switch_to.h
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index f386d04..2b73ded 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
 <at>  <at>  -88,11 +88,8  <at>  <at>  static inline void set_current(struct task_struct *task)

 extern void arch_switch_to(struct task_struct *to);

-void *_switch_to(void *prev, void *next, void *last)
+void *__switch_to(struct task_struct *from, struct task_struct *to)
 {
-	struct task_struct *from = prev;
-	struct task_struct *to = next;
(Continue reading)

Toralf Förster | 30 Mar 10:17 2012
Picon
Picon

Re: [PATCH 1/2] um: Disintegrate asm/system.h


Richard Weinberger wrote at 19:18:49
> Signed-off-by: Richard Weinberger <richard <at> nod.at>
> Reported-by: Toralf Förster <toralf.foerster <at> gmx.de>
> CC: dhowells <at> redhat.com
> ---
works fine.
Now the situation is the same as before :/ :

...
  LD      init/built-in.o
  LD     
.tmp_vmlinux1
/usr/lib/gcc/i686-pc-linux-gnu/4.5.3/../../../../i686-pc-linux-gnu/bin/ld:arch/um/kernel/vmlinux.lds:209:
syntax error

--

-- 
MfG/Sincerely
Toralf Förster
pgp finger print: 7B1A 07F4 EC82 0F90 D4C2 8936 872A E508 7DB6 9DA3

Gmane