Please pull powerpc.git merge branch

Paul Mackerras paulus at
Mon Jul 2 14:25:56 EST 2007


Please do:

git pull \
git:// merge

My defconfig updates exposed some compile failures on powerpc, which
these three commits fix.


 arch/powerpc/kernel/irq.c                 |    6 ++++++
 arch/powerpc/platforms/cell/cbe_cpufreq.c |   15 ++++++++++-----
 drivers/net/Kconfig                       |    2 +-
 include/asm-powerpc/irq.h                 |    5 +----
 4 files changed, 18 insertions(+), 10 deletions(-)

commit 9f7905812e5919862acb6ede63e10d3d1bb4958e
Author: Olof Johansson <olof at>
Date:   Mon Jun 4 14:47:04 2007 +1000

    [POWERPC] Uninline and export virq_to_hw() for the pasemi_mac driver
    Uninline virq_to_hw and export it so modules can use it. The alternative
    would be to export the irq_map array instead, but it's an infrequently
    called function, and keeping the array unexported seems considerably
    This is needed so that the pasemi_mac driver can be compiled as a module.
    Signed-off-by: Olof Johansson <olof at>
    Signed-off-by: Paul Mackerras <paulus at>

commit ee5d1b7f2a01ce4d95ca247b5a499b72f31cdbe8
Author: Christian Krafft <krafft at>
Date:   Thu Jun 28 21:14:38 2007 +1000

    [POWERPC] Fix PMI breakage in cbe_cbufreq driver
    The recent change to cell_defconfig to enable cpufreq on Cell exposed
    the fact that the cbe_cpufreq driver currently needs the PMI interface
    code to compile, but Kconfig doesn't make sure that the PMI interface
    code gets built if cbe_cpufreq is enabled.
    In fact cbe_cpufreq can work without PMI, so this ifdefs out the code
    that deals with PMI.  This is a minimal solution for 2.6.22; a more
    comprehensive solution will be merged for 2.6.23.
    Signed-off-by: Christian Krafft <krafft at>
    Signed-off-by: Paul Mackerras <paulus at>

commit 86affd5a00a92e491e5f00ed659492767519fdf7
Author: David Gibson <david at>
Date:   Thu Jun 28 11:27:57 2007 +1000

    [POWERPC] Disable old EMAC driver in arch/powerpc
    The EMAC driver, in drivers/net/ibm_emac, for the embedded Ethernet
    MAC found in PowerPC 4xx embedded chips is not suitable for
    arch/powerpc.  It will not build because it relies on the old arch/ppc
    OCP mechanism.  BenH has a new, device-tree aware version of the
    driver which will work in arch/powerpc, but until it's merged, this
    patch will disable the old, non-building version.
    Signed-off-by: David Gibson <david at>
    Signed-off-by: Paul Mackerras <paulus at>

More information about the Linuxppc-dev mailing list