All of lore.kernel.org
 help / color / mirror / Atom feed
* [uml-devel] patch for 2.6.6-rc1
@ 2004-04-16 14:04 Jeff Chua
  2004-04-21  1:11 ` roland
  0 siblings, 1 reply; 10+ messages in thread
From: Jeff Chua @ 2004-04-16 14:04 UTC (permalink / raw)
  To: UserModeLinux

[-- Attachment #1: Type: TEXT/PLAIN, Size: 511 bytes --]


Here's patch to make uml compiles and run with 2.6.6-rc1.

1) Host 2.6.6-rc1 has 00-2.6.6-v0-host-SKAS2.patch.bz2 applied.

2) Guest has patch.2.6.5-uml1.fix applied, make mrproper ARCH=um, then
   patch.266rc1-1 applied.

I fudged those filed to make it compile and run. Please verify. I know
TASK_DEBUGREGS is incorrect, but since I don't use the debug mode, I
simply set to 1 to make it run, but it may not be right if you need to
debug uml. Hopefully someone can come up with a better patch.


Thanks,
Jeff

[-- Attachment #2: Type: TEXT/PLAIN, Size: 3450 bytes --]

--- uml/arch/um/kernel/Makefile.org	Wed Mar 24 23:55:39 2004
+++ uml/arch/um/kernel/Makefile	Tue Mar 23 22:20:55 2004
@@ -38,7 +38,7 @@
 $(USER_OBJS) : %.o: %.c
 	$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
 
-QUOTE = 'my $$config=`cat $(TOPDIR)/.config`; $$config =~ s/"/\\"/g ; $$config =~ s/\n/\\n"\n"/g ; while(<STDIN>) { $$_ =~ s/CONFIG/$$config/; print $$_ }'
+QUOTE = 'my $$config=`cat $(TOPDIR)/.config`; $$config =~ s/"/\\"/g ; $$config =~ s/\\n/\\\n"\\n"/g ; while(<STDIN>) { $$_ =~ s/CONFIG/$$config/; print $$_ }'
 
 $(obj)/config.o : $(obj)/config.c
 
--- uml/arch/um/kernel/skas/process.c.org	Wed Mar 24 23:56:27 2004
+++ uml/arch/um/kernel/skas/process.c	Tue Mar 23 22:20:22 2004
@@ -24,6 +24,7 @@
 #include "sysdep/sigcontext.h"
 #include "os.h"
 #include "proc_mm.h"
+#define __SKAS_PTRACE_H
 #include "skas_ptrace.h"
 #include "chan_user.h"
 #include "signal_user.h"
--- uml/arch/um/kernel/process.c.org	Wed Mar 24 23:57:25 2004
+++ uml/arch/um/kernel/process.c	Tue Mar 23 22:20:27 2004
@@ -37,6 +37,7 @@
 #include "mode.h"
 #ifdef UML_CONFIG_MODE_SKAS
 #include "skas.h"
+#define __SKAS_PTRACE_H
 #include "skas_ptrace.h"
 #endif
 
--- uml.org/arch/um/util/mk_constants_kern.c	Fri Apr 16 21:23:49 2004
+++ uml/arch/um/util/mk_constants_kern.c	Fri Apr 16 11:35:02 2004
@@ -1,3 +1,4 @@
+#define __KERNEL__
 #include "linux/kernel.h"
 #include "linux/stringify.h"
 #include "linux/time.h"
--- uml.org/arch/um/util/mk_task_kern.c	Sun Apr  4 11:36:25 2004
+++ uml/arch/um/util/mk_task_kern.c	Fri Apr 16 11:58:29 2004
@@ -1,3 +1,4 @@
+#define __KERNEL__
 #include "linux/sched.h"
 #include "linux/stddef.h"
 
@@ -10,7 +11,7 @@
 {
   print_head();
   print_ptr("TASK_REGS", "union uml_pt_regs", 
-	    offsetof(struct task_struct, thread.regs));
+	    offsetof(struct task_struct, thread.esp0));
   print("TASK_PID", "int", offsetof(struct task_struct, pid));
   print_tail();
   return(0);
--- uml.org/arch/um/sys-i386/util/mk_thread_kern.c	Sun Apr  4 11:36:14 2004
+++ uml/arch/um/sys-i386/util/mk_thread_kern.c	Fri Apr 16 12:01:33 2004
@@ -1,3 +1,4 @@
+#define __KERNEL__
 #include "linux/config.h"
 #include "linux/stddef.h"
 #include "linux/sched.h"
@@ -12,7 +13,7 @@
 int main(int argc, char **argv)
 {
   print_head();
-  print_constant_ptr("TASK_DEBUGREGS", THREAD_OFFSET(arch.debugregs));
+  print_constant_ptr("TASK_DEBUGREGS", 1);
 #ifdef CONFIG_MODE_TT
   print_constant("TASK_EXTERN_PID", "int", THREAD_OFFSET(mode.tt.extern_pid));
 #endif
--- uml.org/arch/um/kernel/physmem.c	Fri Apr 16 21:23:49 2004
+++ uml/arch/um/kernel/physmem.c	Fri Apr 16 12:01:56 2004
@@ -285,7 +285,7 @@
 		p = &map[i];
 		set_page_count(p, 0);
 		SetPageReserved(p);
-		INIT_LIST_HEAD(&p->list);
+		INIT_LIST_HEAD(&p->lru);
 	}
 
 	mem_map = map;
--- uml.org/kernel/sched.c	Fri Apr 16 21:23:00 2004
+++ uml/kernel/sched.c	Fri Apr 16 12:19:34 2004
@@ -225,12 +225,14 @@
 #define task_rq(p)		cpu_rq(task_cpu(p))
 #define cpu_curr(cpu)		(cpu_rq(cpu)->curr)
 
+/*
 extern unsigned long __scheduling_functions_start_here;
 extern unsigned long __scheduling_functions_end_here;
 const unsigned long scheduling_functions_start_here =
 			(unsigned long)&__scheduling_functions_start_here;
 const unsigned long scheduling_functions_end_here =
 			(unsigned long)&__scheduling_functions_end_here;
+*/
 
 /*
  * Default context-switch locking:



[-- Attachment #3: Type: APPLICATION/octet-stream, Size: 2992 bytes --]

[-- Attachment #4: Type: TEXT/PLAIN, Size: 1147 bytes --]

diff -ruN linux/include/asm-i386/system.h uml/linux/include/asm-i386/system.h
--- linux/include/asm-i386/system.h	2004-04-07 23:29:03.000000000 +0200
+++ uml/linux/include/asm-i386/system.h	2004-04-07 23:24:39.000000000 +0200
@@ -243,6 +243,7 @@
 #define __HAVE_ARCH_CMPXCHG 1
 #endif
 
+#ifndef __UM_SYSTEM_I386_H 
 static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
 				      unsigned long new, int size)
 {
@@ -270,6 +271,8 @@
 	return old;
 }
 
+#endif
+
 #define cmpxchg(ptr,o,n)\
 	((__typeof__(*(ptr)))__cmpxchg((ptr),(unsigned long)(o),\
 					(unsigned long)(n),sizeof(*(ptr))))
--- linux/arch/um/Makefile-i386	2004-04-07 23:29:20.521333000 +0200
+++ uml/linux/arch/um/Makefile-i386	2004-04-07 23:22:31.000000000 +0200
@@ -30,7 +30,7 @@
 $(SYS_DIR)/thread.h: $(SYS_UTIL_DIR)/mk_thread 
 	$(call filechk,$@)
 
-$(SYS_UTIL_DIR)/mk_sc: scripts/fixdep include/config/MARKER FORCE ; 
+$(SYS_UTIL_DIR)/mk_sc: scripts/basic/fixdep include/config/MARKER FORCE ; 
 	$(Q)$(MAKE) $(build)=$(SYS_UTIL_DIR) $@
 
 $(SYS_UTIL_DIR)/mk_thread: $(ARCH_SYMLINKS) $(GEN_HEADERS) sys_prepare FORCE ; 

^ permalink raw reply	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2004-05-10 18:45 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-04-16 14:04 [uml-devel] patch for 2.6.6-rc1 Jeff Chua
2004-04-21  1:11 ` roland
2004-04-21  6:33   ` Jeff Chua
2004-04-21 23:51     ` roland
2004-04-22  0:07       ` Jeff Chua
2004-04-22  8:11         ` Primero
2004-04-30 15:01           ` [uml-user] " BlaisorBlade
2004-04-30 13:45       ` BlaisorBlade
2004-05-01 21:18         ` roland
2004-05-10 18:46           ` BlaisorBlade

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.