FAQ: [#6385] can not apply xenomai patch to latest trunk(2010)

Document created by Aaronwu Employee on Sep 11, 2013
Version 1Show Document
  • View in full screen mode

[#6385] can not apply xenomai patch to latest trunk

Submitted By: Vivi Li

Open Date

2010-11-29 05:31:13    

Priority:

Medium     Assignee:

Aaron Wu

Status:

Open     Fixed In Release:

N/A

Found In Release:

2011R1     Release:

Category:

N/A     Board:

N/A

Processor:

ALL     Silicon Revision:

Is this bug repeatable?:

Yes     Resolution:

Assigned (Not Start)

Uboot version or rev.:

    Toolchain version or rev.:

trunk-gcc4.3-svn5013

App binary format:

N/A     

Summary: can not apply xenomai patch to latest trunk

Details:

 

Can not apply xenomai patch to latest trunk.

 

Bellow is the log:

--

        xenomai-2.5.3/scripts/prepare-kernel.sh --arch=blackfin --adeos=/home/test/work/cruise/checkouts/uclinux-dist/bfin_patch/adeos_patch/adeos-bfin.patch --linux=/home/test/work/cruise/checkouts/uclinux-dist/linux-2.6.x --outpatch=xeno_patch  ./temp_patch ; \

        patch -d /home/test/work/cruise/checkouts/uclinux-dist/linux-2.6.x --dry-run -N -p1 < xeno_patch  ; \

        patch -d /home/test/work/cruise/checkouts/uclinux-dist/linux-2.6.x -N -p1 < xeno_patch

patching file arch/blackfin/Kconfig

Hunk #1 succeeded at 87 (offset 3 lines).

patching file arch/blackfin/include/asm/ipipe.h

patching file arch/blackfin/include/asm/ipipe_base.h

patching file arch/blackfin/include/asm/irqflags.h

Hunk #1 succeeded at 33 (offset -1 lines).

Hunk #2 succeeded at 58 (offset -1 lines).

Hunk #3 succeeded at 66 (offset -1 lines).

Hunk #4 succeeded at 87 (offset -1 lines).

patching file arch/blackfin/kernel/ipipe.c

patching file arch/blackfin/mach-common/ints-priority.c

Hunk #2 succeeded at 538 (offset 4 lines).

Hunk #3 succeeded at 1374 (offset -3 lines).

Hunk #4 succeeded at 1433 (offset -3 lines).

patching file drivers/pci/htirq.c

patching file drivers/serial/8250.c

Hunk #1 succeeded at 3067 (offset 16 lines).

patching file fs/exec.c

Hunk #1 succeeded at 734 (offset 20 lines).

Hunk #2 succeeded at 758 (offset 20 lines).

patching file fs/proc/array.c

patching file include/asm-generic/atomic.h

Hunk #1 FAILED at 60.

Hunk #2 FAILED at 82.

Hunk #3 FAILED at 139.

3 out of 3 hunks FAILED -- saving rejects to file include/asm-generic/atomic.h.rej

patching file include/asm-generic/bitops/atomic.h

patching file include/asm-generic/cmpxchg-local.h

patching file include/asm-generic/percpu.h

Hunk #2 FAILED at 87.

1 out of 2 hunks FAILED -- saving rejects to file include/asm-generic/percpu.h.rej

patching file include/linux/hardirq.h

patching file include/linux/ipipe.h

patching file include/linux/ipipe_base.h

patching file include/linux/ipipe_lock.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

Hunk #3 succeeded at 356 (offset 1 line).

Hunk #4 succeeded at 371 (offset 1 line).

patching file include/linux/kernel.h

Hunk #1 succeeded at 16 (offset 2 lines).

Hunk #2 succeeded at 131 (offset 2 lines).

patching file include/linux/preempt.h

patching file include/linux/rwlock.h

patching file include/linux/rwlock_api_smp.h

patching file include/linux/sched.h

Hunk #2 succeeded at 192 (offset -1 lines).

Hunk #3 succeeded at 314 with fuzz 1 (offset -4 lines).

Hunk #4 succeeded at 370 (offset -8 lines).

Hunk #5 succeeded at 446 (offset -8 lines).

Hunk #6 succeeded at 1462 (offset -11 lines).

Hunk #7 FAILED at 1712.

Hunk #8 succeeded at 1746 (offset -10 lines).

1 out of 8 hunks FAILED -- saving rejects to file include/linux/sched.h.rej

patching file include/linux/spinlock.h

patching file include/linux/spinlock_api_smp.h

patching file include/linux/spinlock_up.h

patching file init/Kconfig

Hunk #1 succeeded at 86 (offset 8 lines).

patching file init/main.c

Hunk #1 succeeded at 554 (offset 8 lines).

Hunk #2 succeeded at 617 (offset 7 lines).

Hunk #3 succeeded at 802 (offset 7 lines).

patching file kernel/Makefile

Hunk #1 succeeded at 88 (offset 2 lines).

patching file kernel/exit.c

Hunk #1 succeeded at 969 (offset -8 lines).

patching file kernel/fork.c

Hunk #1 succeeded at 540 (offset 16 lines).

Hunk #2 FAILED at 917.

Hunk #3 succeeded at 1288 (offset 9 lines).

Hunk #4 succeeded at 1694 (offset 13 lines).

1 out of 4 hunks FAILED -- saving rejects to file kernel/fork.c.rej

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

Hunk #1 succeeded at 457 (offset -3 lines).

Hunk #2 succeeded at 471 (offset -3 lines).

patching file kernel/lockdep.c

Hunk #1 succeeded at 2322 (offset 5 lines).

Hunk #2 succeeded at 2365 (offset 5 lines).

Hunk #3 succeeded at 2397 (offset 5 lines).

Hunk #4 succeeded at 2431 (offset 5 lines).

patching file kernel/panic.c

Hunk #1 succeeded at 23 with fuzz 2.

Hunk #2 succeeded at 319 (offset -3 lines).

patching file kernel/power/hibernate.c

Hunk #2 succeeded at 301 (offset 2 lines).

Hunk #3 succeeded at 397 (offset 2 lines).

Hunk #4 succeeded at 429 (offset 2 lines).

Hunk #5 succeeded at 516 with fuzz 2 (offset 2 lines).

patching file kernel/printk.c

Hunk #1 succeeded at 578 (offset 19 lines).

Hunk #2 succeeded at 637 (offset 19 lines).

Hunk #3 succeeded at 713 (offset 27 lines).

patching file kernel/sched.c

Hunk #1 FAILED at 2380.

Hunk #2 succeeded at 2823 (offset -73 lines).

Hunk #3 succeeded at 2873 (offset -73 lines).

Hunk #4 succeeded at 3614 (offset 51 lines).

Hunk #5 succeeded at 3637 (offset 51 lines).

Hunk #6 succeeded at 3686 (offset 51 lines).

Hunk #7 succeeded at 3749 (offset 37 lines).

Hunk #8 FAILED at 3763.

Hunk #9 FAILED at 3803.

Hunk #10 succeeded at 3839 (offset 49 lines).

Hunk #11 FAILED at 3924.

Hunk #12 succeeded at 4714 (offset 73 lines).

Hunk #13 succeeded at 5371 (offset 73 lines).

Hunk #14 succeeded at 9209 (offset -25 lines).

4 out of 14 hunks FAILED -- saving rejects to file kernel/sched.c.rej

patching file kernel/signal.c

patching file kernel/spinlock.c

patching file kernel/time/tick-common.c

patching file kernel/time/tick-sched.c

Hunk #1 succeeded at 598 (offset 47 lines).

Hunk #2 succeeded at 758 (offset 47 lines).

patching file kernel/timer.c

Hunk #1 succeeded at 1284 (offset 79 lines).

patching file kernel/trace/ftrace.c

Hunk #2 succeeded at 1158 (offset 29 lines).

Hunk #3 succeeded at 1168 (offset 29 lines).

Hunk #4 succeeded at 2693 (offset 30 lines).

Hunk #5 succeeded at 2774 (offset 30 lines).

patching file lib/Kconfig.debug

Hunk #1 succeeded at 136 (offset -1 lines).

patching file lib/bust_spinlocks.c

patching file lib/ioremap.c

patching file lib/smp_processor_id.c

patching file mm/memory.c

Hunk #1 succeeded at 640 (offset -2 lines).

Hunk #2 succeeded at 674 (offset -2 lines).

Hunk #3 succeeded at 718 (offset -2 lines).

Hunk #4 succeeded at 770 (offset -2 lines).

Hunk #5 succeeded at 813 (offset -2 lines).

Hunk #6 succeeded at 2132 (offset 16 lines).

Hunk #7 succeeded at 3635 (offset 88 lines).

patching file mm/mmu_context.c

patching file mm/vmalloc.c

Hunk #1 succeeded at 173 (offset 1 line).

prepare-kernel.sh: Unable to patch kernel 2.6.36.1 with adeos-bfin.patch.

make[3]: *** [xeno_patch] Error 2

--

 

Follow-ups

 

--- Aaron Wu                                                 2010-11-30 20:52:37

Have updated the adeos patch on trunk

 

--- Vivi Li                                                  2010-12-03 03:38:07

Still failed to patch.

 

--- Aaron Wu                                                 2010-12-10 00:32:09

wait for the xenomai patch for blackfin from xenomai official website for kernel

2.6.36

 

 

 

    Files

    Changes

    Commits

    Dependencies

    Duplicates

    Associations

    Tags

 

File Name     File Type     File Size     Posted By

No Files Were Found

Attachments

    Outcomes