[uml-devel] [PATCH] UML : adding X86_32 config to UML's Kconfig

2007-11-22 Thread Jiri Olsa
Hi,

I noticed UM config is not working properly for CPU selection. 
I bisected following commit as a source:

commit 1032c0ba9da5c5b53173ad2dcf8b2a2da78f8b17
Author: Sam Ravnborg <[EMAIL PROTECTED]>
Date:   Tue Nov 6 21:35:08 2007 +0100

x86: arch/x86/Kconfig.cpu unification

Move all CPU definitions to Kconfig.cpu
Always define X86_MINIMUM_CPU_FAMILY and do the
obvious code cleanup in boot/cpucheck.c

Comments from: Adrian Bunk <[EMAIL PROTECTED]> incorporated.

Signed-off-by: Sam Ravnborg <[EMAIL PROTECTED]>
Cc: Adrian Bunk <[EMAIL PROTECTED]>
Cc: Brian Gerst <[EMAIL PROTECTED]>
Cc: Thomas Gleixner <[EMAIL PROTECTED]>
Cc: Ingo Molnar <[EMAIL PROTECTED]>
Cc: "H. Peter Anvin" <[EMAIL PROTECTED]>


snip


diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 0e2adad..c301622 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -3,11 +3,12 @@ if !X86_ELAN
 
 choice
prompt "Processor family"
-   default M686
+   default M686 if X86_32
+   default GENERIC_CPU if X86_64


snip


I'm not sure if this is the right way but following patch is working for me.

Signed-off-by: Jiri Olsa <[EMAIL PROTECTED]>
---
 arch/um/Kconfig |4 
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index dd1689b..3dcc17c 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -68,6 +68,10 @@ config IRQ_RELEASE_METHOD
bool
default y
 
+config X86_32
+   bool
+   def_bool !64BIT
+
 menu "UML-specific options"
 
 config STATIC_LINK

-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel


[uml-devel] [PATCH] um: include/asm/arch link creation change

2007-11-22 Thread Jiri Olsa
Hi,

current um code does not create a proper include/asm/arch link.
when I bisected it I can see this was introduced by following patch:

commit fcbaa088fc8625381bd1096bc2eedc4f58a1572c
Author: Jeff Dike <[EMAIL PROTECTED]>
Date:   Wed Nov 14 16:58:42 2007 -0800

uml: fix symlink loops

symlinks to directories in the non-O= case were lacking -n, which meant
that, when the link already existed, a new link pointing at itself was
created in the target directory.

Signed-off-by: Jeff Dike <[EMAIL PROTECTED]>
Cc: Sam Ravnborg <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>

diff --git a/arch/um/Makefile b/arch/um/Makefile
index 768a5d1..31999bc 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -168,7 +168,7 @@ ifneq ($(KBUILD_SRC),)
$(Q)mkdir -p $(objtree)/include/asm-um
$(Q)ln -fsn $(srctree)/include/asm-$(HEADER_ARCH) include/asm-um/arch
 else
-   $(Q)cd $(TOPDIR)/include/asm-um && ln -sf ../asm-$(HEADER_ARCH) arch
+   $(Q)cd $(TOPDIR)/include/asm-um && ln -fsn ../asm-$(SUBARCH) arch
 endif

snip


it works for me to use the HEADER_ARCH instead of the SUBARCH
Signed-off-by: Jiri Olsa <[EMAIL PROTECTED]>

---
 arch/um/Makefile |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/um/Makefile b/arch/um/Makefile
index 31999bc..ba6813a 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -168,7 +168,7 @@ ifneq ($(KBUILD_SRC),)
$(Q)mkdir -p $(objtree)/include/asm-um
$(Q)ln -fsn $(srctree)/include/asm-$(HEADER_ARCH) include/asm-um/arch
 else
-   $(Q)cd $(TOPDIR)/include/asm-um && ln -fsn ../asm-$(SUBARCH) arch
+   $(Q)cd $(TOPDIR)/include/asm-um && ln -fsn ../asm-$(HEADER_ARCH) arch
 endif
 
 $(objtree)/$(ARCH_DIR)/include:

-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel


[uml-devel] uml git tree

2007-11-22 Thread Jiri Olsa
Hi,

I'd like to ask if there's any UML git repository.
If there isnt, whats the devel process. How often you merge to Linus tree?

thanks,
Jiri Olsa

-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel


Re: [uml-devel] [PATCH] UML : adding X86_32 config to UML's Kconfig

2007-11-22 Thread Jeff Dike
On Thu, Nov 22, 2007 at 09:50:50AM +0100, Jiri Olsa wrote:
> I'm not sure if this is the right way but following patch is working for me.

Thanks - I sent in the following equivalent patch a few days ago -
http://marc.info/?l=linux-kernel&m=119549989631288&q=raw

Jeff

-- 
Work email - jdike at linux dot intel dot com

-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel


Re: [uml-devel] [PATCH] um: include/asm/arch link creation change

2007-11-22 Thread Jeff Dike
On Thu, Nov 22, 2007 at 12:08:17PM +0100, Jiri Olsa wrote:
> it works for me to use the HEADER_ARCH instead of the SUBARCH

Thanks - this is already in -mm, it just needs to get to mainline.

Jeff

-- 
Work email - jdike at linux dot intel dot com

-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel


Re: [uml-devel] uml git tree

2007-11-22 Thread Jeff Dike
On Thu, Nov 22, 2007 at 01:28:40PM +0100, Jiri Olsa wrote:
> I'd like to ask if there's any UML git repository.

No, I keep track of my patches with quilt.

> If there isnt, whats the devel process. How often you merge to Linus tree?

I send stuff to -mm for testing.  Bug fixes I request be sent to Linus
in the current release.  Non-urgent stuff sits in -mm until the next
merge window.  Patches go to Andrew on a near-daily basis.

Jeff

-- 
Work email - jdike at linux dot intel dot com

-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel


Re: [uml-devel] uml doesn't work on 2.6.24-rc2

2007-11-22 Thread Miklos Szeredi
> On Wed, Nov 14, 2007 at 10:29:57PM +0100, Miklos Szeredi wrote:
> > Config attached.
> 
> Thanks - this reproduces it for me.
> 
> BTW, you can work around this by enabling NO_HZ.

Thanks.  My other problem is (probably you are aware) that recent -mm
kernels don't compile for UML.

Miklos

-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel


Re: [uml-devel] uml doesn't work on 2.6.24-rc2

2007-11-22 Thread Jeff Dike
On Thu, Nov 22, 2007 at 07:08:47PM +0100, Miklos Szeredi wrote:
> Thanks.  My other problem is (probably you are aware) that recent -mm
> kernels don't compile for UML.

The patch below fixes the build for rc3-mm1 for me.

Jeff

-- 
Work email - jdike at linux dot intel dot com

Index: linux-2.6.22/include/asm-um/asm.h
===
--- /dev/null   1970-01-01 00:00:00.0 +
+++ linux-2.6.22/include/asm-um/asm.h   2007-11-21 12:15:03.0 -0500
@@ -0,0 +1,6 @@
+#ifndef __UM_ASM_H
+#define __UM_ASM_H
+
+#include "asm/arch/asm.h"
+
+#endif

-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel