Re: [uml-devel] My personal -devel tree snapshotted out on my homepage!

[Ian McDonald <imcdnzl@gmail.com>]

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

Comments below:

On 13/04/05, Blaisorblade <blaisorblade@yahoo.it> wrote:
> On Monday 11 April 2005 01:19, Ian McDonald wrote:
> > With this patch applied to 2.6.11.7 it is my first kernel that
> > compiles straight off :-)
> Ok, that's the -bs tree, not the one I announced here (the -devel one) but
> it's ok anyway.
> > It does not apply one patch because it is already applied which is fine.
> Yes, I merged that, it's the va_copy fix.

Sorry about that...

> > I did a quick test against 2.6.12-rc2 and it didn't like that at all
> > (many rejected patches). That is to be expected though as that is not
> > the target but it does mean a reasonable amount of work ahead for
> > Paolo :-(
> No; luckily, I'm mainly working on -rc2 and I've backported the needed stuff
> to 2.6.11.

Found the development snapshot and found the following problems:
One patch did not apply. Documented in patch.out which is attached.

Problem with arch/um/include/mode_kern.h as below
In file included from arch/um/kernel/exec_kern.c:23:
arch/um/include/mode_kern.h:12: unterminated string or character constant
It doesn't like the #error on gcc 2.95.4 - if I do a remove of this
line it compiles... will need a better fix than this though....

Problem with arch/um/kernel/init_task.c as below
arch/um/kernel/init_task.c:30: duplicate initializer
arch/um/kernel/init_task.c:30: (near initialization for
`init_task.thread.arch.debugregs')
This is probably a duplication in initialisation of struct just like
the problem we had with enum in syscalls and again due to gcc 2.95.4.
I haven't tracked this one down fully yet but can if needed buy may
take a while...

I then hacked half that line out and got further compile errors in
arch/um/kernel/process_kern.c as per attached file err.out. I then
stopped as this looked a little more complicated...

If you need any further information please tell me... I have also
checked that 2.6.12-rc2 without the patch does compile and it does
with the addition of the sed patch.

If you want me to help I can apply the patches one by one but this
will take some time...

Regards,

Ian

[-- Attachment #2: patch.out --]
[-- Type: application/octet-stream, Size: 3727 bytes --]

patching file arch/i386/kernel/entry.S
Hunk #4 succeeded at 665 (offset 9 lines).
patching file arch/i386/kernel/ptrace.c
patching file include/asm-i386/thread_info.h
patching file include/linux/ptrace.h
patching file kernel/fork.c
patching file include/linux/mm.h
patching file include/linux/proc_mm.h
patching file mm/Makefile
patching file mm/mmap.c
patching file mm/mprotect.c
patching file mm/proc_mm.c
patching file arch/um/include/skas_ptrace.h
patching file arch/i386/Kconfig
patching file arch/i386/kernel/ldt.c
patching file arch/i386/kernel/sys_i386.c
patching file include/asm-i386/desc.h
patching file include/asm-i386/ptrace.h
patching file include/asm-i386/mmu_context.h
patching file arch/x86_64/mm/proc_mm.c
patching file include/asm-x86_64/proc_mm.h
patching file arch/x86_64/Kconfig
patching file arch/x86_64/ia32/ptrace32.c
patching file include/asm-x86_64/mmu_context.h
patching file arch/x86_64/ia32/sys_ia32.c
patching file arch/x86_64/kernel/ldt.c
patching file include/asm-x86_64/desc.h
patching file include/asm-x86_64/ptrace.h
patching file arch/x86_64/mm/Makefile
patching file arch/x86_64/kernel/ptrace.c
patching file arch/x86_64/kernel/sys_x86_64.c
Hunk #5 succeeded at 167 (offset 7 lines).
patching file include/asm-i386/proc_mm.h
patching file localversion-skas
patching file include/asm-x86_64/unistd.h
patching file arch/um/sys-x86_64/syscalls.c
patching file include/linux/sched.h
patching file fs/exec.c
patching file Documentation/kbuild/makefiles.txt
patching file scripts/kconfig/zconf.y
patching file arch/um/os-Linux/user_syms.c
patching file arch/um/include/choose-mode.h
patching file include/asm-um/processor-generic.h
patching file arch/um/kernel/process_kern.c
Hunk #3 FAILED at 167.
1 out of 3 hunks FAILED -- saving rejects to file arch/um/kernel/process_kern.c.rej
patching file arch/um/kernel/skas/uaccess.c
patching file include/linux/compiler-gcc2.h
patching file fs/hostfs/hostfs_kern.c
patching file crypto/Kconfig
patching file arch/um/Kconfig_i386
patching file arch/um/Kconfig_x86_64
patching file arch/um/Makefile-i386
patching file arch/um/kernel/Makefile
patching file fs/reiserfs/super.c
patching file arch/um/Makefile
patching file arch/um/sys-i386/util/Makefile
patching file arch/um/util/Makefile
patching file arch/um/include/sysdep-i386/checksum.h
patching file arch/um/sys-i386/ptrace.c
patching file arch/um/kernel/skas/process_kern.c
patching file arch/um/sys-i386/ptrace_user.c
patching file arch/um/include/sysdep-i386/ptrace.h
patching file arch/um/sys-i386/syscalls.c
patching file arch/um/kernel/tt/process_kern.c
patching file arch/um/kernel/syscall_kern.c
patching file arch/um/drivers/line.c
patching file arch/um/include/line.h
patching file arch/um/drivers/ssl.c
patching file arch/um/drivers/stdio_console.c
patching file arch/um/drivers/chan_kern.c
patching file arch/i386/kernel/syscall_table.S
patching file arch/um/include/sysdep-i386/syscalls.h
patching file arch/um/include/sysdep-x86_64/syscalls.h
patching file arch/um/kernel/sys_call_table.c
patching file arch/um/sys-i386/Makefile
patching file arch/um/sys-i386/sys_call_table.S
patching file arch/um/sys-x86_64/Makefile
patching file arch/um/sys-x86_64/syscall_table.c
patching file arch/um/kernel/ptrace.c
patching file arch/um/sys-i386/ldt.c
patching file include/asm-um/ldt.h
patching file include/asm-um/processor-i386.h
patching file include/asm-um/ptrace-i386.h
patching file include/asm-um/segment.h
patching file include/asm-um/desc.h
patching file arch/um/sys-i386/tls.c
patching file arch/um/include/kern_util.h
patching file arch/um/include/mode_kern.h
patching file arch/um/kernel/time.c
patching file arch/um/kernel/time_kern.c
patching file arch/um/include/time_user.h


[-- Attachment #3: err.out --]
[-- Type: application/octet-stream, Size: 544 bytes --]

arch/um/kernel/process_kern.c:168: redefinition of `prepare_to_copy'
include/asm/processor-generic.h:98: `prepare_to_copy' previously defined here
arch/um/kernel/process_kern.c: In function `copy_thread':
arch/um/kernel/process_kern.c:175: duplicate initializer
arch/um/kernel/process_kern.c:175: (near initialization for `(anonymous).arch.debugregs')
arch/um/kernel/process_kern.c: At top level:
arch/um/kernel/process_kern.c:181: redefinition of `initial_thread_cb'
arch/um/include/kern_util.h:16: `initial_thread_cb' previously defined here