From: Arnd Bergmann <arnd@arndb•de>
To: linuxppc-dev@ozlabs•org
Cc: torvalds@linux-foundation•org, Paul Mackerras <paulus@samba•org>
Subject: Re: Please pull powerpc.git merge branch
Date: Sat, 10 Mar 2007 00:31:53 +0100 [thread overview]
Message-ID: <200703100031.54128.arnd@arndb.de> (raw)
In-Reply-To: <17905.52447.829667.16759@cargo.ozlabs.ibm.com>
On Friday 09 March 2007, Paul Mackerras wrote:
> > Please do:
> >=20
> > git pull \
> > git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge
> >=20
> > There are 6 commits there. =A0Three of them fix compile warnings, one is
> > a bug fix, one works around a problem on rev 1.0 PPC970MP processors,
> > and one adds a missing newline in some help text.
>=20
> I have pulled 3 more commits from Kumar Gala and pushed them out, so
> when you do the pull you'll see the commits below in addition to the
> ones I listed previously.
I was late again and only today managed to go through my patch collection
to see what still needs to be merged in 2.6.21.
There are three fixes for run-time bugs, one is for making ps3 support not
break other platforms, and the final one is an updated defconfig for -rc3.
Please pull these from
git://git.kernel.org/pub/scm/linux/kernel/git/arnd/cell-2.6.git cell-merge
=2D--
arch/powerpc/configs/cell_defconfig | 151 ++++++++++++++++++++++++=
=2D----
arch/powerpc/mm/hash_utils_64.c | 6 +
arch/powerpc/mm/hugetlbpage.c | 4
arch/powerpc/platforms/cell/spu_base.c | 81 +++++++++++++--
arch/powerpc/platforms/cell/spufs/file.c | 24 ++--
arch/powerpc/platforms/cell/spufs/run.c | 4
arch/powerpc/platforms/cell/spufs/sched.c | 20 ---
arch/powerpc/platforms/cell/spufs/spufs.h | 6 -
arch/powerpc/platforms/cell/spufs/switch.c | 62 -----------
arch/powerpc/platforms/ps3/mm.c | 2
arch/powerpc/platforms/ps3/system-bus.c | 2
drivers/ps3/ps3av.c | 9 +
drivers/ps3/sys-manager.c | 6 +
drivers/ps3/vuart.c | 2
include/asm-powerpc/spu.h | 7 +
include/asm-powerpc/spu_csa.h | 4
16 files changed, 258 insertions(+), 132 deletions(-)
=2D--
commit c886c2bf804c029499694adcc0decfdd32a0cd8b
Author: Arnd Bergmann <arnd.bergmann@de•ibm.com>
Date: Sat Mar 10 00:05:39 2007 +0100
[POWERPC] update cell_defconfig
=20
Signed-off-by: Arnd Bergmann <arnd.bergmann@de•ibm.com>
commit ef596c697a4d80048eccf50530153d7e3330c127
Author: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom•com>
Date: Sat Mar 10 00:05:38 2007 +0100
[POWERPC] ps3: always make sure were running on a PS3
=20
Add missing checks to PS3 specific drivers ps3av and sys-manager to ver=
ify that
we are actually running on a PS3 (pointed out by Arnd).
=20
Correct existing checks in other subsystems/drivers to return -ENODEV i=
nstead
of zero.
=20
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom•com>
Signed-off-by: Arnd Bergmann <arnd.bergmann@de•ibm.com>
commit 94b2a4393c500a620de90c3266d595926302e26b
Author: Benjamin Herrenschmidt <benh@kernel•crashing.org>
Date: Sat Mar 10 00:05:37 2007 +0100
[POWERPC] Fix spu SLB invalidations
=20
The SPU code doesn't properly invalidate SPUs SLBs when necessary,
for example when changing a segment size from the hugetlbfs code. In
addition, it saves and restores the SLB content on context switches
which makes it harder to properly handle those invalidations.
=20
This patch removes the saving & restoring for now, something more
efficient might be found later on. It also adds a spu_flush_all_slbs(mm)
that can be used by the core mm code to flush the SLBs of all SPEs that
are running a given mm at the time of the flush.
=20
In order to do that, it adds a spinlock to the list of all SPEs and move
some bits & pieces from spufs to spu_base.c
=20
Signed-off-by: Benjamin Herrenschmidt <benh@kernel•crashing.org>
commit 50b520d4efbce45281f58112789470ec7965fd33
Author: Christoph Hellwig <hch@lst•de>
Date: Sat Mar 10 00:05:36 2007 +0100
[POWERPC] avoid SPU_ACTIVATE_NOWAKE optimization
=20
This optimization was added recently but is still buggy,
so back it out for now.
=20
Signed-off-by: Arnd Bergmann <arnd.bergmann@de•ibm.com>
commit aa0ed2bdb663608d5e409faecff3e1e81a3d413a
Author: Arnd Bergmann <arnd.bergmann@de•ibm.com>
Date: Sat Mar 10 00:05:35 2007 +0100
[POWERPC] spufs: fix possible memory corruption is spufs_mem_write
=20
Due to a buggy unsigned comparison, it was possible to write
beyond the end of the local store file in spufs under some
circumstances.
=20
This rewrites the buggy function to look more like
simple_copy_from_buffer.
=20
Signed-off-by: Arnd Bergmann <arnd.bergmann@de•ibm.com>
Cc: Ulrich Weigand <Ulrich.Weigand@de•ibm.com>
next prev parent reply other threads:[~2007-03-09 23:32 UTC|newest]
Thread overview: 146+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-08 4:01 Please pull powerpc.git merge branch Paul Mackerras
2007-03-09 21:08 ` Paul Mackerras
2007-03-09 23:31 ` Arnd Bergmann [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-04-03 11:33 Paul Mackerras
2008-03-28 12:35 Paul Mackerras
2008-03-28 22:06 ` Bartlomiej Sieka
2008-04-01 23:12 ` Paul Mackerras
2008-04-02 4:27 ` Grant Likely
2008-04-02 14:32 ` Bartlomiej Sieka
2008-03-27 23:08 Paul Mackerras
2008-03-25 3:32 Paul Mackerras
2008-03-24 8:05 Paul Mackerras
2008-03-20 0:43 Paul Mackerras
2008-03-12 23:51 Paul Mackerras
2008-03-03 11:41 Paul Mackerras
2008-03-03 15:44 ` Grant Likely
2008-02-20 3:46 Paul Mackerras
2008-02-21 12:15 ` Paul Mackerras
2008-02-14 22:00 Paul Mackerras
2008-02-15 22:43 ` Josh Boyer
2008-01-15 10:19 Paul Mackerras
2008-01-12 0:09 Paul Mackerras
2008-01-02 5:21 Paul Mackerras
2007-12-28 9:28 Paul Mackerras
2007-12-28 21:53 ` Geoff Levand
2007-12-31 1:40 ` Paul Mackerras
2007-12-31 16:12 ` Arnd Bergmann
2008-01-02 4:39 ` Jeremy Kerr
2007-12-17 6:00 Paul Mackerras
2007-12-07 1:04 Paul Mackerras
2007-12-06 12:01 Paul Mackerras
2007-12-02 23:12 Paul Mackerras
2007-12-03 0:25 ` Josh Boyer
2007-11-26 22:09 Paul Mackerras
2007-11-20 8:38 Paul Mackerras
2007-11-13 11:11 Paul Mackerras
2007-11-08 9:54 Paul Mackerras
2007-10-23 4:21 Paul Mackerras
2007-10-17 12:49 Paul Mackerras
2007-10-17 13:31 ` Josh Boyer
2007-10-02 3:15 Paul Mackerras
2007-09-25 11:40 Paul Mackerras
2007-09-25 12:43 ` Kumar Gala
2007-09-25 12:52 ` Paul Mackerras
2007-09-26 11:33 ` Paul Mackerras
2007-09-19 12:38 Paul Mackerras
2007-09-10 19:13 Paul Mackerras
2007-08-30 11:49 Paul Mackerras
2007-08-30 14:32 ` Kumar Gala
2007-08-26 23:57 Paul Mackerras
2007-08-17 0:51 Paul Mackerras
2007-08-15 11:41 Paul Mackerras
2007-08-10 12:20 Paul Mackerras
2007-08-03 10:32 Paul Mackerras
2007-08-06 5:57 ` Zhang Wei-r63237
2007-08-06 13:57 ` Kumar Gala
2007-08-07 1:06 ` Michael Ellerman
2007-08-07 2:57 ` Zang Roy-r61911
2007-08-07 3:18 ` Michael Ellerman
2007-08-07 3:31 ` Zhang Wei-r63237
2007-07-26 12:10 Paul Mackerras
2007-07-22 12:56 Paul Mackerras
2007-07-11 4:46 Paul Mackerras
2007-07-05 1:45 Paul Mackerras
2007-07-02 4:25 Paul Mackerras
2007-07-02 6:04 ` Paul Mackerras
2007-06-26 10:08 Paul Mackerras
2007-06-20 12:46 Paul Mackerras
2007-06-19 5:39 Paul Mackerras
2007-06-15 5:00 Paul Mackerras
2007-04-11 22:29 Paul Mackerras
2007-03-28 23:51 Paul Mackerras
2007-03-22 4:31 Paul Mackerras
2007-03-13 0:47 Paul Mackerras
2007-01-27 23:08 Please pull powerpc.git 'merge' branch Paul Mackerras
2007-01-27 23:15 ` Paul Mackerras
2007-01-22 11:50 Paul Mackerras
2007-01-09 9:45 Paul Mackerras
2006-12-20 10:23 Paul Mackerras
2006-12-20 10:52 ` Benjamin Herrenschmidt
2006-12-20 11:15 ` Arnd Bergmann
2006-12-20 11:18 ` Benjamin Herrenschmidt
2006-11-22 2:35 Paul Mackerras
2006-11-22 2:47 ` Linus Torvalds
2006-11-22 21:40 ` Paul Mackerras
2006-11-22 21:53 ` Linus Torvalds
2006-11-16 2:19 Paul Mackerras
2006-11-11 11:32 Paul Mackerras
2006-11-01 7:30 Paul Mackerras
2006-10-25 6:26 Paul Mackerras
2006-10-25 14:09 ` Kumar Gala
2006-10-25 21:37 ` Paul Mackerras
2006-10-25 22:02 ` Kumar Gala
2006-10-25 14:22 ` Olof Johansson
2006-10-25 21:34 ` Paul Mackerras
2006-10-25 22:32 ` Olof Johansson
2006-10-17 4:02 Paul Mackerras
2006-10-10 5:31 Paul Mackerras
2006-10-07 12:33 Paul Mackerras
2006-09-13 12:47 Paul Mackerras
2006-09-14 19:14 ` Linus Torvalds
2006-09-14 22:55 ` Paul Mackerras
2006-09-14 23:36 ` Linus Torvalds
2006-09-15 19:59 ` Linus Torvalds
2006-08-31 4:34 Paul Mackerras
2006-08-31 4:49 ` Linus Torvalds
2006-09-03 19:16 ` Linus Torvalds
2006-09-03 19:23 ` Sergei Shtylyov
2006-09-03 19:29 ` Linus Torvalds
2006-09-03 20:41 ` Segher Boessenkool
2006-09-03 21:15 ` Benjamin Herrenschmidt
2006-09-03 21:33 ` Linus Torvalds
2006-09-03 21:54 ` Benjamin Herrenschmidt
2006-08-24 0:44 Paul Mackerras
[not found] ` <20060824010508.GA17848@suse.de>
2006-08-24 4:02 ` Paul Mackerras
2006-08-24 4:10 ` Greg KH
2006-08-24 13:22 ` Jon Loeliger
2006-08-24 13:33 ` Kumar Gala
2006-08-18 2:10 Paul Mackerras
2006-08-18 14:15 ` Matt Porter
2006-08-18 16:20 ` Greg KH
2006-07-31 5:37 please " Paul Mackerras
2006-07-31 20:41 ` Linus Torvalds
2006-06-21 8:21 Paul Mackerras
2006-06-21 12:45 ` Kumar Gala
2006-06-21 13:04 ` Jon Loeliger
2006-06-21 13:08 ` Kumar Gala
2006-06-21 13:27 ` Jon Loeliger
2006-06-21 21:16 ` Paul Mackerras
2006-05-27 13:17 Paul Mackerras
2006-05-16 12:35 Paul Mackerras
2006-05-09 9:13 Paul Mackerras
2006-05-03 22:29 Paul Mackerras
2006-04-29 6:15 Paul Mackerras
2006-04-29 15:19 ` Olof Johansson
2006-04-29 23:47 ` Paul Mackerras
2006-04-30 3:12 ` Segher Boessenkool
2006-04-30 4:20 ` Olof Johansson
2006-04-30 11:42 ` Arnd Bergmann
2006-04-30 11:57 ` Arnd Bergmann
2006-04-30 15:07 ` Olof Johansson
2006-04-30 13:04 ` Segher Boessenkool
2006-04-30 16:14 ` Arnd Bergmann
2006-04-30 15:03 ` Olof Johansson
2006-04-30 15:07 ` Olof Johansson
2006-04-30 3:50 ` Olof Johansson
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=200703100031.54128.arnd@arndb.de \
--to=arnd@arndb$(echo .)de \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=paulus@samba$(echo .)org \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox