From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Message-ID: <18116.61743.176219.283510@cargo.ozlabs.ibm.com> Date: Fri, 17 Aug 2007 10:51:59 +1000 From: Paul Mackerras To: torvalds@linux-foundation.org Subject: Please pull powerpc.git merge branch Cc: linuxppc-dev@ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Linus, Please do git pull \ git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge I have added one more patch from Ilpo J=E4rvinen since the last pull request, removing an incorrect semicolon. Paul. arch/powerpc/boot/flatdevtree.c | 18 ------------------ arch/powerpc/kernel/Makefile | 1 + arch/powerpc/kernel/misc=5F32.S | 12 +++++++++++- arch/powerpc/mm/hash=5Futils=5F64.c | 2 +- arch/powerpc/platforms/cell/spu=5Fsyscalls.c | 1 + arch/powerpc/platforms/ps3/device-init.c | 2 +- arch/ppc/kernel/misc.S | 12 +++++++++++- 7 files changed, 26 insertions(+), 22 deletions(-) commit 2b02d13996fe28478e45605de9bd8bdca25718de Author: Ilpo J=C3=A4rvinen Date: Thu Aug 16 08:03:35 2007 +1000 [POWERPC] Fix invalid semicolon after if statement =20 A similar fix to netfilter from Eric Dumazet inspired me to look around a bit by using some grep/sed stuff as looking for this kind of bugs seemed easy to automate. This is one of them I found where it looks like this semicolon is not valid. =20 Signed-off-by: Ilpo J=C3=A4rvinen Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 2de69124e86682c3427adb4136e097854841e467 Author: Geert Uytterhoeven Date: Wed Aug 15 02:30:13 2007 +1000 [POWERPC] ps3: Fix no storage devices found =20 Fix probing of PS3 storage devices: in the success case, we should = set `error' to zero, not `result'. =20 Without this patch no storage devices are found. =20 Signed-off-by: Geert Uytterhoeven Signed-off-by: Paul Mackerras commit 55a910a81d0c3014abc20b9efa73c595b3e68339 Author: Roland McGrath Date: Sat Aug 11 09:03:11 2007 +1000 [POWERPC] Fix for assembler -g =20 ppc64 does the unusual thing of using #include on a compiler-genera= ted assembly file (lparmap.s) from an assembly source file (head=5F64.S= ). This runs afoul of my recent patch to pass -gdwarf2 to the assemble= r under CONFIG=5FDEBUG=5FINFO. This patch avoids the problem by disa= bling DWARF generation (-g0) when producing lparmap.s. =20 Signed-off-by: Roland McGrath Signed-off-by: Paul Mackerras commit aa1cf632bd6f998cb4567ccf1a9d2e5daaa9fb44 Author: David Gibson Date: Tue Aug 7 14:20:50 2007 +1000 [POWERPC] Fix small race in 44x tlbie function =20 The 440 family of processors don't have a tlbie instruction. So, w= e implement TLB invalidates by explicitly searching the TLB with tlbs= x., then clobbering the relevant entry, if any. Unfortunately the PID = for the search needs to be stored in the MMUCR register, which is also used by the TLB miss handler. Interrupts were enabled in =5Ftlbie(= ), so an interrupt between loading the MMUCR and the tlbsx could cause incorrect search results, and thus a failure to invalide TLB entrie= s which needed to be invalidated. =20 This fixes the problem in both arch/ppc and arch/powerpc by inhibit= ing interrupts (even critical and debug interrupts) across the relevant= instructions. =20 Signed-off-by: David Gibson Acked-by: Josh Boyer Signed-off-by: Paul Mackerras commit fa6b769a8e981afea869285982640168f76774df Author: Becky Bruce Date: Sat May 12 03:49:39 2007 +1000 [POWERPC] Remove unused code causing a compile warning =20 AFAICT, nobody is using ft=5Fordered(), and it causes a build warni= ng to be generated. This patch cleans that up by removing the functio= n and the commented-out code that calls it. =20 Signed-off-by: Becky Bruce Acked-by: David Gibson Signed-off-by: Paul Mackerras commit ad941fe4b6b83999863f49dfba7b3d2cebc4ced5 Author: Jeremy Kerr Date: Mon Aug 13 13:22:44 2007 +1000 [POWERPC] cell: Fix errno for modular spufs=5Fcreate with invalid n= eighbour =20 At present, spu=5Fcreate with an invalid neighbo(u)r will return -E= NOSYS, not -EBADF, but only when spufs.o is built as a module. =20 This change adds the appropriate errno, making the behaviour the sa= me as the built-in case. =20 Signed-off-by: Jeremy Kerr Acked-by: Arnd Bergmann Signed-off-by: Paul Mackerras