[uml-devel] UML patches against vanilla 2.6.0

[uml-devel] UML patches against vanilla 2.6.0

[BlaisorBlade]

Go here:

http://web.tiscali.it/no-redirect-tiscali/blaisorblade/index.html

to fetch a bunch of patches against stock 2.6.0 kernel to build UML(no, you 
don't need the -test9 patch on main site: it's included). That page describes 
main changes of it against the latest 2.6 patch.
They are described in the Readme, that you *should* read; the tarball contains 
that Readme, too.

To apply this, you must apply all the patches in order apart from the F-02 
one. If you are a developer, you can check the README and see what you want.

You can then build both i386 with SKAS support and UML from the same tree. The 
SKAS guest kernels should work also on 2.4 host, unless you take the F-02 
patch, too (between the split-out ones).

Now I've collected also some patches from Ingo Molnar and Michael A. Young; 
the only remaining issue with this package is with Fedora (workarounds 
available, see the Readme). Plus all the patches still to port from UML 2.4.

If you are just a user, and you find 00-Combo-1.patch.bz2, fetch and apply it:

bzcat 00-Combo-1.patch.bz2|patch -p1

I've not yet built this combo patch since I've not got one 2.6.0 which is 
truely "vanilla". I hope you'll find it soon.

Bye
-- 
cat <<EOSIGN
Paolo Giarrusso, aka Blaisorblade
Linux Kernel 2.4.21/2.6.0-test on an i686; Linux registered user n. 292729
EOSIGN



-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
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 patches against vanilla 2.6.0

[Cameron Patrick]

On Fri, Dec 26, 2003 at 07:05:48PM +0100, BlaisorBlade wrote:

| Go here:
| 
| http://web.tiscali.it/no-redirect-tiscali/blaisorblade/index.html

Which says:

	The only problematic patch is A-04-MM-compile-fix.patch, but
	maybe i386 can live even with it (I don't remember if I got a
	successful compilation with it applied). However, I think it's
	not at all safe even if it compiles. 

and in the README:
	
	but I think you'd better avoid doing this or do a complete
	backup, since you'll need it...).

Eeek!  I just upgraded my home desktop to a 2.6.0 kernel with that patch
applied (actually as part of Jeff's 2.6.0-test9 patch) and so far it
seems to be working.  Looking at the patch, it seems innocuous enough -
why should it be unsafe on an i386 kernel?

Cameron.

(Who doesn't have a complete system backup and hopes he won't regret not
making one soon...)



-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
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 patches against vanilla 2.6.0

[BlaisorBlade]

Alle 19:27, venerdì 26 dicembre 2003, Cameron Patrick ha scritto:
> On Fri, Dec 26, 2003 at 07:05:48PM +0100, BlaisorBlade wrote:
> | Go here:
> |
> | http://web.tiscali.it/no-redirect-tiscali/blaisorblade/index.html
>
> Which says:
>
> 	The only problematic patch is A-04-MM-compile-fix.patch, but
> 	maybe i386 can live even with it (I don't remember if I got a
> 	successful compilation with it applied). However, I think it's
> 	not at all safe even if it compiles.
>
> and in the README:
>
> 	but I think you'd better avoid doing this or do a complete
> 	backup, since you'll need it...).

> Eeek!  I just upgraded my home desktop to a 2.6.0 kernel with that patch
> applied (actually as part of Jeff's 2.6.0-test9 patch) and so far it
> seems to be working.
Are you sure? If you compile a stock 2.6.0 with Jeff's 2.6.0-test9 patch and 
try to compile an i386 kernel, you'll get soon errors about 
do_mmap_pgoff(except if you applied a host-skas to your 2.6 tree).

> Looking at the patch, it seems innocuous enough -
> why should it be unsafe on an i386 kernel?

I don't know actually, but it doesn't seem innocuous.

Instead, FIXADDR_USER_START is replaced by FIXADDR_START(+ some syntactical 
changes that do not hurt). And they have a different meaning(see 
include/asm-i386/fixmap.h).

Since I'm not a VM hacker, and I don't understand the change, I just say that 
that shouldn't be used, for prudence's sake. That mention about backup is 
maybe a bit exaggerated, but it's a form of "no warranty" disclaimer.

*NOTE*: the combo patches from Ingo Molnar contain this, too(I don't know if 
he noticed this change at all), and he probably used this without problem. So 
I may be wrong at all.

Bye
-- 
cat <<EOSIGN
Paolo Giarrusso, aka Blaisorblade
Linux Kernel 2.4.21/2.6.0-test on an i686; Linux registered user n. 292729
EOSIGN



-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id\x1278&alloc_id371&opÌk
_______________________________________________
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 patches against vanilla 2.6.0

[BlaisorBlade]

I have some doubts about the 2.6 host-skas patch. I've searched through the 
list for earlier ports to 2.6 and I've seen someone (Bryan O'Sullivan 
<bos@serpentine.com>) complaining:

"The big issue with the skas patches, though, appears to be that they
don't handle the UML kernel being killed, which results in the host
kernel's memory management being completely trashed."

Is this a real issue or not?
-- 
cat <<EOSIGN
Paolo Giarrusso, aka Blaisorblade
Linux Kernel 2.4.21/2.6.0-test on an i686; Linux registered user n. 292729
EOSIGN



-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
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] Re: UML patches against vanilla 2.6.0

[Jason Lunz]

blaisorblade_spam@yahoo.it said:
> I have some doubts about the 2.6 host-skas patch. I've searched through the 
> list for earlier ports to 2.6 and I've seen someone (Bryan O'Sullivan 
> <bos@serpentine.com>) complaining:
>
> "The big issue with the skas patches, though, appears to be that they
> don't handle the UML kernel being killed, which results in the host
> kernel's memory management being completely trashed."
>
> Is this a real issue or not?

I think so. I'm running 2.6.0 vanilla + Ingo's combo -A2 on my host,
with 2.4.23 UMLs. I tried to do something in the uml involving lots of
tmpfs usage, and the host system crashed.

This was just before I went away for the holiday; I'm only now catching
up. I haven't re-tested with any of the newer 2.6 skas patches.

Jason



-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
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] Re: UML patches against vanilla 2.6.0

[BlaisorBlade]

Alle 21:09, lunedì 29 dicembre 2003, Jason Lunz ha scritto:
> blaisorblade_spam@yahoo.it said:

> > I have some doubts about the 2.6 host-skas patch. I've searched through
> > the list for earlier ports to 2.6 and I've seen someone (Bryan O'Sullivan
> > <bos@serpentine.com>) complaining:
> >
> > "The big issue with the skas patches, though, appears to be that they
> > don't handle the UML kernel being killed, which results in the host
> > kernel's memory management being completely trashed."
> >
> > Is this a real issue or not?
>
> I think so. I'm running 2.6.0 vanilla + Ingo's combo -A2 on my host,
> with 2.4.23 UMLs.
> I tried to do something in the uml involving lots of
> tmpfs usage, and the host system crashed.

