please pull powerpc-merge.git
Paul Mackerras
paulus at samba.org
Tue Nov 15 12:10:56 EST 2005
Linus,
Please do another pull from
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge.git
This is the same as the last lot I asked you to pull except that I
have taken out the "GX bus support on pSeries machines" patch that
needs a bit more work. Apart from various small bugfixes, including
some VDSO fixes from Ben, this moves most of the remaining ppc64 stuff
over to arch/powerpc and include/asm-powerpc.
Thanks,
Paul.
Benjamin Herrenschmidt:
powerpc: Always rebuild arch/powerpc/include/asm symlink
powerpc: vdso fixes (take #2)
powerpc: kill ppc64 rtc.c, use genrtc instead
Michael Ellerman:
powerpc: Merge page.h
powerpc: Turn cpu_irq_down into kexec_cpu_down
powerpc: Export htab start/end via device tree
Paul Mackerras:
powerpc: Move a bunch of ppc64 headers to include/asm-powerpc
powerpc: Move most remaining ppc64 files over to arch/powerpc
powerpc: Export a couple of prom functions
powerpc: Mark PREP and embedded as broken for now
powerpc: Fix 32-bit compile: PPC_MEMSTART was undeclared
powerpc: Fix clearing of the FPSCR when invoking a signal handler
powerpc: Remove an extraneous and incorrect declaration of pmac_nvram_init.
powerpc: Remove __init from a function used in suspend/resume.
Stephen Rothwell:
powerpc: make iSeries use generic virtual irq mapping
powerpc: have only one definition of __irq_offset_value
powerpc: iSeries build fixes
arch/powerpc/Kconfig | 5
arch/powerpc/Makefile | 2
arch/powerpc/configs/pseries_defconfig | 206 ++-
arch/powerpc/kernel/Makefile | 20
arch/powerpc/kernel/asm-offsets.c | 6
arch/powerpc/kernel/dma_64.c | 0
arch/powerpc/kernel/iomap.c | 0
arch/powerpc/kernel/iommu.c | 0
arch/powerpc/kernel/irq.c | 9
arch/powerpc/kernel/kprobes.c | 0
arch/powerpc/kernel/lparcfg.c | 51 -
arch/powerpc/kernel/machine_kexec_64.c | 63 +
arch/powerpc/kernel/module_64.c | 0
arch/powerpc/kernel/pci_64.c | 0
arch/powerpc/kernel/pci_direct_iommu.c | 0
arch/powerpc/kernel/pci_dn.c | 0
arch/powerpc/kernel/pci_iommu.c | 0
arch/powerpc/kernel/prom.c | 2
arch/powerpc/kernel/rtas-rtc.c | 105 +
arch/powerpc/kernel/setup_32.c | 4
arch/powerpc/kernel/setup_64.c | 5
arch/powerpc/kernel/signal_32.c | 7
arch/powerpc/kernel/signal_64.c | 6
arch/powerpc/kernel/vdso32/datapage.S | 3
arch/powerpc/kernel/vdso32/gettimeofday.S | 12
arch/powerpc/kernel/vdso64/datapage.S | 1
arch/powerpc/kernel/vdso64/gettimeofday.S | 31
arch/powerpc/platforms/iseries/irq.c | 25
arch/powerpc/platforms/iseries/setup.c | 6
arch/powerpc/platforms/powermac/time.c | 9
arch/powerpc/platforms/pseries/Makefile | 5
arch/powerpc/platforms/pseries/hvconsole.c | 0
arch/powerpc/platforms/pseries/hvcserver.c | 0
arch/powerpc/platforms/pseries/setup.c | 26
arch/ppc64/Kconfig | 520 -------
arch/ppc64/kernel/Makefile | 41 -
arch/ppc64/kernel/asm-offsets.c | 195 ---
arch/ppc64/kernel/btext.c | 792 -----------
arch/ppc64/kernel/head.S | 2007 ---------------------------
arch/ppc64/kernel/misc.S | 940 -------------
arch/ppc64/kernel/ppc_ksyms.c | 76 -
arch/ppc64/kernel/prom.c | 1956 ---------------------------
arch/ppc64/kernel/prom_init.c | 2051 ----------------------------
arch/ppc64/kernel/rtc.c | 358 -----
arch/ppc64/kernel/semaphore.c | 136 --
arch/ppc64/kernel/vdso.c | 625 ---------
arch/ppc64/kernel/vmlinux.lds.S | 151 --
arch/ppc64/xmon/privinst.h | 64 -
drivers/char/Kconfig | 2
include/asm-powerpc/btext.h | 0
include/asm-powerpc/delay.h | 19
include/asm-powerpc/eeh.h | 0
include/asm-powerpc/floppy.h | 25
include/asm-powerpc/hvconsole.h | 0
include/asm-powerpc/hvcserver.h | 0
include/asm-powerpc/kexec.h | 1
include/asm-powerpc/machdep.h | 4
include/asm-powerpc/nvram.h | 17
include/asm-powerpc/page.h | 179 ++
include/asm-powerpc/page_32.h | 40 +
include/asm-powerpc/page_64.h | 174 ++
include/asm-powerpc/serial.h | 18
include/asm-powerpc/vdso_datapage.h | 2
include/asm-ppc/nvram.h | 73 -
include/asm-ppc64/page.h | 328 ----
include/asm-ppc64/prom.h | 220 ---
include/asm-ppc64/serial.h | 23
include/asm-ppc64/system.h | 310 ----
68 files changed, 879 insertions(+), 11077 deletions(-)
rename arch/{ppc64/kernel/dma.c => powerpc/kernel/dma_64.c} (100%)
rename arch/{ppc64/kernel/iomap.c => powerpc/kernel/iomap.c} (100%)
rename arch/{ppc64/kernel/iommu.c => powerpc/kernel/iommu.c} (100%)
rename arch/{ppc64/kernel/kprobes.c => powerpc/kernel/kprobes.c} (100%)
rename arch/{ppc64/kernel/machine_kexec.c => powerpc/kernel/machine_kexec_64.c} (84%)
rename arch/{ppc64/kernel/module.c => powerpc/kernel/module_64.c} (100%)
rename arch/{ppc64/kernel/pci.c => powerpc/kernel/pci_64.c} (100%)
rename arch/{ppc64/kernel/pci_direct_iommu.c => powerpc/kernel/pci_direct_iommu.c} (100%)
rename arch/{ppc64/kernel/pci_dn.c => powerpc/kernel/pci_dn.c} (100%)
rename arch/{ppc64/kernel/pci_iommu.c => powerpc/kernel/pci_iommu.c} (100%)
create mode 100644 arch/powerpc/kernel/rtas-rtc.c
rename arch/{ppc64/kernel/hvconsole.c => powerpc/platforms/pseries/hvconsole.c} (100%)
rename arch/{ppc64/kernel/hvcserver.c => powerpc/platforms/pseries/hvcserver.c} (100%)
delete mode 100644 arch/ppc64/Kconfig
delete mode 100644 arch/ppc64/kernel/asm-offsets.c
delete mode 100644 arch/ppc64/kernel/btext.c
delete mode 100644 arch/ppc64/kernel/head.S
delete mode 100644 arch/ppc64/kernel/misc.S
delete mode 100644 arch/ppc64/kernel/ppc_ksyms.c
delete mode 100644 arch/ppc64/kernel/prom.c
delete mode 100644 arch/ppc64/kernel/prom_init.c
delete mode 100644 arch/ppc64/kernel/rtc.c
delete mode 100644 arch/ppc64/kernel/semaphore.c
delete mode 100644 arch/ppc64/kernel/vdso.c
delete mode 100644 arch/ppc64/kernel/vmlinux.lds.S
delete mode 100644 arch/ppc64/xmon/privinst.h
rename include/{asm-ppc64/btext.h => asm-powerpc/btext.h} (100%)
rename include/{asm-ppc64/delay.h => asm-powerpc/delay.h} (71%)
rename include/{asm-ppc64/eeh.h => asm-powerpc/eeh.h} (100%)
rename include/{asm-ppc64/floppy.h => asm-powerpc/floppy.h} (90%)
rename include/{asm-ppc64/hvconsole.h => asm-powerpc/hvconsole.h} (100%)
rename include/{asm-ppc64/hvcserver.h => asm-powerpc/hvcserver.h} (100%)
rename include/{asm-ppc64/nvram.h => asm-powerpc/nvram.h} (84%)
create mode 100644 include/asm-powerpc/page.h
create mode 100644 include/asm-powerpc/page_32.h
create mode 100644 include/asm-powerpc/page_64.h
create mode 100644 include/asm-powerpc/serial.h
delete mode 100644 include/asm-ppc/nvram.h
delete mode 100644 include/asm-ppc64/page.h
delete mode 100644 include/asm-ppc64/prom.h
delete mode 100644 include/asm-ppc64/serial.h
delete mode 100644 include/asm-ppc64/system.h
More information about the Linuxppc64-dev
mailing list