please pull the powerpc-merge.git tree

Paul Mackerras paulus at samba.org
Fri Nov 11 23:12:27 EST 2005


Linus,

Please do a pull from

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

to get a powerpc update.  The main thing here is that the VDSO stuff
is now in arch/powerpc, meaning that both 32-bit and 64-bit kernels
export a VDSO to userland.  There are also various minor fixes.

Thanks,
Paul.

Anton Blanchard:
      ppc64: Quieten lparcfg
      ppc64: Remove debug boot message
      ppc64: Cleanup kprobe assembly
      ppc64: prep for NUMA sparsemem rework
      ppc64: prep for NUMA sparsemem rework 2
      ppc64: Convert NUMA to sparsemem (3)
      ppc64: Increase sparsemem defaults

Benjamin Herrenschmidt:
      powerpc: Merge vdso's and add vdso support to 32 bits kernel

David Gibson:
      powerpc: Move udbg code to arch/powerpc

David Woodhouse:
      powerpc: remove initrd debug printk

Kumar Gala:
      ppc32: fix PQ2 PCI DMA interrupt handling

Paul Mackerras:
      powerpc: Initialize secondary CPU setup for 32-bit SMP
      powerpc: Fix reading and writing SPRs from xmon on 32-bit
      powerpc: Fix some compile problems with the VDSO stuff

 arch/powerpc/Kconfig                        |   11 
 arch/powerpc/kernel/Makefile                |   10 
 arch/powerpc/kernel/asm-offsets.c           |   45 +-
 arch/powerpc/kernel/head_32.S               |    1 
 arch/powerpc/kernel/lparcfg.c               |   23 -
 arch/powerpc/kernel/paca.c                  |    7 
 arch/powerpc/kernel/proc_ppc64.c            |    4 
 arch/powerpc/kernel/rtas-proc.c             |    1 
 arch/powerpc/kernel/setup-common.c          |    8 
 arch/powerpc/kernel/setup_64.c              |   62 --
 arch/powerpc/kernel/signal_32.c             |   12 
 arch/powerpc/kernel/smp.c                   |    4 
 arch/powerpc/kernel/sysfs.c                 |    1 
 arch/powerpc/kernel/time.c                  |   40 +
 arch/powerpc/kernel/traps.c                 |    1 
 arch/powerpc/kernel/udbg.c                  |    0 
 arch/powerpc/kernel/udbg_16550.c            |    0 
 arch/powerpc/kernel/udbg_scc.c              |    0 
 arch/powerpc/kernel/vdso.c                  |  746 +++++++++++++++++++++++++++
 arch/powerpc/kernel/vdso32/Makefile         |    6 
 arch/powerpc/kernel/vdso32/cacheflush.S     |    0 
 arch/powerpc/kernel/vdso32/datapage.S       |   16 +
 arch/powerpc/kernel/vdso32/gettimeofday.S   |  315 +++++++++++
 arch/powerpc/kernel/vdso32/note.S           |    0 
 arch/powerpc/kernel/vdso32/sigtramp.S       |    0 
 arch/powerpc/kernel/vdso32/vdso32.lds.S     |    5 
 arch/powerpc/kernel/vdso32/vdso32_wrapper.S |    2 
 arch/powerpc/kernel/vdso64/Makefile         |    0 
 arch/powerpc/kernel/vdso64/cacheflush.S     |    0 
 arch/powerpc/kernel/vdso64/datapage.S       |   16 +
 arch/powerpc/kernel/vdso64/gettimeofday.S   |  242 +++++++++
 arch/powerpc/kernel/vdso64/note.S           |    0 
 arch/powerpc/kernel/vdso64/sigtramp.S       |    0 
 arch/powerpc/kernel/vdso64/vdso64.lds.S     |    5 
 arch/powerpc/kernel/vdso64/vdso64_wrapper.S |    2 
 arch/powerpc/mm/mem.c                       |    4 
 arch/powerpc/mm/numa.c                      |  367 ++++++-------
 arch/powerpc/oprofile/op_model_power4.c     |    1 
 arch/powerpc/platforms/pseries/rtasd.c      |    1 
 arch/powerpc/platforms/pseries/setup.c      |    4 
 arch/powerpc/platforms/pseries/smp.c        |    4 
 arch/powerpc/xmon/xmon.c                    |   25 +
 arch/ppc/kernel/asm-offsets.c               |   28 +
 arch/ppc/syslib/cpm2_pic.c                  |    2 
 arch/ppc64/Kconfig                          |   11 
 arch/ppc64/kernel/Makefile                  |   10 
 arch/ppc64/kernel/misc.S                    |    3 
 arch/ppc64/kernel/vdso32/gettimeofday.S     |  140 -----
 arch/ppc64/kernel/vdso64/gettimeofday.S     |   91 ---
 include/asm-powerpc/auxvec.h                |    2 
 include/asm-powerpc/elf.h                   |   10 
 include/asm-powerpc/irq.h                   |    1 
 include/asm-powerpc/processor.h             |    2 
 include/asm-powerpc/sparsemem.h             |    4 
 include/asm-powerpc/systemcfg.h             |   64 --
 include/asm-powerpc/topology.h              |   12 
 include/asm-powerpc/udbg.h                  |   14 -
 include/asm-powerpc/vdso.h                  |    0 
 include/asm-powerpc/vdso_datapage.h         |  108 ++++
 include/asm-ppc/page.h                      |    8 
 include/asm-ppc64/mmzone.h                  |   69 --
 include/asm-ppc64/page.h                    |    5 
 62 files changed, 1789 insertions(+), 786 deletions(-)
 rename arch/{ppc64/kernel/udbg.c => powerpc/kernel/udbg.c} (100%)
 rename arch/{ppc64/kernel/udbg_16550.c => powerpc/kernel/udbg_16550.c} (100%)
 rename arch/{ppc64/kernel/udbg_scc.c => powerpc/kernel/udbg_scc.c} (100%)
 create mode 100644 arch/powerpc/kernel/vdso.c
 rename arch/{ppc64/kernel/vdso32/Makefile => powerpc/kernel/vdso32/Makefile} (92%)
 rename arch/{ppc64/kernel/vdso32/cacheflush.S => powerpc/kernel/vdso32/cacheflush.S} (100%)
 rename arch/{ppc64/kernel/vdso32/datapage.S => powerpc/kernel/vdso32/datapage.S} (94%)
 create mode 100644 arch/powerpc/kernel/vdso32/gettimeofday.S
 rename arch/{ppc64/kernel/vdso32/note.S => powerpc/kernel/vdso32/note.S} (100%)
 rename arch/{ppc64/kernel/vdso32/sigtramp.S => powerpc/kernel/vdso32/sigtramp.S} (100%)
 rename arch/{ppc64/kernel/vdso32/vdso32.lds.S => powerpc/kernel/vdso32/vdso32.lds.S} (97%)
 rename arch/{ppc64/kernel/vdso32/vdso32_wrapper.S => powerpc/kernel/vdso32/vdso32_wrapper.S} (86%)
 rename arch/{ppc64/kernel/vdso64/Makefile => powerpc/kernel/vdso64/Makefile} (100%)
 rename arch/{ppc64/kernel/vdso64/cacheflush.S => powerpc/kernel/vdso64/cacheflush.S} (100%)
 rename arch/{ppc64/kernel/vdso64/datapage.S => powerpc/kernel/vdso64/datapage.S} (96%)
 create mode 100644 arch/powerpc/kernel/vdso64/gettimeofday.S
 rename arch/{ppc64/kernel/vdso64/note.S => powerpc/kernel/vdso64/note.S} (100%)
 rename arch/{ppc64/kernel/vdso64/sigtramp.S => powerpc/kernel/vdso64/sigtramp.S} (100%)
 rename arch/{ppc64/kernel/vdso64/vdso64.lds.S => powerpc/kernel/vdso64/vdso64.lds.S} (98%)
 rename arch/{ppc64/kernel/vdso64/vdso64_wrapper.S => powerpc/kernel/vdso64/vdso64_wrapper.S} (86%)
 delete mode 100644 arch/ppc64/kernel/vdso32/gettimeofday.S
 delete mode 100644 arch/ppc64/kernel/vdso64/gettimeofday.S
 delete mode 100644 include/asm-powerpc/systemcfg.h
 rename include/{asm-ppc64/udbg.h => asm-powerpc/udbg.h} (80%)
 rename include/{asm-ppc64/vdso.h => asm-powerpc/vdso.h} (100%)
 create mode 100644 include/asm-powerpc/vdso_datapage.h



More information about the Linuxppc64-dev mailing list