If you use the Ingo's combo patch, maybe it's not the Skas mode itself.

There is a change in mm/memory.c which is fine for UML, but IMHO probably
hurts for the host kernel. Looking at the patch he posts, however, he didn't 
use this change, so beyond the mm/memory.c problem there must be another one.

To test that, you can either select the changes to that file away from the 
patch, or unapply (with -R option to patch) this patch, which contains 
exactly that change:

http://web.tiscali.it/no-redirect-tiscali/blaisorblade/linux/archives/UML/v2/A-04-MM-compile-fix.patch

-- 
cat <<EOSIGN
Paolo Giarrusso, aka Blaisorblade
Linux Kernel 2.4.21/2.6.0-test on an i686; Linux registered user n. 292729
EOSIGN



-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id\x1278&alloc_id371&opÌk
_______________________________________________
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 patches against vanilla 2.6.0

[Jeff Chua]

On Fri, 26 Dec 2003, BlaisorBlade wrote:

> Now I've collected also some patches from Ingo Molnar and Michael A. Young;
> the only remaining issue with this package is with Fedora (workarounds
> available, see the Readme). Plus all the patches still to port from UML 2.4.
>

Thanks for the great pointer. I've downloaded all these patches and
finally able to boot a clean 2.6.0-1um using initrd. There seems to some
problem with network (tuntap), but I'm still looking it.

Here's what I did ...

My real linux version is 2.4.24-pre1. My /usr/src/linux points to 2.6.0
with reiser4 and Ingo Molnar's uml-combo-2.6.0-A5 patch applied ... in
order for "make menconfig" to set CONFIG_PROC_MM=y

Here's my patch against Ingo Molnar's uml-combo-2.6.0-A5 patch to make the
patch works if you use reiser4 ...

After that patch, it'll be followed by another patch pointed out by
BlaisorBlade ...


