Re: [Patch] Fix UML broken (was Re: User Mode Linux still broken in 2.6.23.1)

Previous thread: patch, reboot fixup for WRAP 2C board (SC1100 based) by Denys on Saturday, November 3, 2007 - 10:42 pm. (1 message)

Next thread: [PATCH] Fix i2c module parameter permissions for read/write by Jon Smirl on Sunday, November 4, 2007 - 12:55 am. (4 messages)
To: <linux-kernel@...>
Cc: Jeff Dike <jdike@...>, <akpm@...>, Greg KH <greg@...>, Chris Wright <chrisw@...>
Date: Sunday, November 4, 2007 - 12:51 am

Building with the attached .config on x86-64, it does this:

CC arch/um/kernel/smp.o
In file included from include/asm/arch/tlb.h:11,
from include/asm/tlb.h:4,
from arch/um/kernel/smp.c:8:
include/asm-generic/tlb.h: In function

To: Rob Landley <rob@...>
Cc: <linux-kernel@...>, Jeff Dike <jdike@...>, <akpm@...>, Chris Wright <chrisw@...>
Date: Wednesday, November 14, 2007 - 2:54 pm

I think the patches that I have just added to the stable queue for
2.6.23.2 will fix this. If not, please let me know after testing.

thanks,

greg k-h
-

To: Greg KH <greg@...>
Cc: <linux-kernel@...>, Jeff Dike <jdike@...>, <akpm@...>, Chris Wright <chrisw@...>
Date: Thursday, November 15, 2007 - 1:58 am

Where do I find these patches to test? I know where to find the stable
releases, but not the "stable queue".

Documentation/stable_kernel_rules.txt just says there _is_ a stable queue, not
where to access it. Google's first hit for "linux stable queue" was
http://git.kernel.org/?p=linux/kernel/git/chrisw/stable-queue.git;a=shor...
which apparently stopped updating in march...

Happy to test the patch you mentioned, if I can figure out where to find it...

Thanks,

Rob
--
"One of my most productive days was throwing away 1000 lines of code."
- Ken Thompson.
-

To: Rob Landley <rob@...>
Cc: <linux-kernel@...>, Jeff Dike <jdike@...>, <akpm@...>, Chris Wright <chrisw@...>
Date: Thursday, November 15, 2007 - 2:02 am

It's at:
http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git;a=summary

Chris and I used to have separate queues, but that got messy, I suppose
we should just delete those old copies...

thanks,

greg k-h
-

To: Greg KH <greg@...>
Cc: <linux-kernel@...>, Jeff Dike <jdike@...>, <akpm@...>, Chris Wright <chrisw@...>
Date: Thursday, November 15, 2007 - 4:57 pm

In a freshly extracted 2.6.23 tarball, I applied the 4 uml-*.patch files from
stable-queue/review-2.6.23-2 in sequence (all applied cleanly), and then did
the following:

cat > mini.conf << EOF &&
CONFIG_BINFMT_ELF=y
CONFIG_HOSTFS=y
CONFIG_LBD=y
CONFIG_BLK_DEV=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_STDERR_CONSOLE=y
CONFIG_UNIX98_PTYS=y
CONFIG_EXT2_FS=y
EOF
make ARCH=um allnoconfig KCONFIG_ALLCONFIG=mini.conf

Then I did:

make -j 2 ARCH=um

And it still breaks:

CC arch/um/kernel/smp.o
In file included from include/asm/arch/tlb.h:11,
from include/asm/tlb.h:4,
from arch/um/kernel/smp.c:8:
include/asm-generic/tlb.h: In function

To: Rob Landley <rob@...>
Cc: <linux-kernel@...>, Jeff Dike <jdike@...>, <akpm@...>, Chris Wright <chrisw@...>
Date: Thursday, November 15, 2007 - 5:06 pm

Hm, not good. I'll let Jeff handle this :)

thanks,

greg k-h
-

To: Greg KH <greg@...>
Cc: Rob Landley <rob@...>, <linux-kernel@...>, Jeff Dike <jdike@...>, <akpm@...>, Chris Wright <chrisw@...>
Date: Thursday, November 15, 2007 - 11:08 pm

Could you please try this patch? Can it fix the error?

Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>

---

diff --git a/Makefile b/Makefile
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 4f3838a..2c3ce4c 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -6,6 +6,7 @@
#include <linux/mmzone.h>
#include <linux/list.h>
#include <linux/sched.h>
+#include <linux/pagemap.h>

#include <asm/atomic.h>
#include <asm/page.h>
-

To: WANG Cong <xiyou.wangcong@...>
Cc: Greg KH <greg@...>, Rob Landley <rob@...>, <linux-kernel@...>, <akpm@...>, Chris Wright <chrisw@...>
Date: Friday, November 16, 2007 - 11:12 am

If you look further down the file, you see a comment to the effect that this
will break sparc.

Jeff

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

To: Jeff Dike <jdike@...>
Cc: WANG Cong <xiyou.wangcong@...>, Greg KH <greg@...>, Rob Landley <rob@...>, <linux-kernel@...>, <akpm@...>, Chris Wright <chrisw@...>
Date: Friday, November 16, 2007 - 11:26 am

Sorry, I didn't know that. ;(

-

To: WANG Cong <xiyou.wangcong@...>
Cc: Greg KH <greg@...>, <linux-kernel@...>, Jeff Dike <jdike@...>, <akpm@...>, Chris Wright <chrisw@...>
Date: Friday, November 16, 2007 - 1:01 am

