diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-29 11:28:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-29 11:28:30 -0800 |
| commit | 76babde121d2ffef04ca692ce64ef9f8a9866086 (patch) | |
| tree | 294923bbb4974258d86d223e35eee691abacdfb1 | |
| parent | e71ac6032edf77a1e4a81f3e3b260807e94b37a5 (diff) | |
| parent | 15e812ad849e142e3dfc984d33c4d8042389f148 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (67 commits)
[PATCH] powerpc: Remove oprofile spinlock backtrace code
[PATCH] powerpc: Add oprofile calltrace support to all powerpc cpus
[PATCH] powerpc: Add oprofile calltrace support
[PATCH] for_each_possible_cpu: ppc
[PATCH] for_each_possible_cpu: powerpc
[PATCH] lock PTE before updating it in 440/BookE page fault handler
[PATCH] powerpc: Kill _machine and hard-coded platform numbers
ppc: Fix compile error in arch/ppc/lib/strcase.c
[PATCH] git-powerpc: WARN was a dumb idea
[PATCH] powerpc: a couple of trivial compile warning fixes
powerpc: remove OCP references
powerpc: Make uImage default build output for MPC8540 ADS
powerpc: move math-emu over to arch/powerpc
powerpc: use memparse() for mem= command line parsing
ppc: fix strncasecmp prototype
[PATCH] powerpc: make ISA floppies work again
[PATCH] powerpc: Fix some initcall return values
[PATCH] powerpc: Workaround for pSeries RTAS bug
[PATCH] spufs: fix __init/__exit annotations
[PATCH] powerpc: add hvc backend for rtas
...
| -rw-r--r-- | Documentation/powerpc/booting-without-of.txt | 5 | ||||
| -rw-r--r-- | arch/powerpc/Kconfig | 4 | ||||
| -rw-r--r-- | arch/powerpc/Kconfig.debug | 5 | ||||
| -rw-r--r-- | arch/powerpc/Makefile | 7 | ||||
| -rw-r--r-- | arch/powerpc/configs/cell_defconfig | 133 | ||||
| -rw-r--r-- | arch/powerpc/configs/mpc8540_ads_defconfig | 43 | ||||
| -rw-r--r-- | arch/powerpc/kernel/Makefile | 11 | ||||
| -rw-r--r-- | arch/powerpc/kernel/asm-offsets.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/kernel/cpu_setup_6xx.S (renamed from arch/ppc/kernel/cpu_setup_6xx.S) | 0 | ||||
| -rw-r--r-- | arch/powerpc/kernel/entry_32.S | 8 | ||||
| -rw-r--r-- | arch/powerpc/kernel/entry_64.S | 6 | ||||
| -rw-r--r-- | arch/powerpc/kernel/firmware.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/kernel/head_64.S | 32 | ||||
| -rw-r--r-- | arch/powerpc/kernel/idle.c (renamed from arch/powerpc/kernel/idle_64.c) | 79 | ||||
| -rw-r--r-- | arch/powerpc/kernel/idle_6xx.S | 18 | ||||
| -rw-r--r-- | arch/powerpc/kernel/idle_power4.S | 38 | ||||
| -rw-r--r-- | arch/powerpc/kernel/irq.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/kernel/l2cr_6xx.S (renamed from arch/ppc/kernel/l2cr.S) | 0 | ||||
| -rw-r--r-- | arch/powerpc/kernel/legacy_serial.c | 42 | ||||
| -rw-r--r-- | arch/powerpc/kernel/lparcfg.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/kernel/module_32.c (renamed from arch/ppc/kernel/module.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/kernel/nvram_64.c | 7 | ||||
| -rw-r--r-- | arch/powerpc/kernel/paca.c | 21 | ||||
| -rw-r--r-- | arch/powerpc/kernel/pci_32.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/kernel/pci_64.c | 1 | ||||
| -rw-r--r-- | arch/powerpc/kernel/perfmon_fsl_booke.c (renamed from arch/ppc/kernel/perfmon_fsl_booke.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/kernel/proc_ppc64.c | 3 | ||||
| -rw-r--r-- | arch/powerpc/kernel/process.c | 11 | ||||
| -rw-r--r-- | arch/powerpc/kernel/prom.c | 154 | ||||
| -rw-r--r-- | arch/powerpc/kernel/prom_init.c | 68 | ||||
| -rw-r--r-- | arch/powerpc/kernel/rtas-proc.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/kernel/rtas.c | 8 | ||||
| -rw-r--r-- | arch/powerpc/kernel/setup-common.c | 70 | ||||
| -rw-r--r-- | arch/powerpc/kernel/setup_32.c | 75 | ||||
| -rw-r--r-- | arch/powerpc/kernel/setup_64.c | 78 | ||||
| -rw-r--r-- | arch/powerpc/kernel/signal_32.c | 1 | ||||
| -rw-r--r-- | arch/powerpc/kernel/signal_64.c | 3 | ||||
| -rw-r--r-- | arch/powerpc/kernel/smp.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/kernel/swsusp_32.S (renamed from arch/ppc/kernel/swsusp.S) | 0 | ||||
| -rw-r--r-- | arch/powerpc/kernel/syscalls.c | 1 | ||||
| -rw-r--r-- | arch/powerpc/kernel/sysfs.c | 12 | ||||
| -rw-r--r-- | arch/powerpc/kernel/tau_6xx.c (renamed from arch/ppc/kernel/temp.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/kernel/time.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/kernel/traps.c | 35 | ||||
| -rw-r--r-- | arch/powerpc/kernel/vdso.c | 9 | ||||
| -rw-r--r-- | arch/powerpc/kernel/vmlinux.lds.S | 381 | ||||
| -rw-r--r-- | arch/powerpc/lib/sstep.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/Makefile (renamed from arch/ppc/math-emu/Makefile) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/double.h (renamed from arch/ppc/math-emu/double.h) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fabs.c (renamed from arch/ppc/math-emu/fabs.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fadd.c (renamed from arch/ppc/math-emu/fadd.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fadds.c (renamed from arch/ppc/math-emu/fadds.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fcmpo.c (renamed from arch/ppc/math-emu/fcmpo.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fcmpu.c (renamed from arch/ppc/math-emu/fcmpu.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fctiw.c (renamed from arch/ppc/math-emu/fctiw.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fctiwz.c (renamed from arch/ppc/math-emu/fctiwz.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fdiv.c (renamed from arch/ppc/math-emu/fdiv.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fdivs.c (renamed from arch/ppc/math-emu/fdivs.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fmadd.c (renamed from arch/ppc/math-emu/fmadd.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fmadds.c (renamed from arch/ppc/math-emu/fmadds.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fmr.c (renamed from arch/ppc/math-emu/fmr.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fmsub.c (renamed from arch/ppc/math-emu/fmsub.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fmsubs.c (renamed from arch/ppc/math-emu/fmsubs.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fmul.c (renamed from arch/ppc/math-emu/fmul.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fmuls.c (renamed from arch/ppc/math-emu/fmuls.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fnabs.c (renamed from arch/ppc/math-emu/fnabs.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fneg.c (renamed from arch/ppc/math-emu/fneg.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fnmadd.c (renamed from arch/ppc/math-emu/fnmadd.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fnmadds.c (renamed from arch/ppc/math-emu/fnmadds.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fnmsub.c (renamed from arch/ppc/math-emu/fnmsub.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fnmsubs.c (renamed from arch/ppc/math-emu/fnmsubs.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fres.c (renamed from arch/ppc/math-emu/fres.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/frsp.c (renamed from arch/ppc/math-emu/frsp.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/frsqrte.c (renamed from arch/ppc/math-emu/frsqrte.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fsel.c (renamed from arch/ppc/math-emu/fsel.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fsqrt.c (renamed from arch/ppc/math-emu/fsqrt.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fsqrts.c (renamed from arch/ppc/math-emu/fsqrts.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fsub.c (renamed from arch/ppc/math-emu/fsub.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/fsubs.c (renamed from arch/ppc/math-emu/fsubs.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/lfd.c (renamed from arch/ppc/math-emu/lfd.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/lfs.c (renamed from arch/ppc/math-emu/lfs.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/math.c (renamed from arch/ppc/math-emu/math.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/mcrfs.c (renamed from arch/ppc/math-emu/mcrfs.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/mffs.c (renamed from arch/ppc/math-emu/mffs.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/mtfsb0.c (renamed from arch/ppc/math-emu/mtfsb0.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/mtfsb1.c (renamed from arch/ppc/math-emu/mtfsb1.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/mtfsf.c (renamed from arch/ppc/math-emu/mtfsf.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/mtfsfi.c (renamed from arch/ppc/math-emu/mtfsfi.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/op-1.h (renamed from arch/ppc/math-emu/op-1.h) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/op-2.h (renamed from arch/ppc/math-emu/op-2.h) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/op-4.h (renamed from arch/ppc/math-emu/op-4.h) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/op-common.h (renamed from arch/ppc/math-emu/op-common.h) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/sfp-machine.h (renamed from arch/ppc/math-emu/sfp-machine.h) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/single.h (renamed from arch/ppc/math-emu/single.h) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/soft-fp.h (renamed from arch/ppc/math-emu/soft-fp.h) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/stfd.c (renamed from arch/ppc/math-emu/stfd.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/stfiwx.c (renamed from arch/ppc/math-emu/stfiwx.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/stfs.c (renamed from arch/ppc/math-emu/stfs.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/types.c (renamed from arch/ppc/math-emu/types.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/math-emu/udivmodti4.c (renamed from arch/ppc/math-emu/udivmodti4.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/mm/fault.c | 30 | ||||
| -rw-r--r-- | arch/powerpc/mm/hash_utils_64.c | 7 | ||||
| -rw-r--r-- | arch/powerpc/mm/mem.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/mm/numa.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/mm/pgtable_32.c | 6 | ||||
| -rw-r--r-- | arch/powerpc/mm/stab.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/oprofile/Makefile | 2 | ||||
| -rw-r--r-- | arch/powerpc/oprofile/backtrace.c | 126 | ||||
| -rw-r--r-- | arch/powerpc/oprofile/common.c | 9 | ||||
| -rw-r--r-- | arch/powerpc/oprofile/op_model_7450.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/oprofile/op_model_fsl_booke.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/oprofile/op_model_power4.c | 45 | ||||
| -rw-r--r-- | arch/powerpc/oprofile/op_model_rs64.c | 5 | ||||
| -rw-r--r-- | arch/powerpc/platforms/85xx/Kconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/Kconfig | 5 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/Makefile | 10 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/interrupt.c | 133 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/interrupt.h | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/iommu.c | 16 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/pervasive.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/setup.c | 11 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/spider-pic.c | 108 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/spu_base.c | 17 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/spu_callbacks.c | 345 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/spufs/backing_ops.c | 47 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/spufs/context.c | 24 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/spufs/file.c | 523 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/spufs/hw_ops.c | 57 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/spufs/inode.c | 6 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/spufs/run.c | 91 | ||||
| -rw-r--r-- |