160c160
< -	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
---
> -	error = do_mmap_pgoff(current->mm, file, addr, len, prot, flags, pgoff);
6709,6749d6708
< --- linux/include/linux/mm.h.orig
< +++ linux/include/linux/mm.h
< @@ -487,6 +487,9 @@ static inline int set_page_dirty(struct
<  	return __set_page_dirty_buffers(page);
<  }
<
< +extern long do_mprotect(struct mm_struct *mm, unsigned long start,
< +			size_t len, unsigned long prot);
< +
<  /*
<   * On a two-level page table, this ends up being trivial. Thus the
<   * inlining and the symmetry break with pte_alloc_map() that does all
< @@ -517,9 +520,15 @@ extern void exit_mmap(struct mm_struct *
<
<  extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
<
< -extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
< -	unsigned long len, unsigned long prot,
< -	unsigned long flag, unsigned long pgoff);
< +extern long do_mmap2(struct mm_struct *mm, unsigned long addr,
< +		     unsigned long len, unsigned long prot,
< +		     unsigned long flags, unsigned long fd,
< +		     unsigned long pgoff);
< +
< +extern unsigned long do_mmap_pgoff(struct mm_struct *mm, struct file *file,
< +				   unsigned long addr, unsigned long len,
< +				   unsigned long prot, unsigned long flag,
< +				   unsigned long pgoff);
<
<  static inline unsigned long do_mmap(struct file *file, unsigned long addr,
<  	unsigned long len, unsigned long prot,
< @@ -529,7 +538,8 @@ static inline unsigned long do_mmap(stru
<  	if ((offset + PAGE_ALIGN(len)) < offset)
<  		goto out;
<  	if (!(offset & ~PAGE_MASK))
< -		ret = do_mmap_pgoff(file, addr, len, prot, flag, offset >> PAGE_SHIFT);
< +		ret = do_mmap_pgoff(current->mm, file, addr, len, prot, flag,
< +				    offset >> PAGE_SHIFT);
<  out:
<  	return ret;
<  }
9759,9833d9717
< --- linux/mm/memory.c.orig
< +++ linux/mm/memory.c
< @@ -44,6 +44,7 @@
<  #include <linux/highmem.h>
<  #include <linux/pagemap.h>
<  #include <linux/rmap-locking.h>
< +#include <linux/init.h>
<  #include <linux/module.h>
<
<  #include <asm/pgalloc.h>
< @@ -680,6 +681,24 @@ static inline struct page *get_page_map(
<  }
<
<
< +static struct vm_area_struct fixmap_vma = {
< +	/* Catch users - if there are any valid
< +	   ones, we can make this be "&init_mm" or
< +	   something.  */
< +	.vm_mm = NULL,
< +	.vm_page_prot = PAGE_READONLY,
< +	.vm_flags = VM_READ | VM_EXEC,
< +};
< +
< +static int init_fixmap_vma(void)
< +{
< +	fixmap_vma.vm_start = FIXADDR_START;
< +	fixmap_vma.vm_end = FIXADDR_TOP;
< +	return(0);
< +}
< +
< +__initcall(init_fixmap_vma);
< +
<  int get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
<  		unsigned long start, int len, int write, int force,
<  		struct page **pages, struct vm_area_struct **vmas)
< @@ -700,19 +719,8 @@ int get_user_pages(struct task_struct *t
<
<  		vma = find_extend_vma(mm, start);
<
< -#ifdef FIXADDR_USER_START
< -		if (!vma &&
< -		    start >= FIXADDR_USER_START && start < FIXADDR_USER_END) {
< -			static struct vm_area_struct fixmap_vma = {
< -				/* Catch users - if there are any valid
< -				   ones, we can make this be "&init_mm" or
< -				   something.  */
< -				.vm_mm = NULL,
< -				.vm_start = FIXADDR_USER_START,
< -				.vm_end = FIXADDR_USER_END,
< -				.vm_page_prot = PAGE_READONLY,
< -				.vm_flags = VM_READ | VM_EXEC,
< -			};
< +#ifdef FIXADDR_START
< +		if (!vma && start >= FIXADDR_START && start < FIXADDR_TOP) {
<  			unsigned long pg = start & PAGE_MASK;
<  			pgd_t *pgd;
<  			pmd_t *pmd;
< --- linux/mm/mmap.c.orig
< +++ linux/mm/mmap.c
< @@ -462,11 +462,11 @@ static int vma_merge(struct mm_struct *m
<   * The caller must hold down_write(current->mm->mmap_sem).
<   */
<
< -unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,
< -			unsigned long len, unsigned long prot,
< -			unsigned long flags, unsigned long pgoff)
< +unsigned long do_mmap_pgoff(struct mm_struct *mm, struct file * file,
< +			    unsigned long addr, unsigned long len,
< +			    unsigned long prot, unsigned long flags,
< +			    unsigned long pgoff)
<  {
< -	struct mm_struct * mm = current->mm;
<  	struct vm_area_struct * vma, * prev;
<  	struct inode *inode;
<  	unsigned int vm_flags;
9836,9845d9719
< @@ -222,7 +222,8 @@ fail:
<  }
<
<  asmlinkage long
< -sys_mprotect(unsigned long start, size_t len, unsigned long prot)
< +do_mprotect(struct mm_struct *mm, unsigned long start, size_t len,
< +	     unsigned long prot)
<  {
<  	unsigned long vm_flags, nstart, end, tmp;
<  	struct vm_area_struct * vma, * next, * prev;
9858,9870d9731
< @@ -326,6 +327,11 @@ sys_mprotect(unsigned long start, size_t
<  		prev->vm_mm->map_count--;
<  	}
<  out:
< -	up_write(&current->mm->mmap_sem);
< +	up_write(&mm->mmap_sem);
<  	return error;
<  }
< +
< +asmlinkage long sys_mprotect(unsigned long start, size_t len, unsigned long prot)
< +{
< +        return(do_mprotect(current->mm, start, len, prot));
< +}



On uml linux, apply the following patches from ...

http://web.tiscali.it/no-redirect-tiscali/blaisorblade/linux/archives/UML/v2/

A-01-Uml-update.patch
A-02-Hostfs+hppfs.patch
A-03-TTY_silly.patch
A-05-Compile_no_proc_mm.patch
C-01-Fix_clean_mrproper.patch
C-02-Apply_altern-constants.patch
C-03-Module_support.patch
C-04-User_obj_makefiles.patch
D-01-WarningFix.patch
E-01-Add_proc_mm_support.patch
E-02-Proc_mm_speedup.patch
F-01-i386_skas_support.patch
G-01-Align_fix.patch


Next, apply the following patches I created to make uml compiles ...

I'm no expert, but with these patches, at least I can now boot uml 2.6.0
on top of 2.4.24pre1.


Thanks,
Jeff

--- uml/include/asm/ptrace-generic.h	Sat Dec 27 23:18:48 2003
+++ uml.good/include/asm/ptrace-generic.h	Sat Dec 27 11:42:52 2003
@@ -15,7 +15,7 @@
 #define pt_regs pt_regs_subarch
 #define show_regs show_regs_subarch

-#include "asm/arch/ptrace.h"
+//#include "asm/arch/ptrace.h"

 #undef pt_regs
 #undef show_regs
--- uml/arch/um/sys-i386/bugs.c.org	Sat Dec 27 23:28:01 2003
+++ uml/arch/um/sys-i386/bugs.c	Sat Dec 27 23:29:19 2003
@@ -16,6 +16,9 @@

 #define MAXTOKEN 64

+extern int modify_ldt(int func, void *ptr, unsigned long bytecount);
+
+
 /* Set during early boot */
 int host_has_cmov = 1;
 int host_has_xmm = 0;
@@ -107,7 +110,7 @@

 static void disable_lcall(void)
 {
-	struct modify_ldt_ldt_s ldt;
+	struct user_desc ldt;
 	int err;

 	bzero(&ldt, sizeof(ldt));
--- uml/arch/um/sys-i386/ptrace_user.c	Thu Dec 18 10:58:28 2003
+++ uml.good/arch/um/sys-i386/ptrace_user.c	Sat Dec 27 11:57:03 2003
@@ -15,6 +15,28 @@
 #include "user.h"
 #include "os.h"

+#define PTRACE_TRACEME             0
+#define PTRACE_PEEKTEXT            1
+#define PTRACE_PEEKDATA            2
+#define PTRACE_PEEKUSR             3
+#define PTRACE_POKETEXT            4
+#define PTRACE_POKEDATA            5
+#define PTRACE_POKEUSR             6
+#define PTRACE_CONT                7
+#define PTRACE_KILL                8
+#define PTRACE_SINGLESTEP          9
+
+#define PTRACE_ATTACH           0x10
+#define PTRACE_DETACH           0x11
+
+#define PTRACE_SYSCALL            24
+
+#define PTRACE_FAULTINFO          52
+#define PTRACE_SIGPENDING         53
+#define PTRACE_LDT                54
+#define PTRACE_SWITCH_MM          55
+
+
 int ptrace_getregs(long pid, unsigned long *regs_out)
 {
 	return(ptrace(PTRACE_GETREGS, pid, 0, regs_out));
--- uml/arch/um/sys-i386/ptrace_user.c.org	Sat Dec 27 23:47:53 2003
+++ uml/arch/um/sys-i386/ptrace_user.c	Sat Dec 27 23:48:49 2003
@@ -7,8 +7,9 @@
 #include <errno.h>
 #include <unistd.h>
 #include <linux/stddef.h>
-#include <sys/ptrace.h>
-#include <asm/ptrace.h>
+//#include <sys/ptrace.h>
+#include <linux/ptrace.h>
+//#include <asm/ptrace.h>
 #include <asm/user.h>
 #include "kern_util.h"
 #include "sysdep/thread.h"
--- uml/arch/um/kernel/syscall_kern.c.org	Sat Dec 27 23:59:53 2003
+++ uml/arch/um/kernel/syscall_kern.c	Sun Dec 28 00:07:54 2003
@@ -76,7 +76,7 @@
 				unsigned long addr, unsigned long len,
 				unsigned long prot, unsigned long flag,
 				unsigned long pgoff) {
-	return do_mmap_pgoff(file, addr, len, prot, flag, pgoff);
+	return do_mmap_pgoff(mm, file, addr, len, prot, flag, pgoff);
 }
 #endif

--- uml/arch/i386/kernel/sys_i386.c.org	Sun Dec 28 00:12:31 2003
+++ uml/arch/i386/kernel/sys_i386.c	Sun Dec 28 00:12:54 2003
@@ -40,15 +40,6 @@
 }

 /* See this definition in arch/um/kernel/syscall_kern.c for comments.*/
-#ifndef CONFIG_PROC_MM
-static inline unsigned long __do_mmap_pgoff(
-				struct mm_struct *mm, struct file *file,
-				unsigned long addr, unsigned long len,
-				unsigned long prot, unsigned long flag,
-				unsigned long pgoff) {
-	return do_mmap_pgoff(file, addr, len, prot, flag, pgoff);
-}
-#endif

 /* common code for old and new mmaps */
 long do_mmap2(struct mm_struct *mm,
--- uml/mm/mmap.c.org	Sun Dec 28 00:17:14 2003
+++ uml/mm/mmap.c	Sun Dec 28 00:17:43 2003
@@ -714,7 +714,7 @@
 	return error;
 }

-EXPORT_SYMBOL(__do_mmap_pgoff);
+EXPORT_SYMBOL(do_mmap_pgoff);

 /* Get an address range which is currently unmapped.
  * For shmat() with addr=0.


-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
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 patches against vanilla 2.6.0

[BlaisorBlade]

> Thanks for the great pointer.
> I've downloaded all these patches and
> finally able to boot a clean 2.6.0-1um using initrd. There seems to some
> problem with network (tuntap), but I'm still looking it.

We'll accept happily reports.

> Here's what I did ...
>
> My real linux version is 2.4.24-pre1. My /usr/src/linux points to 2.6.0
> with reiser4 and Ingo Molnar's uml-combo-2.6.0-A5 patch applied ... in
> order for "make menconfig" to set CONFIG_PROC_MM=y
>
> Here's my patch against Ingo Molnar's uml-combo-2.6.0-A5 patch to make the
> patch works if you use reiser4 ...

Btw: avoid at all, if possible, patches in normal format; always use unified 
diff.
However, probably the patchset works with reiser4, for what I saw reviewing 
your diff. Was the error message something about do_mmap_pgoff, I guess?

> http://web.tiscali.it/no-redirect-tiscali/blaisorblade/linux/archives/UML/v
>2/
[...]
> Next, apply the following patches I created to make uml compiles ...
About these: most of them are needed because I did some silly errors, even 
because doing 4 kernel compiles(i386/uml, PROC_MM on and off)  to test it is 
a bit tiring... however now I did those test and finally it should be 
working.

In general, I'd suggest using 00-Combo-4.patch.bz2, which should remove the 
need for them, + remove the A-04... patch when you compile for i386.

Who has the modify_ldt problem (as Jeff Chua) should use also this piece(copy 
it from the previous email). However, I hope I can put a workaround for this 
problem in the next version of the patchset:

> --- uml/arch/um/sys-i386/bugs.c.org	Sat Dec 27 23:28:01 2003
> +++ uml/arch/um/sys-i386/bugs.c	Sat Dec 27 23:29:19 2003
> @@ -16,6 +16,9 @@
>
>  #define MAXTOKEN 64
>
> +extern int modify_ldt(int func, void *ptr, unsigned long bytecount);
> +
> +
>  /* Set during early boot */
>  int host_has_cmov = 1;
>  int host_has_xmm = 0;
> @@ -107,7 +110,7 @@
>
>  static void disable_lcall(void)
>  {
> -	struct modify_ldt_ldt_s ldt;
> +	struct user_desc ldt;
>  	int err;
>
>  	bzero(&ldt, sizeof(ldt));

About this piece:
> --- uml/mm/mmap.c.org	Sun Dec 28 00:17:14 2003
> +++ uml/mm/mmap.c	Sun Dec 28 00:17:43 2003
> @@ -714,7 +714,7 @@
>  	return error;
>  }
>
> -EXPORT_SYMBOL(__do_mmap_pgoff);
> +EXPORT_SYMBOL(do_mmap_pgoff);
No, sorry, but the symbol to export is __do_mmap_pgoff, since I changed the 
function name.
-- 
cat <<EOSIGN
Paolo Giarrusso, aka Blaisorblade
Linux Kernel 2.4.21/2.6.0-test on an i686; Linux registered user n. 292729
EOSIGN




-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
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-user] Re: [uml-devel] UML patches against vanilla 2.6.0

[Domenico Andreoli]

Jeff Chua wrote:
> Here's what I did ...
> 
> My real linux version is 2.4.24-pre1. My /usr/src/linux points to 2.6.0
> with reiser4 and Ingo Molnar's uml-combo-2.6.0-A5 patch applied ... in
> order for "make menconfig" to set CONFIG_PROC_MM=y
> 
> Here's my patch against Ingo Molnar's uml-combo-2.6.0-A5 patch to make the
> patch works if you use reiser4 ...
> 
ehm... i was not able to apply this patch...

> After that patch, it'll be followed by another patch pointed out by
> BlaisorBlade ...
> 
> 
... and also this. maybe it's a problem with cut&paste...

would you be so kind to make them with diff -u and post them as attachment?

many thanks
domenico

-----[ Domenico Andreoli, aka cavok
  --[ http://filibusta.crema.unimi.it/~cavok/gpgkey.asc
    ---[ 3A0F 2F80 F79C 678A 8936  4FEE 0677 9033 A20E BC50


-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
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-user] Re: [uml-devel] UML patches against vanilla 2.6.0

[Jeff Chua]

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



On Sun, 28 Dec 2003, Domenico Andreoli wrote:

> > Here's my patch against Ingo Molnar's uml-combo-2.6.0-A5 patch to make the
> > patch works if you use reiser4 ...
> ehm... i was not able to apply this patch...

sorry, 1st wasn't a "diff -u". Attached should be the correct one
(uml-combo-2.6.0-A5b.patch). Again, apply this patch to
uml-combo-2.6.0-A5, then patch the kernel.


> > After that patch, it'll be followed by another patch pointed out by
> > BlaisorBlade ...
> ... and also this. maybe it's a problem with cut&paste...

Ok, second patch is attached as well (uml-combo-2.6.0-A5b.uml)

I've also attached my uml .config. CONFIG_MODVERSIONS works. SKAS works
too.


Jeff

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

--- uml-combo-2.6.0-A5	Tue Dec 23 20:48:31 2003
+++ uml-combo-2.6.0-A5b	Sun Dec 28 09:03:59 2003
@@ -157,7 +157,7 @@
  	}
  
 -	down_write(&current->mm->mmap_sem);
--	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
+-	error = do_mmap_pgoff(current->mm, file, addr, len, prot, flags, pgoff);
 -	up_write(&current->mm->mmap_sem);
 +	down_write(&mm->mmap_sem);
 +	error = do_mmap_pgoff(mm, file, addr, len, prot, flags, pgoff);
@@ -6706,47 +6706,6 @@
    .data    :
    {
      . = ALIGN(KERNEL_STACK_SIZE);		/* init_task */
---- linux/include/linux/mm.h.orig	
-+++ linux/include/linux/mm.h	
-@@ -487,6 +487,9 @@ static inline int set_page_dirty(struct 
- 	return __set_page_dirty_buffers(page);
- }
- 
-+extern long do_mprotect(struct mm_struct *mm, unsigned long start, 
-+			size_t len, unsigned long prot);
-+
- /*
-  * On a two-level page table, this ends up being trivial. Thus the
-  * inlining and the symmetry break with pte_alloc_map() that does all
-@@ -517,9 +520,15 @@ extern void exit_mmap(struct mm_struct *
- 
- extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
- 
--extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
--	unsigned long len, unsigned long prot,
--	unsigned long flag, unsigned long pgoff);
-+extern long do_mmap2(struct mm_struct *mm, unsigned long addr,
-+		     unsigned long len, unsigned long prot,
-+		     unsigned long flags, unsigned long fd,
-+		     unsigned long pgoff);
-+
-+extern unsigned long do_mmap_pgoff(struct mm_struct *mm, struct file *file, 
-+				   unsigned long addr, unsigned long len,
-+				   unsigned long prot, unsigned long flag,
-+				   unsigned long pgoff);
- 
- static inline unsigned long do_mmap(struct file *file, unsigned long addr,
- 	unsigned long len, unsigned long prot,
-@@ -529,7 +538,8 @@ static inline unsigned long do_mmap(stru
- 	if ((offset + PAGE_ALIGN(len)) < offset)
- 		goto out;
- 	if (!(offset & ~PAGE_MASK))
--		ret = do_mmap_pgoff(file, addr, len, prot, flag, offset >> PAGE_SHIFT);
-+		ret = do_mmap_pgoff(current->mm, file, addr, len, prot, flag, 
-+				    offset >> PAGE_SHIFT);
- out:
- 	return ret;
- }
 --- linux/include/linux/proc_mm.h.orig	
 +++ linux/include/linux/proc_mm.h	
 @@ -0,0 +1,48 @@
@@ -9756,93 +9715,8 @@
  obj-$(CONFIG_SWAP)	+= page_io.o swap_state.o swapfile.o
 +obj-$(CONFIG_PROC_MM)	+= proc_mm.o
 +
---- linux/mm/memory.c.orig	
-+++ linux/mm/memory.c	
-@@ -44,6 +44,7 @@
- #include <linux/highmem.h>
- #include <linux/pagemap.h>
- #include <linux/rmap-locking.h>
-+#include <linux/init.h>
- #include <linux/module.h>
- 
- #include <asm/pgalloc.h>
-@@ -680,6 +681,24 @@ static inline struct page *get_page_map(
- }
- 
- 
-+static struct vm_area_struct fixmap_vma = {
-+	/* Catch users - if there are any valid
-+	   ones, we can make this be "&init_mm" or
-+	   something.  */
-+	.vm_mm = NULL,
-+	.vm_page_prot = PAGE_READONLY,
-+	.vm_flags = VM_READ | VM_EXEC,
-+};
-+
-+static int init_fixmap_vma(void)
-+{
-+	fixmap_vma.vm_start = FIXADDR_START;
-+	fixmap_vma.vm_end = FIXADDR_TOP;
-+	return(0);
-+}
-+
-+__initcall(init_fixmap_vma);
-+
- int get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
- 		unsigned long start, int len, int write, int force,
- 		struct page **pages, struct vm_area_struct **vmas)
-@@ -700,19 +719,8 @@ int get_user_pages(struct task_struct *t
- 
- 		vma = find_extend_vma(mm, start);
- 
--#ifdef FIXADDR_USER_START
--		if (!vma &&
--		    start >= FIXADDR_USER_START && start < FIXADDR_USER_END) {
--			static struct vm_area_struct fixmap_vma = {
--				/* Catch users - if there are any valid
--				   ones, we can make this be "&init_mm" or
--				   something.  */
--				.vm_mm = NULL,
--				.vm_start = FIXADDR_USER_START,
--				.vm_end = FIXADDR_USER_END,
--				.vm_page_prot = PAGE_READONLY,
--				.vm_flags = VM_READ | VM_EXEC,
--			};
-+#ifdef FIXADDR_START
-+		if (!vma && start >= FIXADDR_START && start < FIXADDR_TOP) {
- 			unsigned long pg = start & PAGE_MASK;
- 			pgd_t *pgd;
- 			pmd_t *pmd;
---- linux/mm/mmap.c.orig	
-+++ linux/mm/mmap.c	
-@@ -462,11 +462,11 @@ static int vma_merge(struct mm_struct *m
-  * The caller must hold down_write(current->mm->mmap_sem).
-  */
- 
--unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,
--			unsigned long len, unsigned long prot,
--			unsigned long flags, unsigned long pgoff)
-+unsigned long do_mmap_pgoff(struct mm_struct *mm, struct file * file, 
-+			    unsigned long addr, unsigned long len,
-+			    unsigned long prot, unsigned long flags,
-+			    unsigned long pgoff)
- {
--	struct mm_struct * mm = current->mm;
- 	struct vm_area_struct * vma, * prev;
- 	struct inode *inode;
- 	unsigned int vm_flags;
 --- linux/mm/mprotect.c.orig	
 +++ linux/mm/mprotect.c	
-@@ -222,7 +222,8 @@ fail:
- }
- 
- asmlinkage long
--sys_mprotect(unsigned long start, size_t len, unsigned long prot)
-+do_mprotect(struct mm_struct *mm, unsigned long start, size_t len, 
-+	     unsigned long prot)
- {
- 	unsigned long vm_flags, nstart, end, tmp;
- 	struct vm_area_struct * vma, * next, * prev;
 @@ -245,9 +246,9 @@ sys_mprotect(unsigned long start, size_t
  
  	vm_flags = calc_vm_prot_bits(prot);
@@ -9855,19 +9729,6 @@
  	error = -ENOMEM;
  	if (!vma)
  		goto out;
-@@ -326,6 +327,11 @@ sys_mprotect(unsigned long start, size_t
- 		prev->vm_mm->map_count--;
- 	}
- out:
--	up_write(&current->mm->mmap_sem);
-+	up_write(&mm->mmap_sem);
- 	return error;
- }
-+
-+asmlinkage long sys_mprotect(unsigned long start, size_t len, unsigned long prot)
-+{
-+        return(do_mprotect(current->mm, start, len, prot));
-+}
 --- linux/mm/proc_mm.c.orig	
 +++ linux/mm/proc_mm.c	
 @@ -0,0 +1,163 @@

[-- Attachment #3: Type: TEXT/PLAIN, Size: 3567 bytes --]

--- uml/include/asm/ptrace-generic.h	Sat Dec 27 23:18:48 2003
+++ uml.good/include/asm/ptrace-generic.h	Sat Dec 27 11:42:52 2003
@@ -15,7 +15,7 @@
 #define pt_regs pt_regs_subarch
 #define show_regs show_regs_subarch
 
-#include "asm/arch/ptrace.h"
+//#include "asm/arch/ptrace.h"
 
 #undef pt_regs
 #undef show_regs
--- uml/arch/um/sys-i386/bugs.c.org	Sat Dec 27 23:28:01 2003
+++ uml/arch/um/sys-i386/bugs.c	Sat Dec 27 23:29:19 2003
@@ -16,6 +16,9 @@
 
 #define MAXTOKEN 64
 
+extern int modify_ldt(int func, void *ptr, unsigned long bytecount);
+
+
 /* Set during early boot */
 int host_has_cmov = 1;
 int host_has_xmm = 0;
@@ -107,7 +110,7 @@
 
 static void disable_lcall(void)
 {
-	struct modify_ldt_ldt_s ldt;
+	struct user_desc ldt;
 	int err;
 
 	bzero(&ldt, sizeof(ldt));
--- uml/arch/um/sys-i386/ptrace_user.c	Thu Dec 18 10:58:28 2003
+++ uml.good/arch/um/sys-i386/ptrace_user.c	Sat Dec 27 11:57:03 2003
@@ -15,6 +15,28 @@
 #include "user.h"
 #include "os.h"
 
+#define PTRACE_TRACEME             0
+#define PTRACE_PEEKTEXT            1
+#define PTRACE_PEEKDATA            2
+#define PTRACE_PEEKUSR             3
+#define PTRACE_POKETEXT            4
+#define PTRACE_POKEDATA            5
+#define PTRACE_POKEUSR             6
+#define PTRACE_CONT                7
+#define PTRACE_KILL                8
+#define PTRACE_SINGLESTEP          9
+
+#define PTRACE_ATTACH           0x10
+#define PTRACE_DETACH           0x11
+
+#define PTRACE_SYSCALL            24
+
+#define PTRACE_FAULTINFO          52
+#define PTRACE_SIGPENDING         53
+#define PTRACE_LDT                54
+#define PTRACE_SWITCH_MM          55
+
+
 int ptrace_getregs(long pid, unsigned long *regs_out)
 {
 	return(ptrace(PTRACE_GETREGS, pid, 0, regs_out));
--- uml/arch/um/sys-i386/ptrace_user.c.org	Sat Dec 27 23:47:53 2003
+++ uml/arch/um/sys-i386/ptrace_user.c	Sat Dec 27 23:48:49 2003
@@ -7,8 +7,9 @@
 #include <errno.h>
 #include <unistd.h>
 #include <linux/stddef.h>
-#include <sys/ptrace.h>
-#include <asm/ptrace.h>
+//#include <sys/ptrace.h>
+#include <linux/ptrace.h>
+//#include <asm/ptrace.h>
 #include <asm/user.h>
 #include "kern_util.h"
 #include "sysdep/thread.h"
--- uml/arch/um/kernel/syscall_kern.c.org	Sat Dec 27 23:59:53 2003
+++ uml/arch/um/kernel/syscall_kern.c	Sun Dec 28 00:07:54 2003
@@ -76,7 +76,7 @@
 				unsigned long addr, unsigned long len,
 				unsigned long prot, unsigned long flag,
 				unsigned long pgoff) {
-	return do_mmap_pgoff(file, addr, len, prot, flag, pgoff);
+	return do_mmap_pgoff(mm, file, addr, len, prot, flag, pgoff);
 }
 #endif
 
--- uml/arch/i386/kernel/sys_i386.c.org	Sun Dec 28 00:12:31 2003
+++ uml/arch/i386/kernel/sys_i386.c	Sun Dec 28 00:12:54 2003
@@ -40,15 +40,6 @@
 }
 
 /* See this definition in arch/um/kernel/syscall_kern.c for comments.*/
-#ifndef CONFIG_PROC_MM
-static inline unsigned long __do_mmap_pgoff(
-				struct mm_struct *mm, struct file *file, 
-				unsigned long addr, unsigned long len,
-				unsigned long prot, unsigned long flag,
-				unsigned long pgoff) {
-	return do_mmap_pgoff(file, addr, len, prot, flag, pgoff);
-}
-#endif
 
 /* common code for old and new mmaps */
 long do_mmap2(struct mm_struct *mm,
--- uml/mm/mmap.c.org	Sun Dec 28 00:17:14 2003
+++ uml/mm/mmap.c	Sun Dec 28 00:17:43 2003
@@ -714,7 +714,7 @@
 	return error;
 }
 
-EXPORT_SYMBOL(__do_mmap_pgoff);
+EXPORT_SYMBOL(do_mmap_pgoff);
 
 /* Get an address range which is currently unmapped.
  * For shmat() with addr=0.

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

#
# Automatically generated make config: don't edit
#
CONFIG_USERMODE=y
CONFIG_MMU=y
CONFIG_UID16=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y

#
# UML-specific options
#
# CONFIG_MODE_TT is not set
# CONFIG_STATIC_LINK is not set
CONFIG_MODE_SKAS=y
CONFIG_NET=y
CONFIG_BINFMT_ELF=y
CONFIG_BINFMT_MISC=m
CONFIG_HOSTFS=y
CONFIG_HPPFS=y
CONFIG_MCONSOLE=y
# CONFIG_MAGIC_SYSRQ is not set
# CONFIG_HOST_2G_2G is not set
# CONFIG_UML_SMP is not set
# CONFIG_SMP is not set
CONFIG_NEST_LEVEL=0
CONFIG_KERNEL_HALF_GIGS=1
# CONFIG_HIGHMEM is not set
# CONFIG_PROC_MM is not set
CONFIG_KERNEL_STACK_ORDER=2

#
# Code maturity level options
#
CONFIG_EXPERIMENTAL=y
CONFIG_CLEAN_COMPILE=y
CONFIG_STANDALONE=y
CONFIG_BROKEN_ON_SMP=y

#
# General setup
#
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
# CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_SYSCTL=y
CONFIG_LOG_BUF_SHIFT=14
# CONFIG_IKCONFIG is not set
# CONFIG_EMBEDDED is not set
CONFIG_KALLSYMS=y
CONFIG_FUTEX=y
CONFIG_EPOLL=y
CONFIG_IOSCHED_NOOP=y
CONFIG_IOSCHED_AS=y
CONFIG_IOSCHED_DEADLINE=y

#
# Loadable module support
#
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_OBSOLETE_MODPARM=y
CONFIG_MODVERSIONS=y
CONFIG_KMOD=y

#
# Generic Driver Options
#

#
# Character Devices
#
CONFIG_STDIO_CONSOLE=y
CONFIG_SSL=y
CONFIG_FD_CHAN=y
CONFIG_NULL_CHAN=y
CONFIG_PORT_CHAN=y
CONFIG_PTY_CHAN=y
CONFIG_TTY_CHAN=y
CONFIG_XTERM_CHAN=y
CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
CONFIG_CON_CHAN="xterm"
CONFIG_SSL_CHAN="pty"
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
# CONFIG_WATCHDOG is not set
CONFIG_UML_SOUND=y
CONFIG_SOUND=y
CONFIG_HOSTAUDIO=y

#
# Block Devices
#
CONFIG_BLK_DEV_UBD=y
# CONFIG_BLK_DEV_UBD_SYNC is not set
CONFIG_BLK_DEV_COW_COMMON=y
CONFIG_BLK_DEV_LOOP=m
# CONFIG_BLK_DEV_NBD is not set
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=32768
CONFIG_BLK_DEV_INITRD=y
# CONFIG_MMAPPER is not set
CONFIG_NETDEVICES=y

#
# UML Network Devices
#
CONFIG_UML_NET=y
CONFIG_UML_NET_ETHERTAP=y
CONFIG_UML_NET_TUNTAP=y
# CONFIG_UML_NET_SLIP is not set
CONFIG_UML_NET_DAEMON=y
CONFIG_UML_NET_MCAST=y
# CONFIG_UML_NET_PCAP is not set
# CONFIG_UML_NET_SLIRP is not set

#
# Networking support
#

#
# Networking options
#
CONFIG_PACKET=y
CONFIG_PACKET_MMAP=y
# CONFIG_NETLINK_DEV is not set
CONFIG_UNIX=y
# CONFIG_NET_KEY is not set
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_IP_MULTIPLE_TABLES=y
CONFIG_IP_ROUTE_FWMARK=y
CONFIG_IP_ROUTE_NAT=y
# CONFIG_IP_ROUTE_MULTIPATH is not set
# CONFIG_IP_ROUTE_TOS is not set
CONFIG_IP_ROUTE_VERBOSE=y
# CONFIG_IP_PNP is not set
CONFIG_NET_IPIP=m
# CONFIG_NET_IPGRE is not set
# CONFIG_IP_MROUTE is not set
# CONFIG_ARPD is not set
CONFIG_INET_ECN=y
CONFIG_SYN_COOKIES=y
# CONFIG_INET_AH is not set
# CONFIG_INET_ESP is not set
# CONFIG_INET_IPCOMP is not set

#
# IP: Virtual Server Configuration
#
# CONFIG_IP_VS is not set
# CONFIG_IPV6 is not set
# CONFIG_DECNET is not set
# CONFIG_BRIDGE is not set
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set

#
# IP: Netfilter Configuration
#
CONFIG_IP_NF_CONNTRACK=m
CONFIG_IP_NF_FTP=m
CONFIG_IP_NF_IRC=m
CONFIG_IP_NF_TFTP=m
# CONFIG_IP_NF_AMANDA is not set
# CONFIG_IP_NF_QUEUE is not set
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_LIMIT=m
# CONFIG_IP_NF_MATCH_IPRANGE is not set
CONFIG_IP_NF_MATCH_MAC=m
CONFIG_IP_NF_MATCH_PKTTYPE=m
CONFIG_IP_NF_MATCH_MARK=m
CONFIG_IP_NF_MATCH_MULTIPORT=m
CONFIG_IP_NF_MATCH_TOS=m
CONFIG_IP_NF_MATCH_RECENT=m
CONFIG_IP_NF_MATCH_ECN=m
CONFIG_IP_NF_MATCH_DSCP=m
CONFIG_IP_NF_MATCH_AH_ESP=m
CONFIG_IP_NF_MATCH_LENGTH=m
CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_MATCH_TCPMSS=m
CONFIG_IP_NF_MATCH_HELPER=m
CONFIG_IP_NF_MATCH_STATE=m
CONFIG_IP_NF_MATCH_CONNTRACK=m
CONFIG_IP_NF_MATCH_OWNER=m
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_NAT=m
CONFIG_IP_NF_NAT_NEEDED=y
CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
# CONFIG_IP_NF_TARGET_NETMAP is not set
# CONFIG_IP_NF_TARGET_SAME is not set
CONFIG_IP_NF_NAT_LOCAL=y
# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
CONFIG_IP_NF_NAT_TFTP=m
CONFIG_IP_NF_MANGLE=m
CONFIG_IP_NF_TARGET_TOS=m
CONFIG_IP_NF_TARGET_ECN=m
CONFIG_IP_NF_TARGET_DSCP=m
CONFIG_IP_NF_TARGET_MARK=m
# CONFIG_IP_NF_TARGET_CLASSIFY is not set
CONFIG_IP_NF_TARGET_LOG=m
CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_IP_NF_TARGET_TCPMSS=m
# CONFIG_IP_NF_ARPTABLES is not set
# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
# CONFIG_IP_NF_COMPAT_IPFWADM is not set
CONFIG_XFRM=y
# CONFIG_XFRM_USER is not set

#
# SCTP Configuration (EXPERIMENTAL)
#
CONFIG_IPV6_SCTP__=y
# CONFIG_IP_SCTP is not set
# CONFIG_ATM is not set
# CONFIG_VLAN_8021Q is not set
# CONFIG_LLC2 is not set
# CONFIG_IPX is not set
# CONFIG_ATALK is not set
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
# CONFIG_NET_DIVERT is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
# CONFIG_NET_FASTROUTE is not set
# CONFIG_NET_HW_FLOWCONTROL is not set

#
# QoS and/or fair queueing
#
# CONFIG_NET_SCHED is not set

#
# Network testing
#
# CONFIG_NET_PKTGEN is not set
CONFIG_DUMMY=m
CONFIG_BONDING=m
CONFIG_EQUALIZER=m
CONFIG_TUN=m

#
# Ethernet (10 or 100Mbit)
#
# CONFIG_NET_ETHERNET is not set

#
# Ethernet (1000 Mbit)
#

#
# Ethernet (10000 Mbit)
#
# CONFIG_PPP is not set
# CONFIG_SLIP is not set

#
# Wireless LAN (non-hamradio)
#
# CONFIG_NET_RADIO is not set

#
# Token Ring devices
#
# CONFIG_SHAPER is not set

#
# Wan interfaces
#
# CONFIG_WAN is not set

#
# Amateur Radio support
#
# CONFIG_HAMRADIO is not set

#
# IrDA (infrared) support
#
# CONFIG_IRDA is not set

#
# Bluetooth support
#
# CONFIG_BT is not set

#
# File systems
#
CONFIG_EXT2_FS=y
# CONFIG_EXT2_FS_XATTR is not set
CONFIG_EXT3_FS=m
CONFIG_EXT3_FS_XATTR=y
# CONFIG_EXT3_FS_POSIX_ACL is not set
# CONFIG_EXT3_FS_SECURITY is not set
CONFIG_JBD=m
# CONFIG_JBD_DEBUG is not set
CONFIG_FS_MBCACHE=y
CONFIG_REISER4_FS=y
# CONFIG_REISER4_FS_SYSCALL is not set
CONFIG_REISER4_LARGE_KEY=y
# CONFIG_REISER4_CHECK is not set
CONFIG_REISER4_USE_EFLUSH=y
# CONFIG_REISER4_COPY_ON_CAPTURE is not set
# CONFIG_REISER4_BADBLOCKS is not set
CONFIG_REISERFS_FS=y
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO is not set
# CONFIG_JFS_FS is not set
CONFIG_FS_POSIX_ACL=y
# CONFIG_XFS_FS is not set
# CONFIG_MINIX_FS is not set
# CONFIG_ROMFS_FS is not set
# CONFIG_QUOTA is not set
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUTOFS4_FS is not set

#
# CD-ROM/DVD Filesystems
#
CONFIG_ISO9660_FS=m
CONFIG_JOLIET=y
# CONFIG_ZISOFS is not set
CONFIG_UDF_FS=m

#
# DOS/FAT/NT Filesystems
#
CONFIG_FAT_FS=m
CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=m
CONFIG_NTFS_FS=m
# CONFIG_NTFS_DEBUG is not set
CONFIG_NTFS_RW=y

#
# Pseudo filesystems
#
CONFIG_PROC_FS=y
CONFIG_PROC_KCORE=y
# CONFIG_DEVFS_FS is not set
CONFIG_DEVPTS_FS=y
# CONFIG_DEVPTS_FS_XATTR is not set
CONFIG_TMPFS=y
# CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y

#
# Miscellaneous filesystems
#
# CONFIG_ADFS_FS is not set
# CONFIG_AFFS_FS is not set
# CONFIG_HFS_FS is not set
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
# CONFIG_CRAMFS is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not set

#
# Network File Systems
#
CONFIG_NFS_FS=m
CONFIG_NFS_V3=y
# CONFIG_NFS_V4 is not set
# CONFIG_NFS_DIRECTIO is not set
CONFIG_NFSD=m
CONFIG_NFSD_V3=y
# CONFIG_NFSD_V4 is not set
CONFIG_NFSD_TCP=y
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=m
CONFIG_SUNRPC=m
# CONFIG_SUNRPC_GSS is not set
CONFIG_SMB_FS=m
CONFIG_SMB_NLS_DEFAULT=y
CONFIG_SMB_NLS_REMOTE="cp437"
# CONFIG_CIFS is not set
# CONFIG_NCP_FS is not set
CONFIG_CODA_FS=m
# CONFIG_CODA_FS_OLD_API is not set
# CONFIG_INTERMEZZO_FS is not set
# CONFIG_AFS_FS is not set

#
# Partition Types
#
CONFIG_PARTITION_ADVANCED=y
# CONFIG_ACORN_PARTITION is not set
# CONFIG_OSF_PARTITION is not set
# CONFIG_AMIGA_PARTITION is not set
# CONFIG_ATARI_PARTITION is not set
# CONFIG_MAC_PARTITION is not set
CONFIG_MSDOS_PARTITION=y
# CONFIG_BSD_DISKLABEL is not set
# CONFIG_MINIX_SUBPARTITION is not set
# CONFIG_SOLARIS_X86_PARTITION is not set
# CONFIG_UNIXWARE_DISKLABEL is not set
# CONFIG_LDM_PARTITION is not set
# CONFIG_NEC98_PARTITION is not set
# CONFIG_SGI_PARTITION is not set
# CONFIG_ULTRIX_PARTITION is not set
# CONFIG_SUN_PARTITION is not set
# CONFIG_EFI_PARTITION is not set
CONFIG_SMB_NLS=y
CONFIG_NLS=y

#
# Native Language Support
#
CONFIG_NLS_DEFAULT="iso8859-1"
CONFIG_NLS_CODEPAGE_437=m
# CONFIG_NLS_CODEPAGE_737 is not set
# CONFIG_NLS_CODEPAGE_775 is not set
# CONFIG_NLS_CODEPAGE_850 is not set
# CONFIG_NLS_CODEPAGE_852 is not set
# CONFIG_NLS_CODEPAGE_855 is not set
# CONFIG_NLS_CODEPAGE_857 is not set
# CONFIG_NLS_CODEPAGE_860 is not set
# CONFIG_NLS_CODEPAGE_861 is not set
# CONFIG_NLS_CODEPAGE_862 is not set
# CONFIG_NLS_CODEPAGE_863 is not set
# CONFIG_NLS_CODEPAGE_864 is not set
# CONFIG_NLS_CODEPAGE_865 is not set
# CONFIG_NLS_CODEPAGE_866 is not set
# CONFIG_NLS_CODEPAGE_869 is not set
# CONFIG_NLS_CODEPAGE_936 is not set
# CONFIG_NLS_CODEPAGE_950 is not set
# CONFIG_NLS_CODEPAGE_932 is not set
# CONFIG_NLS_CODEPAGE_949 is not set
# CONFIG_NLS_CODEPAGE_874 is not set
# CONFIG_NLS_ISO8859_8 is not set
# CONFIG_NLS_CODEPAGE_1250 is not set
# CONFIG_NLS_CODEPAGE_1251 is not set
CONFIG_NLS_ISO8859_1=m
# CONFIG_NLS_ISO8859_2 is not set
# CONFIG_NLS_ISO8859_3 is not set
# CONFIG_NLS_ISO8859_4 is not set
# CONFIG_NLS_ISO8859_5 is not set
# CONFIG_NLS_ISO8859_6 is not set
# CONFIG_NLS_ISO8859_7 is not set
# CONFIG_NLS_ISO8859_9 is not set
# CONFIG_NLS_ISO8859_13 is not set
# CONFIG_NLS_ISO8859_14 is not set
# CONFIG_NLS_ISO8859_15 is not set
# CONFIG_NLS_KOI8_R is not set
# CONFIG_NLS_KOI8_U is not set
# CONFIG_NLS_UTF8 is not set

#
# Security options
#
# CONFIG_SECURITY is not set

#
# Cryptographic options
#
# CONFIG_CRYPTO is not set

#
# Library routines
#
CONFIG_CRC32=m

#
# SCSI support
#
# CONFIG_SCSI is not set

#
# Multi-device support (RAID and LVM)
#
CONFIG_MD=y
# CONFIG_BLK_DEV_MD is not set
CONFIG_BLK_DEV_DM=m
# CONFIG_DM_IOCTL_V4 is not set

#
# Memory Technology Devices (MTD)
#
# CONFIG_MTD is not set

#
# Kernel hacking
#
# CONFIG_DEBUG_SLAB is not set
# CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_INFO is not set