[git pull] Please pull powerpc.git merge branch

Benjamin Herrenschmidt
2010-07-23T04:14:45Z

Hi Linus !

Here's a few things for 2.6.35.

One's a fallover from the lmb->memblock rename that I missed, which causes
a bunch of pseries machine to boot with 128M of memory and that's it :-)

There's a few patches fixing a nasty race we found in our hugepage code,
a kexec fix from Kumar, and an .lds fix from Sam for a bug that as far
as we know only affects powerpc.

Cheers,
Ben.

The following changes since commit b37fa16e78d6f9790462b3181602a26b5af36260:
Linus Torvalds (1):
Linux 2.6.35-rc6

are available in the git repository at:

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

Anton Blanchard (1):
powerpc/mm: Handle hypervisor pte insert failure in __hash_page_huge

Benjamin Herrenschmidt (5):
powerpc/mm: Move around testing of _PAGE_PRESENT in hash code
powerpc/mm: Fix bugs in huge page hashing
powerpc/mm: Add some debug output when hash insertion fails
powerpc: Fix erroneous lmb->memblock conversions
Merge commit 'kumar/merge' into merge

Kumar Gala (1):
powerpc/kexec: Fix boundary case for book-e kexec memory limits

Sam Ravnborg (1):
vmlinux.lds: fix .data..init_task output section (fix popwerpc boot)

arch/powerpc/include/asm/kexec.h | 6 +-
arch/powerpc/include/asm/mmu-hash64.h | 4 +-
arch/powerpc/kernel/prom.c | 2 +-
arch/powerpc/mm/hash_low_64.S | 9 ----
arch/powerpc/mm/hash_utils_64.c | 53 +++++++++++++++++------
arch/powerpc/mm/hugetlbpage-hash64.c | 40 +++++++++--------
arch/powerpc/mm/numa.c | 24 +++++-----
arch/powerpc/platforms/pseries/hotplug-memory.c | 22 +++++-----
include/asm-generic/vmlinux.lds.h | 2 +-
9 files changed, 93 insertions(+), 69 deletions(-)