Please pull powerpc.git merge branch

Paul Mackerras paulus at samba.org
Wed Sep 19 22:38:57 EST 2007


Linus,

Please do

git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge

to get three more bug-fixes for powerpc, as listed below.

Thanks,
Paul.

 arch/powerpc/kernel/time.c                |    8 +++++---
 arch/powerpc/kernel/vdso.c                |   12 ++++++++++++
 arch/powerpc/platforms/cell/spufs/sched.c |    4 ++--
 include/asm-powerpc/time.h                |    5 +++++
 4 files changed, 24 insertions(+), 5 deletions(-)

commit c27da339698145a9383e052c1070a950d30da478
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date:   Wed Sep 19 14:21:56 2007 +1000

    [POWERPC] Fix timekeeping on PowerPC 601
    
    Recent changes to the timekeeping code broke support for the PowerPC 601
    processor which doesn't have the usual timebase facility but a slightly
    different thing called (yuck) the RTC.
    
    This fixes it, boot tested on an old 601 based PowerMac 7200.
    
    Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus at samba.org>

commit 7b5acbaac3f94ab810a977c0ec4e5fcabbf51bed
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date:   Wed Sep 19 14:21:56 2007 +1000

    [POWERPC] Don't expose clock vDSO functions when CPU has no timebase
    
    We forgot to remove the clock_gettime, clock_getres and get_tbfreq vDSO
    calls on CPUs that have no timebase such as 601 or 403 (old CPUs that have
    different mechanisms and for which the vDSO code will not work properly).
    This fixes it.
    
    Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus at samba.org>

commit c0e7b4aa1c09ea992808ea8c079141bc8dd0f5bc
Author: Christoph Hellwig <hch at lst.de>
Date:   Wed Sep 19 14:38:12 2007 +1000

    [POWERPC] spusched: Fix null pointer dereference in find_victim
    
    find_victim can dereference a NULL pointer when iterating over the list
    of victim spus because list_mutex only guarantees spu->ct to be stable,
    but of course not to be non-NULL.
    
    Also fix find_victim to not call spu_unbind_context without list_mutex
    because that violates the above guarantee.
    
    Signed-off-by: Christoph Hellwig <hch at lst.de>
    Signed-off-by: Arnd Bergmann <arnd.bergmann at de.ibm.com>
    Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
    Signed-off-by: Paul Mackerras <paulus at samba.org>



More information about the Linuxppc-dev mailing list