[git pull] Please pull powerpc.git merge branch

Linus,

Please pull from the 'merge' branch of

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

The main thing there is a patch from James Bottomley which fixes the
build failure on 64-bit powerpc with CONFIG_MODULES=n.

There are two other small commits that fix boot problems for embedded
boards: one that ensures that we build the right type of image for the
Holly evaluation board, and one that fixes some interrupt numbers on
Freescale MPC8610-based systems.

Thanks,
Paul.

 arch/powerpc/boot/Makefile             |    2 +-
 arch/powerpc/boot/dts/mpc8610_hpcd.dts |    8 ++++----
 arch/powerpc/include/asm/elf.h         |    7 +++++++
 arch/powerpc/include/asm/sections.h    |   12 +++++++++++-
 arch/powerpc/kernel/module_64.c        |   19 -------------------
 5 files changed, 23 insertions(+), 25 deletions(-)

commit 2d291e902791e1c8d72bc223b6f063bbb27a1280
Author: James Bottomley [off-list ref]
Date:   Tue Sep 9 14:04:18 2008 +0000

    Fix compile failure with non modular builds
    
    Commit deac93df26b20cf8438339b5935b5f5643bc30c9 ("lib: Correct printk
    %pF to work on all architectures") broke the non modular builds by
    moving an essential function into modules.c.  Fix this by moving it
    out again and into asm/sections.h as an inline.  To do this, the
    definition of struct ppc64_opd_entry has been lifted out of modules.c
    and put in asm/elf.h where it belongs.
    
    Signed-off-by: James Bottomley [off-list ref]
    Signed-off-by: Paul Mackerras [off-list ref]

37 more lines

On Thu, Sep 18, 2008 at 11:36 AM, Paul Mackerras [off-list ref] wrote:

   powerpc: Fix interrupt values for DMA2 in MPC8610 HPCD device tree

   For Freescale 8xxx devices that use an MPIC, the interrupt numbers in
   the device tree must be 16 greater than the values documented in the
   reference manual.  In these chips, the MPIC is wired to use the first
   16 numbers for external interrupts, but the documentation numbers
   internal interrupts from 0.

   In the MPC8610 HPCD device tree, the interrupt properties for the DMA
   channels for DMA2 were not the adjusted values.  This fixes that.

Did you edit this patch when you pulled it from Kumar's repo?  The
commit in Kumar's repo says "This patch fixes that.", which is what I
wrote.  However, in your tree, the word "patch" is missing.

-- 
Timur Tabi
Linux kernel developer at Freescale

On Thu, Sep 18, 2008 at 11:43:24AM -0500, Timur Tabi wrote:

On Thu, Sep 18, 2008 at 11:36 AM, Paul Mackerras [off-list ref] wrote:

quoted

   powerpc: Fix interrupt values for DMA2 in MPC8610 HPCD device tree

   For Freescale 8xxx devices that use an MPIC, the interrupt numbers in
   the device tree must be 16 greater than the values documented in the
   reference manual.  In these chips, the MPIC is wired to use the first
   16 numbers for external interrupts, but the documentation numbers
   internal interrupts from 0.

   In the MPC8610 HPCD device tree, the interrupt properties for the DMA
   channels for DMA2 were not the adjusted values.  This fixes that.

Did you edit this patch when you pulled it from Kumar's repo?  The
commit in Kumar's repo says "This patch fixes that.", which is what I
wrote.  However, in your tree, the word "patch" is missing.

Yes.  He edits them often for various reasons.  In this case, the word
"patch" is arguably incorrect, as it's now a commit.  So my assumption is
that he left off the noun for the "fix" entirely to avoid stuff like that.

josh