Please do:

git pull \
git:// merge

to get a few more bug-fixes for powerpc that should go in 2.6.25.


arch/powerpc/mm/hash_utils_64.c | 11 ++++++++---
arch/powerpc/sysdev/bestcomm/bestcomm.c | 8 ++++++--
arch/powerpc/sysdev/ipic.c | 2 +-
drivers/net/fec_mpc52xx_phy.c | 3 ++-
4 files changed, 17 insertions(+), 7 deletions(-)

commit 7ea6fd7e2df041297298b5feb5b7b78a2b1a5310
Author: Anatolij Gustschin
Date: Sat Mar 22 21:49:05 2008 +1100

[POWERPC] Fix Oops with TQM5200 on TQM5200

The "bestcomm-core" driver defines its of_match table as follows

static struct of_device_id mpc52xx_bcom_of_match[] = {
{ .type = "dma-controller", .compatible = "fsl,mpc5200-bestcomm", },
{ .type = "dma-controller", .compatible = "mpc5200-bestcomm", },

so while registering the driver, the driver's probe function won't be
called, because the device tree node doesn't have a device_type
property. Thus the driver's bcom_engine structure won't be allocated.
Referencing this structure later causes observed Oops.

Checking bcom_eng pointer for NULL before referencing data pointed
by it prevents oopsing, but fec driver still doesn't work (because
of the lost bestcomm match and resulted task allocation failure).
Actually the compatible property exists and should match and so
the fec driver should work.

This removes .type = "dma-controller" from the bestcomm driver's
mpc52xx_bcom_of_match table to solve the problem.

Signed-off-by: Anatolij Gustschin
Acked-by: Grant Likely
Signed-off-by: Paul Mackerras

commit 9560aea4e9d17cb75113c6051e800222fd5c71a4
Author: Grant Likely
Date: Sat Mar 22 14:41:05 2008 +1100

[POWERPC] mpc5200: Fix null dereference if bestcomm fails to initialize

If the bestcomm initialization fails, calls to the task allocate
function should fail gracefully instead of oopsing with a NULL deref.

Signed-off-by: Grant Likely
Signed-off-by: Paul Mackerras

commit b8c19eb16a7e6df57d0f6d67e42ce026e5d5930b
Author: Grant Likely
Date: Sat Mar 22 14:20:29 2008 +1100

[POWERPC] mpc5200-fec: Fix possible NULL dereference in mdio driver

If the reg property is missing from the phy node (unlikely, but possible),
then the kernel will oops with a NULL pointer dereference. This fixes
it by checking the pointer first.

Signed-off-by: Grant Likely
Signed-off-by: Paul Mackerras

commit 1428a9fa586cb80acf98289f797f58b8bd662598
Author: Olaf Hering
Date: Tue Mar 18 06:53:05 2008 +1100

[POWERPC] Fix crash in init_ipic_sysfs on efika

The global primary_ipic in arch/powerpc/sysdev/ipic.c can remain NULL
if ipic_init() fails, which will happen on machines that don't have an
ipic interrupt controller. init_ipic_sysfs() will crash in that case.

Acked-by: Grant Likely

Signed-off-by: Paul Mackerras

commit cfe666b145cecffe784d98e60ffe201a5dc57ac3
Author: Paul Mackerras
Date: Mon Mar 24 17:41:22 2008 +1100

[POWERPC] Don't use 64k pages for ioremap on pSeries

On pSeries, the hypervisor doesn't let us map in the eHEA ethernet
adapter using 64k pages, and thus the ehea driver will fail if 64k
pages are configured. This works around the problem by always
using 4k pages for ioremap on pSeries (but not on other platforms).
A better fix would be to check whether the partition could ever
have an eHEA adapter, and only force 4k pages if it could, but this
will do for 2.6.25.

This is based on an earlier patch by Tony Breeds.

Signed-off-by: Paul Mackerras
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to
More majordomo info at
Please read the FAQ at