[git pull] Please pull powerpc.git merge branch

Benjamin Herrenschmidt
2011-11-08T04:21:52Z

Hi Linus !

Me again :-) So yesterday you pulled my -next branch with the bulk of
what happened since the last merge window up to when I left for my long
vacation (5 weeks). Today are a few remaining nits that happened during
that time.

Essentially small fixes, a defconfig bit, some janitorial stuff
(IRQ_DISABLED removal), a board support for 52xx that I forgot to pull
from Anatolij, and a fix to properly parse NUMA info from the
device-tree on powernc.

Ah, also finally add main memory to /proc/iomem. I've resisted that for
a long time but too much userspace gunk relies on it so here we go.

Cheers,
Ben.

The following changes since commit 1ea6b8f48918282bdca0b32a34095504ee65bab5:

Linux 3.2-rc1 (2011-11-07 16:16:02 -0800)

are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge

Anton Blanchard (1):
powerpc: Add System RAM to /proc/iomem

Benjamin Herrenschmidt (1):
Merge remote-tracking branch 'agust/next' into merge

Dipankar Sarma (1):
powerpc/numa: NUMA topology support for PowerNV

Geoff Levand (2):
powerpc/ps3: Fix PS3 repository build warnings
powerpc/ps3: Fix lv1_gpu_attribute hcall

Heiko Schocher (2):
powerpc/5200: add support for charon board
powerpc, tqm5200: update tqm5200_defconfig to fit for charon board.

Michael Neuling (1):
powerpc: Add KVM as module to defconfigs

Nishanth Aravamudan (1):
powerpc/kvm: Fix build with older toolchains

Yong Zhang (2):
powerpc/irq: Remove IRQF_DISABLED
powerpc/ps3: irq: Remove IRQF_DISABLED

arch/powerpc/boot/dts/charon.dts | 236 ++++++++++++++++++++++++
arch/powerpc/configs/52xx/tqm5200_defconfig | 20 ++-
arch/powerpc/configs/ppc64_defconfig | 4 +
arch/powerpc/configs/pseries_defconfig | 4 +
arch/powerpc/include/asm/floppy.h | 4 +-
arch/powerpc/include/asm/lv1call.h | 2 +-
arch/powerpc/include/asm/xics.h | 4 +-
arch/powerpc/kernel/smp.c | 2 +-
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 2 +-
arch/powerpc/mm/mem.c | 30 +++
arch/powerpc/mm/numa.c | 24 ++-
arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 +
arch/powerpc/platforms/cell/beat.c | 2 +-
arch/powerpc/platforms/cell/celleb_scc_pciex.c | 2 +-
arch/powerpc/platforms/cell/iommu.c | 3 +-
arch/powerpc/platforms/cell/pmu.c | 2 +-
arch/powerpc/platforms/cell/spu_base.c | 9 +-
arch/powerpc/platforms/powermac/pic.c | 1 -
arch/powerpc/platforms/powermac/smp.c | 4 +-
arch/powerpc/platforms/ps3/device-init.c | 2 +-
arch/powerpc/platforms/ps3/repository.c | 32 ++--
arch/powerpc/sysdev/mpic.c | 2 -
arch/powerpc/sysdev/ppc4xx_soc.c | 2 +-
arch/powerpc/sysdev/xics/xics-common.c | 5 +-
drivers/ps3/ps3-vuart.c | 2 +-
drivers/ps3/ps3stor_lib.c | 2 +-
sound/ppc/snd_ps3.c | 2 +-
27 files changed, 343 insertions(+), 62 deletions(-)
create mode 100644 arch/powerpc/boot/dts/charon.dts