[Xen-devel] please pull xenppc-unstable-merge

Hi Keir, please pull from xenppc-unstable-merge.hg.

Since it's all PowerPC changes, I don't think the 3.0.3 merge should
hold this up. The merge was fairly painful, and I'm hoping not to lag
further behind xen-unstable...

(I had to create a merge changeset, so you'll want to use -M when
looking at it, e.g. 'hg outgoing -pM xen-unstable.hg | diffstat'.)

 .hgignore                                    |    2
 a/xen/arch/powerpc/htab.c                    |   68 -----
 b/xen/arch/powerpc/backtrace.c               |  194 ++++++++++++++++
 b/xen/arch/powerpc/memory.c                  |  210 +++++++++++++++++
 b/xen/arch/powerpc/ofd_fixup_memory.c        |  107 ++++++++
 b/xen/arch/powerpc/shadow.c                  |   36 +++
 tools/libxc/powerpc64/xc_linux_build.c       |    6
 xen/arch/powerpc/Makefile                    |   33 ++
 xen/arch/powerpc/Rules.mk                    |    2
 xen/arch/powerpc/backtrace.c                 |   33 +-
 xen/arch/powerpc/boot_of.c                   |  238 +++++++++++++------
 xen/arch/powerpc/dart_u3.c                   |    8
 xen/arch/powerpc/dom0_ops.c                  |   48 ++--
 xen/arch/powerpc/domain.c                    |   78 +++---
 xen/arch/powerpc/domain_build.c              |  108 +++++----
 xen/arch/powerpc/exceptions.c                |    2
 xen/arch/powerpc/exceptions.h                |    3
 xen/arch/powerpc/external.c                  |    3
 xen/arch/powerpc/iommu.c                     |   17 -
 xen/arch/powerpc/memory.c                    |    6
 xen/arch/powerpc/mm.c                        |  298 +++++++++++++++++++++---
 xen/arch/powerpc/mpic.c                      |    6
 xen/arch/powerpc/ofd_fixup.c                 |  101 --------
 xen/arch/powerpc/oftree.h                    |   10
 xen/arch/powerpc/papr/tce.c                  |    6
 xen/arch/powerpc/papr/xlate.c                |   46 +++
 xen/arch/powerpc/powerpc64/exceptions.S      |   37 +++
 xen/arch/powerpc/powerpc64/ppc970.c          |  126 ++++++----
 xen/arch/powerpc/setup.c                     |  323 ++++++++++++++-------------
 xen/arch/powerpc/shadow.c                    |  159 +++++++++++--
 xen/arch/powerpc/xen.lds.S                   |   10
 xen/include/asm-powerpc/config.h             |    4
 xen/include/asm-powerpc/current.h            |    4
 xen/include/asm-powerpc/domain.h             |    9
 xen/include/asm-powerpc/htab.h               |    4
 xen/include/asm-powerpc/mm.h                 |  183 +++++++++------
 xen/include/asm-powerpc/powerpc64/procarea.h |    1
 xen/include/asm-powerpc/processor.h          |    9
 xen/include/asm-powerpc/shadow.h             |   24 +-
 xen/include/asm-powerpc/smp.h                |    4
 xen/include/asm-powerpc/types.h              |   19 +
 41 files changed, 1827 insertions(+), 758 deletions(-)

-- 
Hollis Blanchard
IBM Linux Technology Center


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel