Please pull powerpc.git merge branch

[Paul Mackerras]

Linus,

Please do:

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

to get two more bug-fixes for powerpc.

Thanks,
Paul.

 arch/powerpc/kernel/udbg.c              |    8 +++++++-
 arch/powerpc/platforms/powermac/setup.c |   13 ++++++++++++-
 arch/powerpc/platforms/powermac/smp.c   |    1 -
 3 files changed, 19 insertions(+), 3 deletions(-)

commit 220ddc0847ebd42d18ee78c7e1c2f4c2e3be637d
Author: Milton Miller <miltonm at bga.com>
Date:   Sun Jun 10 14:32:43 2007 +1000

    [POWERPC] Fix console output getting dropped on platforms without udbg_putc
    
    Previously, registering this early console would just result
    in dropping early buffered printk output until a udbg_putc
    was registered.
    
    However, commit 69331af79cf29e26d1231152a172a1a10c2df511
    clears the CON_PRINTBUFFER flag on the main console when a
    CON_BOOT (early) console has been registered, resulting in
    the buffered messages never being displayed to the user.
    
    This fixes the problem by making sure we don't register udbg_console
    on platforms that don't implement udbg_putc.
    
    Signed-off-by: Milton Miller <miltonm at bga.com>
    Acked-by: Mark A. Greer <mgreer at mvista.com>
    Signed-off-by: Paul Mackerras <paulus at samba.org>

commit c63c4faa8cf055319c7ed557d2050c1c3776fac5
Author: Paul Mackerras <paulus at samba.org>
Date:   Thu Jun 7 22:42:19 2007 +1000

    [POWERPC] Fix per-cpu allocation on oldworld SMP powermacs
    
    The per-cpu area(a) for the secondary CPU(s) isn't getting allocated
    on old SMP powermacs that don't have the secondary CPU(s) listed in
    the device tree, as per-cpu areas are now only allocated for CPUs in
    the cpu_possible_map, and we aren't setting the bits for the secondary
    CPU(s) until smp_prepare_cpus(), which is after per-cpu allocation.
    Therefore this sets the bits for CPUs 1..3 in cpu_possible_map in
    pmac_setup_arch, so they get per-cpu data allocated.
    
    Signed-off-by: Paul Mackerras <paulus at samba.org>