Re: [uml-devel] Re: Ho ho ho.. Linux 2.6.15-rc7

[Blaisorblade <blaisorblade@yahoo.it>]

[-- Attachment #1: Type: text/plain, Size: 1205 bytes --]

On Tuesday 27 December 2005 18:48, Antoine Martin wrote:
> > On 12/25/05, Linus Torvalds <torvalds@osdl.org> wrote:
> > > Please do give it a try, and if you have any issues/regressions,
> >
> > send out
> >
> > > a note (even if you sent one earlier) so that we don't forget about
> >
> > it.
> >
> > Hmm. Somebody broke UML compile for my config again...

Please test the attached patch, worksForMe now.

> Are you sure that you are using a raw 2.6.15-rc7?
He has disabled SKAS, which is causing this - however the breakage doesn't 
seem new into 2.6.15-rc7.

> AFAIK, no new UML patches made it into rc7, and mostly fixes since rc1
> (as required) I think I've had a similar issue before - can't remember
> (searching the archives may help), have you tried this:
> find . -size 0 -exec rm {} \;
> As some of the patches may leave empty files behind.

Luckily that doesn't happen for kernel.org patches, mostly... it's more common 
on incremental patches. The problem is that sometimes they get merged.
-- 
Inform me of my mistakes, so I can keep imitating Homer Simpson's "Doh!".
Paolo Giarrusso, aka Blaisorblade (Skype ID "PaoloGiarrusso", ICQ 215621894)
http://www.user-mode-linux.org/~blaisorblade

[-- Attachment #2: uml-skas0-only-for-skas --]
[-- Type: text/x-diff, Size: 1355 bytes --]

Index: linux-2.6.git/arch/um/sys-i386/Makefile
===================================================================
--- linux-2.6.git.orig/arch/um/sys-i386/Makefile
+++ linux-2.6.git/arch/um/sys-i386/Makefile
@@ -1,6 +1,8 @@
-obj-y = bitops.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \
-	ptrace_user.o semaphore.o signal.o sigcontext.o stub.o stub_segv.o \
-	syscalls.o sysrq.o sys_call_table.o
+obj-y := bitops.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \
+	ptrace_user.o semaphore.o signal.o sigcontext.o syscalls.o sysrq.o \
+	sys_call_table.o
+
+obj-$(CONFIG_MODE_SKAS) += stub.o stub_segv.o
 
 obj-$(CONFIG_HIGHMEM) += highmem.o
 obj-$(CONFIG_MODULES) += module.o
Index: linux-2.6.git/arch/um/sys-x86_64/Makefile
===================================================================
--- linux-2.6.git.orig/arch/um/sys-x86_64/Makefile
+++ linux-2.6.git/arch/um/sys-x86_64/Makefile
@@ -6,8 +6,9 @@
 
 #XXX: why into lib-y?
 lib-y = bitops.o bugs.o csum-partial.o delay.o fault.o ldt.o mem.o memcpy.o \
-	ptrace.o ptrace_user.o sigcontext.o signal.o stub.o \
-	stub_segv.o syscalls.o syscall_table.o sysrq.o thunk.o
+	ptrace.o ptrace_user.o sigcontext.o signal.o syscalls.o \
+	syscall_table.o sysrq.o thunk.o
+lib-$(CONFIG_MODE_SKAS) += stub.o stub_segv.o
 
 obj-y := ksyms.o
 obj-$(CONFIG_MODULES) += module.o um_module.o