[#4413] fail to apply smp_bf561.patch to kernel trunk
Submitted By: Vivi Li
Open Date
2008-09-09 06:02:11 Close Date
2008-09-10 02:05:44
Priority:
Medium Assignee:
Graf Yang
Status:
Closed Fixed In Release:
N/A
Found In Release:
N/A Release:
Category:
N/A Board:
N/A
Processor:
N/A Silicon Revision:
Is this bug repeatable?:
Yes Resolution:
Fixed
Uboot version or rev.:
Toolchain version or rev.:
App binary format:
N/A
Summary: fail to apply smp_bf561.patch to kernel trunk
Details:
It failed to apply smp_bf561.patch to kernel trunk at files:
linux-2.6.x/include/asm-blackfin/mach-bf561/mem_map.h
linux-2.6.x/arch/blackfin/mm/init.c
--
patching file linux-2.6.x/include/asm-blackfin/cpumask.h
patching file linux-2.6.x/include/asm-blackfin/l1layout.h
patching file linux-2.6.x/include/asm-blackfin/smp.h
patching file linux-2.6.x/include/asm-blackfin/cplbinit.h
patching file linux-2.6.x/include/asm-blackfin/spinlock_types.h
patching file linux-2.6.x/include/asm-blackfin/mach-bf548/mem_map.h
patching file linux-2.6.x/include/asm-blackfin/percpu.h
patching file linux-2.6.x/include/asm-blackfin/bitops.h
patching file linux-2.6.x/include/asm-blackfin/mmu_context.h
Hunk #1 succeeded at 37 with fuzz 2 (offset -2 lines).
Hunk #2 succeeded at 92 (offset -3 lines).
Hunk #3 succeeded at 145 (offset -3 lines).
Hunk #4 succeeded at 173 (offset -3 lines).
Hunk #5 succeeded at 190 (offset -3 lines).
patching file linux-2.6.x/include/asm-blackfin/cacheflush.h
patching file linux-2.6.x/include/asm-blackfin/bfin-global.h
patching file linux-2.6.x/include/asm-blackfin/atomic.h
patching file linux-2.6.x/include/asm-blackfin/bug.h
patching file linux-2.6.x/include/asm-blackfin/cplb-mpu.h
patching file linux-2.6.x/include/asm-blackfin/rwlock.h
patching file linux-2.6.x/include/asm-blackfin/mutex.h
patching file linux-2.6.x/include/asm-blackfin/mach-bf561/mem_map.h
Hunk #2 FAILED at 28.
1 out of 2 hunks FAILED -- saving rejects to file linux-2.6.x/include/asm-blackfin/mach-bf561/mem_map.h.rej
patching file linux-2.6.x/include/asm-blackfin/mach-bf561/smp.h
patching file linux-2.6.x/include/asm-blackfin/mach-bf561/defBF561.h
patching file linux-2.6.x/include/asm-blackfin/pda.h
patching file linux-2.6.x/include/asm-blackfin/mach-bf527/mem_map.h
patching file linux-2.6.x/include/asm-blackfin/mach-common/context.S
patching file linux-2.6.x/include/asm-blackfin/processor.h
patching file linux-2.6.x/include/asm-blackfin/cplb.h
patching file linux-2.6.x/include/asm-blackfin/spinlock.h
patching file linux-2.6.x/include/asm-blackfin/thread_info.h
patching file linux-2.6.x/include/asm-blackfin/system.h
patching file linux-2.6.x/include/asm-blackfin/cpu.h
patching file linux-2.6.x/include/asm-blackfin/mutex-dec.h
patching file linux-2.6.x/include/asm-blackfin/mach-bf533/mem_map.h
patching file linux-2.6.x/include/asm-blackfin/cache.h
patching file linux-2.6.x/include/asm-blackfin/mach-bf537/mem_map.h
patching file linux-2.6.x/arch/blackfin/Kconfig
Hunk #5 succeeded at 702 (offset 2 lines).
Hunk #6 succeeded at 768 (offset 2 lines).
patching file linux-2.6.x/arch/blackfin/kernel/cplb-mpu/cplbinit.c
patching file linux-2.6.x/arch/blackfin/kernel/cplb-mpu/cplbmgr.c
patching file linux-2.6.x/arch/blackfin/kernel/cplb-mpu/cacheinit.c
patching file linux-2.6.x/arch/blackfin/kernel/irqchip.c
patching file linux-2.6.x/arch/blackfin/kernel/setup.c
patching file linux-2.6.x/arch/blackfin/kernel/vmlinux.lds.S
patching file linux-2.6.x/arch/blackfin/kernel/bfin_ksyms.c
patching file linux-2.6.x/arch/blackfin/kernel/process.c
patching file linux-2.6.x/arch/blackfin/kernel/ptrace.c
patching file linux-2.6.x/arch/blackfin/kernel/entry.S
patching file linux-2.6.x/arch/blackfin/kernel/module.c
patching file linux-2.6.x/arch/blackfin/kernel/asm-offsets.c
patching file linux-2.6.x/arch/blackfin/kernel/traps.c
patching file linux-2.6.x/arch/blackfin/kernel/reboot.c
patching file linux-2.6.x/arch/blackfin/kernel/cplb-nompu/cplbinit.c
patching file linux-2.6.x/arch/blackfin/kernel/cplb-nompu/cplbmgr.S
patching file linux-2.6.x/arch/blackfin/kernel/cplb-nompu/cacheinit.c
patching file linux-2.6.x/arch/blackfin/kernel/cplb-nompu/cplbinfo.c
patching file linux-2.6.x/arch/blackfin/mach-common/head.S
patching file linux-2.6.x/arch/blackfin/mach-bf561/Kconfig
patching file linux-2.6.x/arch/blackfin/mach-bf561/smp.c
patching file linux-2.6.x/arch/blackfin/mach-bf561/secondary.S
patching file linux-2.6.x/arch/blackfin/mach-bf561/Makefile
patching file linux-2.6.x/arch/blackfin/mach-bf561/atomic.S
patching file linux-2.6.x/arch/blackfin/mm/init.c
can't find file to patch at input line 4809
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- linux-2.6.x-orig/arch/blackfin/mm/blackfin_sram.c 2008-09-08 11:01:13.000000000 +0800
|+++ linux-2.6.x/arch/blackfin/mm/blackfin_sram.c 2008-09-08 11:02:04.000000000 +0800
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
15 out of 15 hunks ignored
patching file linux-2.6.x/arch/blackfin/mach-common/smp.c
patching file linux-2.6.x/arch/blackfin/mach-common/ints-priority-dc.c
patching file linux-2.6.x/arch/blackfin/mach-common/entry.S
patching file linux-2.6.x/arch/blackfin/mach-common/Makefile
patching file linux-2.6.x/arch/blackfin/kernel/time.c
patching file linux-2.6.x/drivers/char/bfin_simple_timer.c
patching file linux-2.6.x/arch/blackfin/mach-common/cache.S
--
Follow-ups
--- Graf Yang 2008-09-09 07:12:59
Head revision [#7054] have fixed this bug.
--- Vivi Li 2008-09-10 02:05:43
OK now. Close it.
Thanks!
Files
Changes
Commits
Dependencies
Duplicates
Associations
Tags
File Name File Type File Size Posted By
No Files Were Found