From: Bob Feretich <bob.feretich@domain.hid>
To: xenomai@xenomai.org
Subject: [Xenomai-help] Adeos patch interference with Angstrom 2.6.29-r46
Date: Mon, 05 Apr 2010 14:22:08 -0700 [thread overview]
Message-ID: <4BBA5480.9090608@domain.hid> (raw)
First, thanks for the help getting me started with Xenomai in
openembedded. Special thanks to Felipe Brandao Cavalcanti for the files
he posted. (I was sidetracked on another project, so I could not
follow-up sooner.)
I added adeos-ipipe-2.6.29-arm-1.13-04.patch to the end of the normal
set of kernel patches to be applied against Angstrom
linux-omap-2.6.29.bb recipe file (it builds the -r46 revision). There
are conflicts with four Angstrom patches. There are two conflicts that I
am concerned about. (The first two below.)
Conflict with
'0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch'.
patching file arch/arm/include/asm/thread_info.h
Hunk #1 FAILED at 136.
Hunk #2 FAILED at 146.
2 out of 2 hunks FAILED -- rejects in file
arch/arm/include/asm/thread_info.h
Adeos wants TIF_MMSWITCH_INT 20, but the other patch wants
TIF_RESTORE_SIGMASK 20.
Can I define TIF_MMSWITCH_INT as 21? Will that bother anything?
Conflict with 'no-cortex-deadlock.patch'.
patching file arch/arm/kernel/entry-common.S
Hunk #5 FAILED at 82.
Hunk #6 succeeded at 272 (offset 4 lines).
Hunk #8 succeeded at 494 (offset -6 lines).
1 out of 8 hunks FAILED -- rejects in file arch/arm/kernel/entry-common.S
Some Arm silicon require the "dmb" instruction in this fix to avoid
deadlock. Does Xenomai account for this elsewhere?
Conflict with '/cache/l1cache-shift.patch'
patching file arch/arm/mm/Kconfig
Hunk #1 FAILED at 717.
1 out of 1 hunk FAILED -- rejects in file arch/arm/mm/Kconfig
No real conflict, the other patch just added a config entry that the
Adeos patch wasn't expecting.
Conflict with 'vfp/03-vfp-corruption.patch'
patching file arch/arm/vfp/vfphw.S
Hunk #5 succeeded at 136 with fuzz 1.
Hunk #6 FAILED at 156.
1 out of 6 hunks FAILED -- rejects in file arch/arm/vfp/vfphw.S
I allowed the #ifdef CONFIG_PREEMPT segment to match before the Adeos
insertion.
Please advise.
Regards,
Bob Feretich
next reply other threads:[~2010-04-05 21:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-05 21:22 Bob Feretich [this message]
2010-04-05 22:18 ` [Xenomai-help] Adeos patch interference with Angstrom 2.6.29-r46 Gilles Chanteperdrix
2010-04-06 20:46 ` Bob Feretich
2010-04-06 20:55 ` Gilles Chanteperdrix
2010-04-07 0:42 ` Bob Feretich
2010-04-08 12:16 ` Gilles Chanteperdrix
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4BBA5480.9090608@domain.hid \
--to=bob.feretich@domain.hid \
--cc=xenomai@xenomai.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.