On Wed, May 23, 2012 at 03:14:05PM +1000, Stephen Rothwell wrote: > OK, it seem that most of this has been in Andrew's tree for a while, > sorry about that. Grr... *Another* missing prereq for task_work_add() series, this time on ppc64. Could somebody familiar with that beast take a look at this and tell if the change is sane? What we want is r0 = r3 & MSR_PR ? _TIF_NEED_RESCHED | _TIF_NOTIFY_RESUME | _TIF_SIGPENDING : _TIF_NEED_RESCHED; and when Roland re-added NOTIFY_RESUME he'd missed that hack (non-PREEMPT variant and 32bit code all just check _TIF_USER_WORK_MASK, so updating it had been enough in those cases). I don't have the hardware in question; the same instructions in userland on ppc32 box produce the right value. Unless NAKed I'm going to throw that one into the second pull request from signal.git, so if anyone has objections, please yell. I'll gladly replace that with better solution if one shows up (or, better yet, goes via ppc tree). AFAICS the diff below should work, but whether it's the best variant or not... No idea. Back to massaging VFS queue for pull... diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index ed1718f..e4fd9bb 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S @@ -563,9 +563,10 @@ _GLOBAL(ret_from_except_lite) li r0,_TIF_NEED_RESCHED /* bits to check */ ld r3,_MSR(r1) ld r4,TI_FLAGS(r9) - /* Move MSR_PR bit in r3 to _TIF_SIGPENDING position in r0 */ + /* Add MSR_PR bit in r3 in _TIF_SIGPENDING and _TIF_NOTIFY_RESUME positions in r0 */ rlwimi r0,r3,32+TIF_SIGPENDING-MSR_PR_LG,_TIF_SIGPENDING - and. r0,r4,r0 /* check NEED_RESCHED and maybe SIGPENDING */ + rlwimi r0,r3,32+TIF_NOTIFY_RESUME-MSR_PR_LG,_TIF_NOTIFY_RESUME + and. r0,r4,r0 /* check NEED_RESCHED and maybe SIGPENDING/NOTIFY_RESUME */ bne do_work #else /* !CONFIG_PREEMPT */ -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