Oh what a good idea.

Signed-off-by: Rob Landley <rob@landley.net>

Rob
--
"One of my most productive days was throwing away 1000 lines of code."
- Ken Thompson.
-

To: Rob Landley <rob@...>
Cc: WANG Cong <xiyou.wangcong@...>, <linux-kernel@...>, Jeff Dike <jdike@...>, <akpm@...>, Chris Wright <chrisw@...>
Date: Friday, November 16, 2007 - 3:15 am

Heh, we came full circle here, this was Rob's original patch :)

Rob, I'll queue this up for the next cycle, now that you've verified
that it was not fixed already, thanks for testing.

greg k-h
-

To: Greg KH <greg@...>
Cc: WANG Cong <xiyou.wangcong@...>, <linux-kernel@...>, Jeff Dike <jdike@...>, <akpm@...>, Chris Wright <chrisw@...>
Date: Friday, November 16, 2007 - 2:00 pm

/me pleads the fifth.

Rob
--
"One of my most productive days was throwing away 1000 lines of code."
- Ken Thompson.
-

To: Greg KH <greg@...>
Cc: Rob Landley <rob@...>, WANG Cong <xiyou.wangcong@...>, <linux-kernel@...>, <akpm@...>, Chris Wright <chrisw@...>
Date: Friday, November 16, 2007 - 11:51 am

I wouldn't.

sparc includes swap.h in its pgtable.h. Adding pagemap.h to swap.h
completes an include loop on sparc which blows up its build.

I have a set of patches to fix this in a different way, which I sent
out for comments a few weeks ago. They
add uaccess.h to various futexes.h because these will start
failing to build when the next patch is applied
break the recursion by removing highmem.h from pagemap.h,
which needs nothing related to highmem, and sprinkle includes of
highmem.h in all the files which formerly got it through pagemap.h
now, pagemap.h can be added to swap.h without blowing up sparc
also, the other arches can include swap.h in their pgtables.h,
which they probably should since they define operations on
swp_entry_t, which is defined in swap.h.

Jeff

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

-

To: Jeff Dike <jdike@...>
Cc: Greg KH <greg@...>, WANG Cong <xiyou.wangcong@...>, <linux-kernel@...>, <akpm@...>, Chris Wright <chrisw@...>
Date: Friday, November 16, 2007 - 6:00 pm

I wasn't cc'd, and missed it. I'd like to test this, do you have a link? (Or
a bit more specificity than "a few weeks ago"?)

Rob
--
"One of my most productive days was throwing away 1000 lines of code."
- Ken Thompson.
-

To: Rob Landley <rob@...>
Cc: Greg KH <greg@...>, WANG Cong <xiyou.wangcong@...>, <linux-kernel@...>, <akpm@...>, Chris Wright <chrisw@...>
Date: Saturday, November 17, 2007 - 2:53 pm

To: Jeff Dike <jdike@...>
Cc: Greg KH <greg@...>, WANG Cong <xiyou.wangcong@...>, <linux-kernel@...>, <akpm@...>, Chris Wright <chrisw@...>
Date: Sunday, November 18, 2007 - 4:17 pm

Doesn't apply to vanilla 2.6.23, it can't find two files and a couple other
hunks failed.

Rob
--
"One of my most productive days was throwing away 1000 lines of code."
- Ken Thompson.
-

To: Rob Landley <rob@...>
Cc: Jeff Dike <jdike@...>, Greg KH <greg@...>, WANG Cong <xiyou.wangcong@...>, <linux-kernel@...>, <akpm@...>, Chris Wright <chrisw@...>
Date: Sunday, November 18, 2007 - 5:32 pm

Took me one minute to locate PATCH 1 + 2:
http://marc.info/?l=linux-arch&m=119342916429513&w=2
http://marc.info/?l=linux-arch&m=119342916229500&w=2

Maybe this helps you.

Sam
-

To: Sam Ravnborg <sam@...>
Cc: Jeff Dike <jdike@...>, Greg KH <greg@...>, WANG Cong <xiyou.wangcong@...>, <linux-kernel@...>, <akpm@...>, Chris Wright <chrisw@...>
Date: Monday, November 19, 2007 - 3:14 am

Same problem as previous message: they don't apply to 2.6.23. (I tried both
2.6.23 and 2.6.23.8, just to be sure.)

I don't suppose putting #ifndef guards around whatever sparc.h file hasn't got
them is a reasonable hack to get this worked around during 2.6.23.x?

Rob
--
"One of my most productive days was throwing away 1000 lines of code."
- Ken Thompson.
-

To: Jeff Dike <jdike@...>
Cc: Rob Landley <rob@...>, WANG Cong <xiyou.wangcong@...>, <linux-kernel@...>, <akpm@...>, Chris Wright <chrisw@...>
Date: Friday, November 16, 2007 - 12:53 pm

Ok, nevermind, I'll drop it from my to-add queue :)

thanks for letting me know.

greg k-h
-

Previous thread: patch, reboot fixup for WRAP 2C board (SC1100 based) by Denys on Saturday, November 3, 2007 - 10:42 pm. (1 message)

Next thread: [PATCH] Fix i2c module parameter permissions for read/write by Jon Smirl on Sunday, November 4, 2007 - 12:55 am. (4 messages)