Please pull powerpc.git merge branch

Paul Mackerras paulus at
Wed Sep 26 21:33:20 EST 2007

I wrote:

> Linus,
> Please do
> git pull \
> git:// merge
> to get a patch from Roland McGrath that fixes a user-triggerable oops
> on 64-bit powerpc.

I have added another commit from Jeremy Kerr fixing a mismerge that
caused a user visible ABI regression from 2.6.22.  The diffstat and
log below include both the patch from Roland and this new patch.


 arch/powerpc/kernel/process.c            |    7 +++++++
 arch/powerpc/platforms/cell/spufs/file.c |    4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

commit 603c461250b223ac42c10b8d1df653af1a361d44
Author: Jeremy Kerr <jk at>
Date:   Wed Sep 26 10:53:45 2007 +1000

    [POWERPC] spufs: fix mismerge, making context signal{1,2} files readable again
    The commit 8b6f50ef1d5cc86b278eb42bc91630fad455fb10 seems to have
    been affected by a mismerge of a duplicate patch
    (d054b36ffd302ec65aabec16a0c60ddd9e6b5a62) - both the
    spufs_dir_contents and spufs_dir_nosched_contents have been given
    write-only signal notification files.
    This change reverts the spufs_dir_contents array to use the
    readable signal notification file implementation.
    Signed-off-by: Jeremy Kerr <jk at>
    Acked-by: Arnd Bergmann <arnd.bergmann at>
    Signed-off-by: Paul Mackerras <paulus at>

commit 474f81967217f3bec2389ae913da72641f2c40e3
Author: Roland McGrath <roland at>
Date:   Mon Sep 24 16:52:44 2007 -0700

    [POWERPC] Ensure FULL_REGS on exec
    When PTRACE_O_TRACEEXEC is used, a ptrace call to fetch the registers at
    With recent versions, "gdb --args /bin/sh -c 'exec /bin/true'" and "run" at
    the (gdb) prompt is sufficient to produce this.  I also have written an
    isolated test case, see
    This change fixes the problem by clearing the low bit of pt_regs.trap in
    start_thread so that FULL_REGS is true again.  This is correct since all of
    the GPRs that "full" refers to are cleared in start_thread.
    Signed-off-by: Roland McGrath <roland at>
    Signed-off-by: Paul Mackerras <paulus at>

More information about the Linuxppc-dev mailing list