[Voyage-linux] Trouble Patching Voyager 2.6.23 with RTAI...

[Nick T. Ton]

Hi Everyone,

Following Punky and Sean's suggestions, I downloaded the Voyage Linux Source 2.6.23 distribution and tried to patch it with rtai.3.6.1 i386. It's failing to patch sched.h and sched.c. So of course when I compile, it fails to define the correct flags for TASK_NOWAKEUP and TASK_ATOMICSWITCH. I can't simply add these definitions because it then failed at line 1967 on a pointer to task_struct. Does anyone have any suggestion on how to resolve this compile error? 

On a separate effort, I also downloaded the linux source 2.6.24 (no Voyage) and used rtai.3.6.1 x86 to patch. This works. I was able to run make-kpkg and got .deb files. But I assume this was not usable for the Voyage Linux installation script. Is this true? 

I have include the patch log for details of the problem:
patching file Makefile
Hunk #1 succeeded at 493 (offset 2 lines).
patching file arch/i386/Kconfig
Hunk #1 succeeded at 228 (offset 11 lines).
Hunk #2 succeeded at 326 (offset 11 lines).
patching file arch/i386/Makefile
patching file arch/i386/boot/Makefile
patching file arch/i386/boot/compressed/Makefile
patching file arch/i386/kernel/Makefile
patching file arch/i386/kernel/apic.c
patching file arch/i386/kernel/cpu/mtrr/cyrix.c
patching file arch/i386/kernel/cpu/mtrr/generic.c
patching file arch/i386/kernel/entry.S
patching file arch/i386/kernel/i8253.c
patching file arch/i386/kernel/i8259.c
patching file arch/i386/kernel/io_apic.c
patching file arch/i386/kernel/ipipe.c
patching file arch/i386/kernel/mcount.S
patching file arch/i386/kernel/nmi.c
patching file arch/i386/kernel/process.c
patching file arch/i386/kernel/smp.c
patching file arch/i386/kernel/smpboot.c
patching file arch/i386/kernel/time.c
patching file arch/i386/kernel/traps.c
patching file arch/i386/kernel/vm86.c
patching file arch/i386/lib/mmx.c
patching file arch/i386/mach-visws/visws_apic.c
patching file arch/i386/mm/fault.c
patching file drivers/pci/htirq.c
patching file include/asm-i386/apic.h
patching file include/asm-i386/hw_irq.h
patching file include/asm-i386/i8259.h
patching file include/asm-i386/ipipe.h
patching file include/asm-i386/ipipe_base.h
patching file include/asm-i386/irqflags.h
patching file include/asm-i386/mmu_context.h
patching file include/asm-i386/nmi.h
patching file include/asm-i386/spinlock.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
Hunk #2 succeeded at 92 (offset 7 lines).
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 #1 succeeded at 68 (offset 11 lines).
Hunk #2 FAILED at 187.
Hunk #3 succeeded at 1241 (offset 49 lines).
Hunk #4 succeeded at 1395 (offset 50 lines).
1 out of 4 hunks FAILED -- saving rejects to file include/linux/sched.h.rej
patching file include/linux/spinlock.h
patching file include/linux/spinlock_types.h
patching file init/Kconfig
patching file init/main.c
patching file kernel/Makefile
patching file kernel/exit.c
Hunk #1 succeeded at 974 (offset 1 line).
patching file kernel/fork.c
Hunk #2 succeeded at 928 (offset 2 lines).
Hunk #3 succeeded at 1282 (offset 7 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/power/swsusp.c
patching file kernel/printk.c
patching file kernel/sched.c
Hunk #1 succeeded at 1518 (offset 82 lines).
Hunk #2 FAILED at 1932.
Hunk #3 succeeded at 1969 (offset 70 lines).
Hunk #4 succeeded at 1987 (offset 70 lines).
Hunk #5 succeeded at 3520 (offset 136 lines).
Hunk #6 succeeded at 3537 (offset 136 lines).
Hunk #7 succeeded at 3649 (offset 149 lines).
Hunk #8 succeeded at 3691 (offset 153 lines).
Hunk #9 succeeded at 3720 with fuzz 1 (offset 153 lines).
Hunk #10 FAILED at 4444.
Hunk #11 FAILED at 6919.
3 out of 11 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 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

Thanks in advance,
Nick