[ELDK] xenomai and adeos patch

yigit agabey yagabey at gmail.com
Mon Nov 2 08:36:30 CET 2009


Hello, i am trying to patch linux 2.6.24.6 snapshot from Denx's public GIT
to be able to use Xenomai. After applying the patch:

$xenomai_root/scripts/prepare-kernel.sh --arch=powerpc
--adeos=$xenomai_root/ksrc/arch/powerpc/patches/adeos-ipipe-2.6.24.6-powerpc-DENX-2.4-03.patch
--linux=$linux_tree

I get some patching errors. The output is:

patching file Makefile
patching file arch/powerpc/Kconfig
patching file arch/powerpc/boot/Makefile
patching file arch/powerpc/kernel/Makefile
patching file arch/powerpc/kernel/asm-offsets.c
Hunk #1 succeeded at 117 (offset -1 lines).
Hunk #2 succeeded at 246 (offset -1 lines).
patching file arch/powerpc/kernel/cputable.c
Hunk #1 succeeded at 1412 (offset 68 lines).
Hunk #2 succeeded at 1459 (offset 68 lines).
patching file arch/powerpc/kernel/entry_32.S
patching file arch/powerpc/kernel/entry_64.S
Hunk #7 succeeded at 525 (offset 4 lines).
Hunk #8 succeeded at 545 (offset 4 lines).
Hunk #9 succeeded at 583 (offset 4 lines).
Hunk #10 succeeded at 594 (offset 4 lines).
Hunk #11 succeeded at 603 (offset 4 lines).
Hunk #12 succeeded at 688 (offset 4 lines).
Hunk #13 succeeded at 722 (offset 4 lines).
Hunk #14 succeeded at 792 (offset 4 lines).
patching file arch/powerpc/kernel/head_32.S
patching file arch/powerpc/kernel/head_40x.S
patching file arch/powerpc/kernel/head_44x.S
patching file arch/powerpc/kernel/head_64.S
Hunk #2 succeeded at 310 (offset 22 lines).
Hunk #3 succeeded at 327 (offset 22 lines).
Hunk #4 succeeded at 402 (offset 22 lines).
Hunk #5 succeeded at 480 (offset 22 lines).
Hunk #6 succeeded at 625 (offset 22 lines).
Hunk #7 succeeded at 690 (offset 22 lines).
Hunk #8 succeeded at 700 (offset 22 lines).
Hunk #9 succeeded at 740 (offset 22 lines).
Hunk #10 succeeded at 751 (offset 22 lines).
Hunk #11 succeeded at 763 (offset 22 lines).
Hunk #12 succeeded at 780 (offset 22 lines).
Hunk #13 succeeded at 933 (offset 22 lines).
Hunk #14 succeeded at 1480 (offset 47 lines).
Hunk #15 succeeded at 1607 (offset 47 lines).
Hunk #16 succeeded at 1618 (offset 47 lines).
patching file arch/powerpc/kernel/head_8xx.S
patching file arch/powerpc/kernel/head_booke.h
patching file arch/powerpc/kernel/head_fsl_booke.S
patching file arch/powerpc/kernel/idle.c
patching file arch/powerpc/kernel/idle_power4.S
patching file arch/powerpc/kernel/io.c
patching file arch/powerpc/kernel/ipipe.c
patching file arch/powerpc/kernel/irq.c
patching file arch/powerpc/kernel/mcount_32.S
patching file arch/powerpc/kernel/mcount_64.S
patching file arch/powerpc/kernel/ppc_ksyms.c
patching file arch/powerpc/kernel/process.c
Hunk #1 succeeded at 351 (offset 4 lines).
Hunk #2 succeeded at 373 with fuzz 2 (offset 18 lines).
Hunk #3 succeeded at 1033 (offset 18 lines).
patching file arch/powerpc/kernel/setup_32.c
patching file arch/powerpc/kernel/setup_64.c
patching file arch/powerpc/kernel/smp.c
patching file arch/powerpc/kernel/time.c
Hunk #2 FAILED at 564.
Hunk #3 succeeded at 623 (offset 8 lines).
1 out of 3 hunks FAILED -- saving rejects to file
arch/powerpc/kernel/time.c.rej
patching file arch/powerpc/kernel/traps.c
patching file arch/powerpc/mm/fault.c
patching file arch/powerpc/mm/hash_native_64.c
Hunk #1 succeeded at 137 (offset 4 lines).
Hunk #2 succeeded at 146 (offset 4 lines).
Hunk #3 succeeded at 160 with fuzz 2 (offset 4 lines).
Hunk #4 succeeded at 188 (offset 10 lines).
Hunk #5 succeeded at 200 (offset 10 lines).
Hunk #6 succeeded at 227 (offset 10 lines).
Hunk #7 succeeded at 245 (offset 10 lines).
Hunk #8 succeeded at 253 (offset 10 lines).
Hunk #9 succeeded at 271 (offset 10 lines).
Hunk #10 succeeded at 343 (offset 10 lines).
patching file arch/powerpc/mm/hash_utils_64.c
patching file arch/powerpc/mm/slb.c
Hunk #3 succeeded at 157 (offset 10 lines).
patching file arch/powerpc/platforms/cell/spu_base.c
patching file arch/powerpc/platforms/iseries/irq.c
patching file arch/powerpc/platforms/powermac/pic.c
patching file arch/powerpc/platforms/ps3/htab.c
patching file arch/powerpc/platforms/ps3/interrupt.c
patching file arch/powerpc/platforms/pseries/lpar.c
patching file arch/powerpc/sysdev/cpm2_pic.c
patching file arch/powerpc/sysdev/i8259.c
patching file arch/powerpc/sysdev/ipic.c
Hunk #1 FAILED at 31.
1 out of 1 hunk FAILED -- saving rejects to file
arch/powerpc/sysdev/ipic.c.rej
patching file arch/powerpc/sysdev/mpic.c
Hunk #2 succeeded at 649 (offset 16 lines).
Hunk #3 succeeded at 661 (offset 16 lines).
Hunk #4 succeeded at 684 (offset 16 lines).
Hunk #5 succeeded at 717 (offset 16 lines).
Hunk #6 succeeded at 729 (offset 16 lines).
Hunk #7 succeeded at 767 (offset 16 lines).
Hunk #8 succeeded at 790 (offset 16 lines).
Hunk #9 succeeded at 859 (offset 16 lines).
Hunk #10 succeeded at 884 (offset 16 lines).
Hunk #11 succeeded at 893 (offset 16 lines).
Hunk #12 succeeded at 1522 (offset 28 lines).
Hunk #13 succeeded at 1538 (offset 28 lines).
Hunk #14 succeeded at 1552 (offset 28 lines).
patching file arch/powerpc/sysdev/qe_lib/qe_ic.c
patching file arch/powerpc/sysdev/tsi108_pci.c
patching file arch/powerpc/sysdev/uic.c
patching file arch/ppc/Kconfig
Hunk #1 succeeded at 1003 (offset 32 lines).
patching file arch/ppc/boot/Makefile
patching file arch/ppc/kernel/entry.S
patching file arch/ppc/kernel/head.S
patching file arch/ppc/kernel/head_44x.S
Hunk #1 succeeded at 427 (offset 11 lines).
patching file arch/ppc/kernel/head_4xx.S
patching file arch/ppc/kernel/head_8xx.S
patching file arch/ppc/kernel/head_booke.h
Hunk #1 succeeded at 190 (offset 3 lines).
Hunk #2 succeeded at 354 (offset 3 lines).
Hunk #3 succeeded at 370 (offset 3 lines).
patching file arch/ppc/kernel/head_fsl_booke.S
patching file arch/ppc/kernel/ppc_ksyms.c
patching file arch/ppc/kernel/setup.c
patching file arch/ppc/kernel/time.c
patching file arch/ppc/kernel/traps.c
patching file arch/ppc/mm/fault.c
patching file arch/ppc/syslib/cpm2_pic.c
patching file arch/ppc/syslib/ipic.c
patching file arch/ppc/syslib/open_pic.c
patching file arch/ppc/syslib/ppc4xx_pic.c
Hunk #3 succeeded at 320 (offset 30 lines).
patching file drivers/pci/htirq.c
patching file include/asm-powerpc/exception.h
patching file include/asm-powerpc/hw_irq.h
patching file include/asm-powerpc/ipipe.h
patching file include/asm-powerpc/ipipe_base.h
patching file include/asm-powerpc/mmu_context.h
patching file include/asm-powerpc/mpic.h
patching file include/asm-powerpc/paca.h
patching file include/asm-powerpc/ptrace.h
patching file include/asm-powerpc/qe_ic.h
patching file include/asm-powerpc/reg.h
Hunk #1 succeeded at 759 (offset 3 lines).
patching file include/asm-powerpc/thread_info.h
Hunk #1 succeeded at 143 (offset 19 lines).
Hunk #2 succeeded at 163 (offset 19 lines).
patching file include/asm-powerpc/time.h
patching file include/asm-ppc/ipipe.h
patching file include/asm-ppc/ipipe_base.h
patching file include/asm-ppc/mmu_context.h
patching file include/asm-ppc/time.h
patching file include/linux/hardirq.h
patching file include/linux/ipipe.h
patching file include/linux/ipipe_base.h
patching file include/linux/ipipe_compat.h
patching file include/linux/ipipe_percpu.h
patching file include/linux/ipipe_tickdev.h
patching file include/linux/ipipe_trace.h
patching file include/linux/irq.h
patching file include/linux/kernel.h
patching file include/linux/linkage.h
patching file include/linux/mm.h
patching file include/linux/preempt.h
patching file include/linux/sched.h
Hunk #4 succeeded at 1186 (offset 4 lines).
Hunk #5 succeeded at 1406 (offset 4 lines).
patching file include/linux/spinlock.h
patching file include/linux/spinlock_types.h
patching file init/Kconfig
patching file init/main.c
Hunk #1 succeeded at 520 (offset 1 line).
Hunk #2 succeeded at 576 (offset 4 lines).
Hunk #3 succeeded at 742 (offset 4 lines).
patching file kernel/Makefile
patching file kernel/exit.c
patching file kernel/fork.c
Hunk #1 succeeded at 428 (offset 25 lines).
Hunk #2 succeeded at 964 (offset 25 lines).
Hunk #3 succeeded at 1338 (offset 25 lines).
patching file kernel/ipipe/Kconfig
patching file kernel/ipipe/Kconfig.debug
patching file kernel/ipipe/Makefile
patching file kernel/ipipe/core.c
patching file kernel/ipipe/tracer.c
patching file kernel/irq/chip.c
patching file kernel/irq/handle.c
patching file kernel/lockdep.c
patching file kernel/panic.c
patching file kernel/power/disk.c
patching file kernel/power/swsusp.c
patching file kernel/printk.c
Hunk #1 succeeded at 694 (offset 104 lines).
Hunk #2 succeeded at 754 (offset 104 lines).
Hunk #3 succeeded at 820 (offset 104 lines).
patching file kernel/sched.c
patching file kernel/signal.c
patching file kernel/spinlock.c
patching file kernel/time/tick-common.c
patching file kernel/time/tick-sched.c
patching file kernel/timeconst.h
patching file kernel/timer.c
patching file lib/Kconfig.debug
patching file lib/bust_spinlocks.c
patching file lib/ioremap.c
patching file lib/smp_processor_id.c
patching file lib/spinlock_debug.c
patching file mm/memory.c
patching file mm/mlock.c
patching file mm/vmalloc.c
prepare-kernel.sh: Unable to patch kernel 2.6.24.6 with
adeos-ipipe-2.6.24.6-powerpc-DENX-2.4-03.patch.

What is wrong with the patching procedure? Should i use a different kernel
tree?

Regards,
Yigit Agabeyli


More information about the eldk mailing list