From: Oleg D. <gr...@na...> - 2003-01-18 15:39:22
|
Hello! Jeff have suggested that I should probably split our reser4+uml repository and create uml-only one so I did. Also during that I have separated all the patches I have into categories and put these into separate changesets with more or less readable descriptions. In my repository you will find working SMP (in tt mode) (you must have spinlock debugging disabled though. I do not know why yet), some fixes including fixes for some SMP races. Also I usually track Liuns' 2.5 repository much closer than Jeff (not an issue right now because Linus is on two weeks vacation or something like that though). Repository is available at bk://namesys.com/bk/linux-2.5-uml Now this part of this mail is probably for Jeff ;) During sorting the patches I found some pieces I am not sure about. Two are related to recent BUG moving to asm/bug.h - While you had my proposed changes, you obviously decided to do it other way. I still think that linux/kernel.h should be included into bug.h for "panic" declaration (otherwise you get warnings about implicit panic() declaration everywhere you include bug.h, but not kernel.h. Also bug.h should not probably be included into page.h since BUG/BUG_ON is not used there. (These are attached questionable[12].diff files). questionable3.diff is from times where new additional thread pointer was added, TIF_RESTART_BLOCK was defined for different arches, but UML in your version seem to lack it. Bye, Oleg |
From: Jeff D. <jd...@ka...> - 2003-01-20 04:25:07
|
gr...@na... said: > Two are related to recent BUG moving to asm/bug.h - While you had > my proposed changes, you obviously decided to do it other way. > I still think that linux/kernel.h should be included into bug.h for > "panic" declaration (otherwise you get warnings about implicit > panic() > declaration everywhere you include bug.h, but not kernel.h. Also > bug.h should not probably be included into page.h since BUG/BUG_ON > is > not used there. (These are attached questionable[12].diff files). Yup. > questionable3.diff is from times where new additional thread > pointer > was added, TIF_RESTART_BLOCK was defined for different arches, but > UML in your version seem to lack it. And yup. Nothing questionable about them... Jeff |
From: Oleg D. <gr...@na...> - 2003-01-20 10:15:24
|
Hello! On Sun, Jan 19, 2003 at 11:17:28PM -0500, Jeff Dike wrote: > > questionable3.diff is from times where new additional thread > > pointer > > was added, TIF_RESTART_BLOCK was defined for different arches, but > > UML in your version seem to lack it. > And yup. Nothing questionable about them... Ah, ok. ;) BTW, while looking at your asm/module.h 2.5.59 change, I noticed that you went the shortest route (like I did for the first time ;) ), but it seems to be not very correct one. We need different module.h versions for different arches (e.g. PPC have this trampoline table for modules because they cannot jump for more than 32M). So I suppose approach similar to other arch-dependant files should be used. Here is my proposed version. # This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.957 -> 1.958 # arch/um/Makefile 1.18 -> 1.19 # include/asm-um/module.h 1.1 -> 1.2 include/asm-um/module-generic.h (moved) # (new) -> 1.1 include/asm-um/module-i386.h # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/01/18 gr...@an... 1.958 # This is update to UML to make it compile with 2.5.59. # The only change is include/asm-um/module.h is now arch dependent since # we cannot include i386 version of this file anymore. # -------------------------------------------- # diff -Nru a/arch/um/Makefile b/arch/um/Makefile --- a/arch/um/Makefile Mon Jan 20 13:11:57 2003 +++ b/arch/um/Makefile Mon Jan 20 13:11:57 2003 @@ -26,7 +26,8 @@ # Have to precede the include because the included Makefiles reference them. SYMLINK_HEADERS = include/asm-um/archparam.h include/asm-um/system.h \ include/asm-um/sigcontext.h include/asm-um/processor.h \ - include/asm-um/ptrace.h include/asm-um/arch-signal.h + include/asm-um/ptrace.h include/asm-um/arch-signal.h \ + include/asm-um/module.h ARCH_SYMLINKS = include/asm-um/arch $(ARCH_DIR)/include/sysdep $(ARCH_DIR)/os \ $(SYMLINK_HEADERS) $(ARCH_DIR)/include/uml-config.h diff -Nru a/include/asm-um/module-generic.h b/include/asm-um/module-generic.h --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/include/asm-um/module-generic.h Mon Jan 20 13:11:57 2003 @@ -0,0 +1,6 @@ +#ifndef __UM_MODULE_H +#define __UM_MODULE_H + +#include "asm/arch/module.h" + +#endif diff -Nru a/include/asm-um/module-i386.h b/include/asm-um/module-i386.h --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/include/asm-um/module-i386.h Mon Jan 20 13:11:57 2003 @@ -0,0 +1,14 @@ +#ifndef __UM_MODULE_H +#define __UM_MODULE_H + +struct mod_arch_specific +{ +}; + +#define Elf_Shdr Elf32_Shdr +#define Elf_Sym Elf32_Sym +#define Elf_Ehdr Elf32_Ehdr + +#define MODULE_ARCH_VERMAGIC "UML " + +#endif diff -Nru a/include/asm-um/module.h b/include/asm-um/module.h --- a/include/asm-um/module.h Mon Jan 20 13:11:57 2003 +++ /dev/null Wed Dec 31 16:00:00 1969 @@ -1,6 +0,0 @@ -#ifndef __UM_MODULE_H -#define __UM_MODULE_H - -#include "asm/arch/module.h" - -#endif Bye, Oleg |