please pull powerpc-merge.git
Paul Mackerras
paulus at samba.org
Sat Jan 14 15:23:03 EST 2006
Linus,
Please pull
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge.git
Various bits in there, including a patch to fix the "G4" symbol clash
between oprofile and the wacom driver, a patch from Anton to
strengthen the barriers in the atomics and bitops, my patch to provide
an AT_PLATFORM value to userland, plus initial ports of some embedded
platforms over to ARCH=powerpc. Diffstat and shortlog follow.
Thanks,
Paul.
arch/powerpc/Makefile | 7
arch/powerpc/boot/Makefile | 49 +
arch/powerpc/boot/crt0.S | 21 -
arch/powerpc/boot/hack-coff.c | 84 ++
arch/powerpc/boot/main.c | 46 +
arch/powerpc/boot/prom.c | 538 +++------------
arch/powerpc/boot/prom.h | 36 +
arch/powerpc/boot/rs6000.h | 243 +++++++
arch/powerpc/boot/stdio.c | 325 +++++++++
arch/powerpc/boot/stdio.h | 6
arch/powerpc/boot/string.S | 20 -
arch/powerpc/boot/zImage.coff.lds | 46 +
arch/powerpc/configs/mpc834x_sys_defconfig | 911 ++++++++++++++++++++++++++
arch/powerpc/kernel/asm-offsets.c | 2
arch/powerpc/kernel/cpu_setup_power4.S | 4
arch/powerpc/kernel/cputable.c | 224 ++++--
arch/powerpc/kernel/entry_32.S | 2
arch/powerpc/kernel/entry_64.S | 15
arch/powerpc/kernel/fpu.S | 10
arch/powerpc/kernel/head_64.S | 112 ++-
arch/powerpc/kernel/idle_power4.S | 8
arch/powerpc/kernel/irq.c | 12
arch/powerpc/kernel/lparcfg.c | 13
arch/powerpc/kernel/misc_32.S | 4
arch/powerpc/kernel/misc_64.S | 10
arch/powerpc/kernel/paca.c | 36 +
arch/powerpc/kernel/ppc_ksyms.c | 3
arch/powerpc/kernel/prom.c | 109 +++
arch/powerpc/kernel/prom_parse.c | 3
arch/powerpc/kernel/rtas.c | 96 +++
arch/powerpc/kernel/setup-common.c | 9
arch/powerpc/kernel/time.c | 2
arch/powerpc/lib/locks.c | 8
arch/powerpc/oprofile/common.c | 8
arch/powerpc/platforms/83xx/Kconfig | 1
arch/powerpc/platforms/83xx/mpc834x_sys.c | 243 +++++++
arch/powerpc/platforms/83xx/mpc834x_sys.h | 23 +
arch/powerpc/platforms/83xx/mpc83xx.h | 14
arch/powerpc/platforms/83xx/pci.c | 99 +++
arch/powerpc/platforms/chrp/pci.c | 27 -
arch/powerpc/platforms/chrp/setup.c | 7
arch/powerpc/platforms/chrp/time.c | 7
arch/powerpc/platforms/iseries/irq.c | 6
arch/powerpc/platforms/iseries/misc.S | 3
arch/powerpc/platforms/iseries/setup.c | 8
arch/powerpc/platforms/iseries/smp.c | 2
arch/powerpc/platforms/pseries/lpar.c | 4
arch/powerpc/platforms/pseries/reconfig.c | 100 +++
arch/powerpc/platforms/pseries/setup.c | 20 -
arch/powerpc/sysdev/Makefile | 1
arch/powerpc/sysdev/fsl_soc.c | 317 +++++++++
arch/powerpc/sysdev/fsl_soc.h | 8
arch/ppc/kernel/head_8xx.S | 77 ++
arch/ppc/kernel/ppc_ksyms.c | 1
arch/ppc/platforms/83xx/mpc834x_sys.c | 10
arch/ppc/platforms/85xx/mpc8540_ads.c | 14
arch/ppc/platforms/85xx/mpc8560_ads.c | 11
arch/ppc/platforms/85xx/mpc85xx_cds_common.c | 16
arch/ppc/platforms/85xx/sbc8560.c | 10
arch/ppc/platforms/85xx/stx_gp3.c | 10
arch/ppc/platforms/85xx/tqm85xx.c | 16
arch/ppc/syslib/mpc83xx_devices.c | 10
arch/ppc/syslib/mpc85xx_devices.c | 10
drivers/macintosh/macio-adb.c | 13
fs/proc/proc_devtree.c | 24 +
include/asm-powerpc/atomic.h | 46 +
include/asm-powerpc/bitops.h | 6
include/asm-powerpc/cputable.h | 14
include/asm-powerpc/elf.h | 16
include/asm-powerpc/futex.h | 2
include/asm-powerpc/hvcall.h | 5
include/asm-powerpc/lppaca.h | 6
include/asm-powerpc/paca.h | 14
include/asm-powerpc/ppc_asm.h | 76 +-
include/asm-powerpc/prom.h | 8
include/asm-powerpc/spinlock.h | 21 -
include/asm-powerpc/synch.h | 23 -
include/asm-powerpc/system.h | 8
include/asm-powerpc/time.h | 5
include/linux/proc_fs.h | 5
80 files changed, 3452 insertions(+), 937 deletions(-)
create mode 100644 arch/powerpc/boot/hack-coff.c
create mode 100644 arch/powerpc/boot/rs6000.h
create mode 100644 arch/powerpc/boot/stdio.c
create mode 100644 arch/powerpc/boot/zImage.coff.lds
create mode 100644 arch/powerpc/configs/mpc834x_sys_defconfig
create mode 100644 arch/powerpc/platforms/83xx/mpc834x_sys.c
create mode 100644 arch/powerpc/platforms/83xx/mpc834x_sys.h
create mode 100644 arch/powerpc/platforms/83xx/mpc83xx.h
create mode 100644 arch/powerpc/platforms/83xx/pci.c
create mode 100644 arch/powerpc/sysdev/fsl_soc.c
create mode 100644 arch/powerpc/sysdev/fsl_soc.h
Andy Whitcroft:
powerpc: oprofile cpu type names clash with other code
Anton Blanchard:
powerpc: use lwsync in atomics, bitops, lock functions
powerpc: reformat atomic_add_unless
Dave C Boutcher:
powerpc: Add some more pSeries hypervisor call constants
powerpc: Add/remove/update properties in /proc/device-tree
powerpc: Add/remove/update properties in firmware device tree
powerpc: Add of_find_property function
powerpc: Add support for changing properties from userspace
powerpc: special-case ibm,suspend-me RTAS call
David Gibson:
powerpc: Cleanup LOADADDR etc. asm macros
powerpc: Remove lppaca structure from the PACA
David Woodhouse:
powerpc: Make CHRP build again
powerpc: macio-adb build fix
Kumar Gala:
powerpc: Updated platforms that use gianfar to match driver
powerpc: Allow for ppc_md restart, power_off, and halt to be NULL
powerpc: Add FSL SOC library and setup code
powerpc: Add MPC834x SYS board to arch/powerpc
Marcelo Tosatti:
powerpc/8xx: Use 8MB D-TLB's for kernel static mapping faults
Paul Mackerras:
powerpc: Provide a suitable AT_PLATFORM value
ppc: Remove duplicate export of get_wchan
powerpc: Make COFF zImages for old 32-bit powermacs
powerpc: Avoid unaligned loads and stores in boot memcpy code
powerpc: Recognize /chaos bridge on old pmacs as PCI
Tom Rini:
Remove bzImage target
powerpc/boot: Better use of defaultimage-
More information about the Linuxppc64-dev
mailing list