Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

76babde1 · Linus Torvalds <[email protected]> · 2006-03-29 11:28:30 -08:00

* 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
  ...

Commit: 76babde121d2ffef04ca692ce64ef9f8a9866086
Parents: e71ac603 · 15e812ad

Merge commit. Changes below are compared with the first parent: e71ac603.

Changes

265 files changed · +3372 −11751

File	Status	Add	Del	Content
Documentation/powerpc/booting-without-of.txt	modified	+5	−0	View file
arch/powerpc/Kconfig	modified	+2	−2	View file
arch/powerpc/Kconfig.debug	modified	+0	−5	View file
arch/powerpc/Makefile	modified	+1	−6	View file
arch/powerpc/configs/cell_defconfig	modified	+52	−81	View file
arch/powerpc/configs/mpc8540_ads_defconfig	modified	+25	−18	View file
arch/powerpc/kernel/Makefile	modified	+8	−3	View file
arch/powerpc/kernel/asm-offsets.c	modified	+0	−2	View file
arch/ppc/kernel/cpu_setup_6xx.S → arch/powerpc/kernel/cpu_setup_6xx.S	renamed	+0	−0	View file
arch/powerpc/kernel/entry_32.S	modified	+6	−2	View file
arch/powerpc/kernel/entry_64.S	modified	+6	−0	View file
arch/powerpc/kernel/firmware.c	modified	+3	−1	View file
arch/powerpc/kernel/head_64.S	modified	+16	−16	View file
arch/powerpc/kernel/idle_64.c → arch/powerpc/kernel/idle.c	renamed	+40	−39	View file
arch/powerpc/kernel/idle_6xx.S	modified	+2	−16	View file
arch/powerpc/kernel/idle_power4.S	modified	+3	−35	View file
arch/powerpc/kernel/irq.c	modified	+1	−1	View file
arch/ppc/kernel/l2cr.S → arch/powerpc/kernel/l2cr_6xx.S	renamed	+0	−0	View file
arch/powerpc/kernel/legacy_serial.c	modified	+21	−21	View file
arch/powerpc/kernel/lparcfg.c	modified	+2	−2	View file
arch/ppc/kernel/module.c → arch/powerpc/kernel/module_32.c	renamed	+0	−0	View file
arch/powerpc/kernel/nvram_64.c	modified	+4	−3	View file
arch/powerpc/kernel/paca.c	modified	+4	−17	View file
arch/powerpc/kernel/pci_32.c	modified	+2	−2	View file
arch/powerpc/kernel/pci_64.c	modified	+1	−0	View file
arch/ppc/kernel/perfmon_fsl_booke.c → arch/powerpc/kernel/perfmon_fsl_booke.c	renamed	+0	−0	View file
arch/powerpc/kernel/proc_ppc64.c	modified	+2	−1	View file
arch/powerpc/kernel/process.c	modified	+9	−2	View file
arch/powerpc/kernel/prom.c	modified	+98	−56	View file
arch/powerpc/kernel/prom_init.c	modified	+45	−23	View file
arch/powerpc/kernel/rtas-proc.c	modified	+1	−1	View file
arch/powerpc/kernel/rtas.c	modified	+5	−3	View file
arch/powerpc/kernel/setup-common.c	modified	+47	−23	View file
arch/powerpc/kernel/setup_32.c	modified	+10	−65	View file
arch/powerpc/kernel/setup_64.c	modified	+15	−63	View file
arch/powerpc/kernel/signal_32.c	modified	+1	−0	View file
arch/powerpc/kernel/signal_64.c	modified	+2	−1	View file
arch/powerpc/kernel/smp.c	modified	+1	−1	View file
arch/ppc/kernel/swsusp.S → arch/powerpc/kernel/swsusp_32.S	renamed	+0	−0	View file
arch/powerpc/kernel/syscalls.c	modified	+1	−0	View file
arch/powerpc/kernel/sysfs.c	modified	+6	−6	View file
arch/ppc/kernel/temp.c → arch/powerpc/kernel/tau_6xx.c	renamed	+0	−0	View file
arch/powerpc/kernel/time.c	modified	+2	−2	View file
arch/powerpc/kernel/traps.c	modified	+3	−32	View file
arch/powerpc/kernel/vdso.c	modified	+8	−1	View file
arch/powerpc/kernel/vmlinux.lds.S	modified	+181	−200	View file
arch/powerpc/lib/sstep.c	modified	+1	−1	View file
arch/ppc/math-emu/Makefile → arch/powerpc/math-emu/Makefile	renamed	+0	−0	View file
arch/ppc/math-emu/double.h → arch/powerpc/math-emu/double.h	renamed	+0	−0	View file
arch/ppc/math-emu/fabs.c → arch/powerpc/math-emu/fabs.c	renamed	+0	−0	View file
arch/ppc/math-emu/fadd.c → arch/powerpc/math-emu/fadd.c	renamed	+0	−0	View file
arch/ppc/math-emu/fadds.c → arch/powerpc/math-emu/fadds.c	renamed	+0	−0	View file
arch/ppc/math-emu/fcmpo.c → arch/powerpc/math-emu/fcmpo.c	renamed	+0	−0	View file
arch/ppc/math-emu/fcmpu.c → arch/powerpc/math-emu/fcmpu.c	renamed	+0	−0	View file
arch/ppc/math-emu/fctiw.c → arch/powerpc/math-emu/fctiw.c	renamed	+0	−0	View file
arch/ppc/math-emu/fctiwz.c → arch/powerpc/math-emu/fctiwz.c	renamed	+0	−0	View file
arch/ppc/math-emu/fdiv.c → arch/powerpc/math-emu/fdiv.c	renamed	+0	−0	View file
arch/ppc/math-emu/fdivs.c → arch/powerpc/math-emu/fdivs.c	renamed	+0	−0	View file
arch/ppc/math-emu/fmadd.c → arch/powerpc/math-emu/fmadd.c	renamed	+0	−0	View file
arch/ppc/math-emu/fmadds.c → arch/powerpc/math-emu/fmadds.c	renamed	+0	−0	View file
arch/ppc/math-emu/fmr.c → arch/powerpc/math-emu/fmr.c	renamed	+0	−0	View file
arch/ppc/math-emu/fmsub.c → arch/powerpc/math-emu/fmsub.c	renamed	+0	−0	View file
arch/ppc/math-emu/fmsubs.c → arch/powerpc/math-emu/fmsubs.c	renamed	+0	−0	View file
arch/ppc/math-emu/fmul.c → arch/powerpc/math-emu/fmul.c	renamed	+0	−0	View file
arch/ppc/math-emu/fmuls.c → arch/powerpc/math-emu/fmuls.c	renamed	+0	−0	View file
arch/ppc/math-emu/fnabs.c → arch/powerpc/math-emu/fnabs.c	renamed	+0	−0	View file
arch/ppc/math-emu/fneg.c → arch/powerpc/math-emu/fneg.c	renamed	+0	−0	View file
arch/ppc/math-emu/fnmadd.c → arch/powerpc/math-emu/fnmadd.c	renamed	+0	−0	View file
arch/ppc/math-emu/fnmadds.c → arch/powerpc/math-emu/fnmadds.c	renamed	+0	−0	View file
arch/ppc/math-emu/fnmsub.c → arch/powerpc/math-emu/fnmsub.c	renamed	+0	−0	View file
arch/ppc/math-emu/fnmsubs.c → arch/powerpc/math-emu/fnmsubs.c	renamed	+0	−0	View file
arch/ppc/math-emu/fres.c → arch/powerpc/math-emu/fres.c	renamed	+0	−0	View file
arch/ppc/math-emu/frsp.c → arch/powerpc/math-emu/frsp.c	renamed	+0	−0	View file
arch/ppc/math-emu/frsqrte.c → arch/powerpc/math-emu/frsqrte.c	renamed	+0	−0	View file
arch/ppc/math-emu/fsel.c → arch/powerpc/math-emu/fsel.c	renamed	+0	−0	View file
arch/ppc/math-emu/fsqrt.c → arch/powerpc/math-emu/fsqrt.c	renamed	+0	−0	View file
arch/ppc/math-emu/fsqrts.c → arch/powerpc/math-emu/fsqrts.c	renamed	+0	−0	View file
arch/ppc/math-emu/fsub.c → arch/powerpc/math-emu/fsub.c	renamed	+0	−0	View file
arch/ppc/math-emu/fsubs.c → arch/powerpc/math-emu/fsubs.c	renamed	+0	−0	View file
arch/ppc/math-emu/lfd.c → arch/powerpc/math-emu/lfd.c	renamed	+0	−0	View file
arch/ppc/math-emu/lfs.c → arch/powerpc/math-emu/lfs.c	renamed	+0	−0	View file
arch/ppc/math-emu/math.c → arch/powerpc/math-emu/math.c	renamed	+0	−0	View file
arch/ppc/math-emu/mcrfs.c → arch/powerpc/math-emu/mcrfs.c	renamed	+0	−0	View file
arch/ppc/math-emu/mffs.c → arch/powerpc/math-emu/mffs.c	renamed	+0	−0	View file
arch/ppc/math-emu/mtfsb0.c → arch/powerpc/math-emu/mtfsb0.c	renamed	+0	−0	View file
arch/ppc/math-emu/mtfsb1.c → arch/powerpc/math-emu/mtfsb1.c	renamed	+0	−0	View file
arch/ppc/math-emu/mtfsf.c → arch/powerpc/math-emu/mtfsf.c	renamed	+0	−0	View file
arch/ppc/math-emu/mtfsfi.c → arch/powerpc/math-emu/mtfsfi.c	renamed	+0	−0	View file
arch/ppc/math-emu/op-1.h → arch/powerpc/math-emu/op-1.h	renamed	+0	−0	View file
arch/ppc/math-emu/op-2.h → arch/powerpc/math-emu/op-2.h	renamed	+0	−0	View file
arch/ppc/math-emu/op-4.h → arch/powerpc/math-emu/op-4.h	renamed	+0	−0	View file
arch/ppc/math-emu/op-common.h → arch/powerpc/math-emu/op-common.h	renamed	+0	−0	View file
arch/ppc/math-emu/sfp-machine.h → arch/powerpc/math-emu/sfp-machine.h	renamed	+0	−0	View file
arch/ppc/math-emu/single.h → arch/powerpc/math-emu/single.h	renamed	+0	−0	View file
arch/ppc/math-emu/soft-fp.h → arch/powerpc/math-emu/soft-fp.h	renamed	+0	−0	View file
arch/ppc/math-emu/stfd.c → arch/powerpc/math-emu/stfd.c	renamed	+0	−0	View file
arch/ppc/math-emu/stfiwx.c → arch/powerpc/math-emu/stfiwx.c	renamed	+0	−0	View file
arch/ppc/math-emu/stfs.c → arch/powerpc/math-emu/stfs.c	renamed	+0	−0	View file
arch/ppc/math-emu/types.c → arch/powerpc/math-emu/types.c	renamed	+0	−0	View file
arch/ppc/math-emu/udivmodti4.c → arch/powerpc/math-emu/udivmodti4.c	renamed	+0	−0	View file
arch/powerpc/mm/fault.c	modified	+17	−13	View file
arch/powerpc/mm/hash_utils_64.c	modified	+3	−4	View file
arch/powerpc/mm/mem.c	modified	+1	−1	View file
arch/powerpc/mm/numa.c	modified	+2	−0	View file
arch/powerpc/mm/pgtable_32.c	modified	+4	−2	View file
arch/powerpc/mm/stab.c	modified	+1	−1	View file
arch/powerpc/oprofile/Makefile	modified	+1	−1	View file
arch/powerpc/oprofile/backtrace.c	added	+126	−0	View file
arch/powerpc/oprofile/common.c	modified	+1	−8	View file
arch/powerpc/oprofile/op_model_7450.c	modified	+2	−2	View file
arch/powerpc/oprofile/op_model_fsl_booke.c	modified	+2	−2	View file
arch/powerpc/oprofile/op_model_power4.c	modified	+10	−35	View file
arch/powerpc/oprofile/op_model_rs64.c	modified	+4	−1	View file
arch/powerpc/platforms/85xx/Kconfig	modified	+1	−0	View file
arch/powerpc/platforms/cell/Kconfig	modified	+5	−0	View file
arch/powerpc/platforms/cell/Makefile	modified	+8	−2	View file
arch/powerpc/platforms/cell/interrupt.c	modified	+106	−27	View file
arch/powerpc/platforms/cell/interrupt.h	modified	+1	−1	View file
arch/powerpc/platforms/cell/iommu.c	modified	+8	−8	View file
arch/powerpc/platforms/cell/pervasive.c	modified	+2	−2	View file
arch/powerpc/platforms/cell/setup.c	modified	+8	−3	View file
arch/powerpc/platforms/cell/spider-pic.c	modified	+78	−30	View file
arch/powerpc/platforms/cell/spu_base.c	modified	+12	−5	View file
arch/powerpc/platforms/cell/spu_callbacks.c	added	+345	−0	View file
arch/powerpc/platforms/cell/spufs/backing_ops.c	modified	+47	−0	View file
arch/powerpc/platforms/cell/spufs/context.c	modified	+19	−5	View file
arch/powerpc/platforms/cell/spufs/file.c	modified	+517	−6	View file
arch/powerpc/platforms/cell/spufs/hw_ops.c	modified	+57	−0	View file
arch/powerpc/platforms/cell/spufs/inode.c	modified	+3	−3	View file
arch/powerpc/platforms/cell/spufs/run.c	modified	+91	−0	View file
arch/powerpc/platforms/cell/spufs/sched.c	modified	+2	−0	View file
arch/powerpc/platforms/cell/spufs/spufs.h	modified	+26	−2	View file
arch/powerpc/platforms/cell/spufs/switch.c	modified	+2	−1	View file
arch/powerpc/platforms/chrp/chrp.h	modified	+1	−1	View file
arch/powerpc/platforms/chrp/setup.c	modified	+57	−20	View file
arch/powerpc/platforms/iseries/setup.c	modified	+7	−6	View file
arch/powerpc/platforms/maple/setup.c	modified	+6	−4	View file
arch/powerpc/platforms/powermac/bootx_init.c	modified	+2	−4	View file
arch/powerpc/platforms/powermac/feature.c	modified	+1	−1	View file
arch/powerpc/platforms/powermac/low_i2c.c	modified	+3	−0	View file
arch/powerpc/platforms/powermac/nvram.c	modified	+7	−7	View file
arch/powerpc/platforms/powermac/pci.c	modified	+3	−2	View file
arch/powerpc/platforms/powermac/pfunc_base.c	modified	+2	−0	View file
arch/powerpc/platforms/powermac/setup.c	modified	+42	−32	View file
arch/powerpc/platforms/powermac/time.c	modified	+2	−2	View file
arch/powerpc/platforms/powermac/udbg_scc.c	modified	+1	−1	View file
arch/powerpc/platforms/pseries/eeh.c	modified	+1	−1	View file
arch/powerpc/platforms/pseries/eeh_driver.c	modified	+10	−6	View file
arch/powerpc/platforms/pseries/firmware.c	modified	+1	−1	View file
arch/powerpc/platforms/pseries/hvconsole.c	modified	+5	−0	View file
arch/powerpc/platforms/pseries/pci.c	modified	+1	−1	View file
arch/powerpc/platforms/pseries/pci_dlpar.c	modified	+8	−3	View file
arch/powerpc/platforms/pseries/ras.c	modified	+1	−1	View file
arch/powerpc/platforms/pseries/reconfig.c	modified	+3	−2	View file
arch/powerpc/platforms/pseries/rtasd.c	modified	+2	−1	View file
arch/powerpc/platforms/pseries/setup.c	modified	+99	−132	View file
arch/powerpc/platforms/pseries/xics.c	modified	+2	−2	View file
arch/ppc/Kconfig	modified	+31	−62	View file
arch/ppc/Kconfig.debug	modified	+0	−7	View file
arch/ppc/Makefile	modified	+1	−5	View file
arch/ppc/boot/Makefile	modified	+3	−4	View file
arch/ppc/boot/openfirmware/Makefile	deleted	+0	−109	View before deletion
arch/ppc/boot/openfirmware/chrpmain.c	deleted	+0	−101	View before deletion
arch/ppc/boot/openfirmware/common.c	deleted	+0	−146	View before deletion
arch/ppc/boot/openfirmware/dummy.c	deleted	+0	−4	View before deletion
arch/ppc/boot/openfirmware/misc.S	deleted	+0	−67	View before deletion
arch/ppc/boot/openfirmware/start.c	deleted	+0	−172	View before deletion
arch/ppc/boot/simple/mpc10x_memory.c	modified	+2	−2	View file
arch/ppc/boot/simple/relocate.S	modified	+1	−1	View file
arch/ppc/boot/utils/addnote.c	deleted	+0	−175	View before deletion
arch/ppc/boot/utils/hack-coff.c	deleted	+0	−84	View before deletion
arch/ppc/boot/utils/mknote.c	deleted	+0	−44	View before deletion
arch/ppc/configs/ibmchrp_defconfig	deleted	+0	−875	View before deletion
arch/ppc/configs/pmac_defconfig	deleted	+0	−1591	View before deletion
arch/ppc/configs/power3_defconfig	deleted	+0	−1035	View before deletion
arch/ppc/configs/common_defconfig → arch/ppc/configs/prep_defconfig	renamed	+0	−0	View file
arch/ppc/kernel/Makefile	modified	+2	−26	View file
arch/ppc/kernel/entry.S	modified	+6	−54	View file
arch/ppc/kernel/head.S	modified	+4	−179	View file
arch/ppc/kernel/idle.c	deleted	+0	−112	View before deletion
arch/ppc/kernel/idle_6xx.S	deleted	+0	−233	View before deletion
arch/ppc/kernel/idle_power4.S	deleted	+0	−91	View before deletion
arch/ppc/kernel/pci.c	modified	+0	−396	View file
arch/ppc/kernel/ppc_htab.c	modified	+1	−7	View file
arch/ppc/kernel/ppc_ksyms.c	modified	+0	−26	View file
arch/ppc/kernel/setup.c	modified	+8	−248	View file
arch/ppc/kernel/smp.c	modified	+1	−1	View file
arch/ppc/lib/strcase.c	modified	+2	−1	View file
arch/ppc/mm/fault.c	modified	+17	−13	View file
arch/ppc/mm/hashtable.S	modified	+0	−34	View file
arch/ppc/mm/init.c	modified	+0	−13	View file
arch/ppc/mm/mmu_context.c	modified	+1	−1	View file
arch/ppc/mm/pgtable.c	modified	+5	−3	View file
arch/ppc/mm/ppc_mmu.c	modified	+1	−27	View file
arch/ppc/platforms/Makefile	modified	+0	−12	View file
arch/ppc/platforms/chrp_nvram.c	deleted	+0	−83	View before deletion
arch/ppc/platforms/chrp_pci.c	deleted	+0	−309	View before deletion
arch/ppc/platforms/chrp_pegasos_eth.c	deleted	+0	−211	View before deletion
arch/ppc/platforms/chrp_setup.c	deleted	+0	−669	View before deletion
arch/ppc/platforms/chrp_smp.c	deleted	+0	−99	View before deletion
arch/ppc/platforms/chrp_time.c	deleted	+0	−235	View before deletion
arch/ppc/platforms/lite5200.c	modified	+40	−31	View file
arch/ppc/platforms/prep_setup.c	modified	+5	−7	View file
arch/ppc/syslib/Makefile	modified	+0	−2	View file
arch/ppc/syslib/mpc52xx_pci.c	modified	+2	−1	View file
arch/ppc/syslib/mpc52xx_setup.c	modified	+48	−0	View file
arch/ppc/syslib/open_pic.c	modified	+1	−1	View file
arch/ppc/syslib/prom.c	deleted	+0	−1429	View before deletion
arch/ppc/syslib/prom_init.c	deleted	+0	−1011	View before deletion
arch/ppc/xmon/start.c	modified	+1	−1	View file
drivers/char/Kconfig	modified	+17	−0	View file
drivers/char/Makefile	modified	+3	−1	View file
drivers/char/generic_nvram.c	modified	+4	−1	View file
drivers/char/hvc_console.c	modified	+47	−54	View file
drivers/char/hvc_console.h	added	+63	−0	View file
drivers/char/hvc_rtas.c	added	+138	−0	View file
drivers/char/hvc_vio.c	modified	+11	−0	View file
drivers/char/hvcs.c	modified	+0	−1	View file
drivers/ide/pci/via82cxxx.c	modified	+1	−1	View file
drivers/ide/ppc/pmac.c	modified	+1	−1	View file
drivers/ieee1394/ohci1394.c	modified	+2	−2	View file
drivers/macintosh/adb.c	modified	+2	−1	View file
drivers/macintosh/adbhid.c	modified	+2	−2	View file
drivers/macintosh/mediabay.c	modified	+2	−2	View file
drivers/media/video/planb.c	modified	+1	−1	View file
drivers/net/tulip/de4x5.c	modified	+1	−1	View file
drivers/scsi/mesh.c	modified	+1	−1	View file
drivers/usb/core/hcd-pci.c	modified	+2	−2	View file
drivers/video/aty/aty128fb.c	modified	+4	−3	View file
drivers/video/aty/atyfb_base.c	modified	+4	−3	View file
drivers/video/aty/radeon_pm.c	modified	+2	−2	View file
drivers/video/cirrusfb.c	modified	+2	−2	View file
drivers/video/matrox/matroxfb_base.c	modified	+2	−1	View file
drivers/video/nvidia/nvidia.c	modified	+3	−2	View file
drivers/video/radeonfb.c	modified	+1	−1	View file
drivers/video/riva/fbdev.c	modified	+5	−4	View file
fs/partitions/mac.c	modified	+2	−1	View file
fs/proc/proc_devtree.c	modified	+80	−23	View file
include/asm-powerpc/bug.h	modified	+31	−5	View file
include/asm-powerpc/cputable.h	modified	+152	−147	View file
include/asm-powerpc/firmware.h	modified	+4	−6	View file
include/asm-powerpc/floppy.h	modified	+3	−2	View file
include/asm-powerpc/hvcall.h	modified	+1	−0	View file
include/asm-powerpc/hvconsole.h	modified	+8	−18	View file
include/asm-powerpc/machdep.h	modified	+30	−13	View file
include/asm-powerpc/oprofile_impl.h	modified	+4	−13	View file
include/asm-powerpc/paca.h	modified	+2	−0	View file
include/asm-powerpc/percpu.h	modified	+1	−1	View file
include/asm-powerpc/pmac_feature.h	modified	+1	−1	View file
include/asm-powerpc/processor.h	modified	+12	−31	View file
include/asm-powerpc/prom.h	modified	+8	−6	View file
include/asm-powerpc/reg.h	modified	+4	−0	View file
include/asm-powerpc/smp.h	modified	+1	−1	View file
include/asm-powerpc/spu.h	modified	+10	−1	View file
include/asm-powerpc/syscalls.h	added	+58	−0	View file
include/asm-powerpc/unistd.h	modified	+1	−34	View file
include/asm-powerpc/vdso_datapage.h	modified	+3	−0	View file
include/asm-ppc/machdep.h	modified	+13	−4	View file
include/asm-ppc/mpc52xx.h	modified	+4	−0	View file
include/asm-ppc/pgtable.h	modified	+2	−1	View file
include/asm-ppc/prom.h	modified	+8	−148	View file
include/asm-ppc/serial.h	modified	+1	−6	View file
include/linux/pci_ids.h	modified	+1	−0	View file
sound/oss/dmasound/dmasound_awacs.c	modified	+1	−1	View file
sound/ppc/pmac.c	modified	+1	−1	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/powerpc/booting-without-of.txt

View file

diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt
index ee551c6..217e517 100644
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
@@ -719,6 +719,11 @@ address which can extend beyond that limit.
     - model : this is your board name/model
     - #address-cells : address representation for "root" devices
     - #size-cells: the size representation for "root" devices
+    - device_type : This property shouldn't be necessary. However, if
+      you decide to create a device_type for your root node, make sure it
+      is _not_ "chrp" unless your platform is a pSeries or PAPR compliant
+      one for 64-bit, or a CHRP-type machine for 32-bit as this will
+      matched by the kernel this way.
 
   Additionally, some recommended properties are:
 

arch/powerpc/Kconfig

View file

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index a433b71..2cdc35c 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -491,7 +491,7 @@ config PPC601_SYNC_FIX
 	  If in doubt, say Y here.
 
 config TAU
-	bool "Thermal Management Support"
+	bool "On-chip CPU temperature sensor support"
 	depends on 6xx
 	help
 	  G3 and G4 processors have an on-chip temperature sensor called the
@@ -500,7 +500,7 @@ config TAU
 	  on-die temperature in /proc/cpuinfo if the cpu supports it.
 
 	  Unfortunately, on some chip revisions, this sensor is very inaccurate
-	  and in some cases, does not work at all, so don't assume the cpu
+	  and in many cases, does not work at all, so don't assume the cpu
 	  temp is actually what /proc/cpuinfo says it is.
 
 config TAU_INT

arch/powerpc/Kconfig.debug

View file

diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index 9254806..8d48e9e 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -110,11 +110,6 @@ config SERIAL_TEXT_DEBUG
 	depends on 4xx || LOPEC || MV64X60 || PPLUS || PRPMC800 || \
 		PPC_GEN550 || PPC_MPC52xx
 
-config PPC_OCP
-	bool
-	depends on IBM_OCP || XILINX_OCP
-	default y
-
 choice
 	prompt "Early debugging (dangerous)"
 	bool

arch/powerpc/Makefile

View file

diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 829e017..6ec84d3 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -129,13 +129,8 @@ core-y				+= arch/powerpc/kernel/ \
 				   arch/powerpc/lib/ \
 				   arch/powerpc/sysdev/ \
 				   arch/powerpc/platforms/
-core-$(CONFIG_PPC32)		+= arch/ppc/kernel/
-core-$(CONFIG_MATH_EMULATION)	+= arch/ppc/math-emu/
+core-$(CONFIG_MATH_EMULATION)	+= arch/powerpc/math-emu/
 core-$(CONFIG_XMON)		+= arch/powerpc/xmon/
-core-$(CONFIG_APUS)		+= arch/ppc/amiga/
-drivers-$(CONFIG_8xx)		+= arch/ppc/8xx_io/
-drivers-$(CONFIG_4xx)		+= arch/ppc/4xx_io/
-drivers-$(CONFIG_CPM2)		+= arch/ppc/8260_io/
 
 drivers-$(CONFIG_OPROFILE)	+= arch/powerpc/oprofile/
 

arch/powerpc/configs/cell_defconfig

View file

diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig
index 3c2acab..fe22e54 100644
--- a/arch/powerpc/configs/cell_defconfig
+++ b/arch/powerpc/configs/cell_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16-rc6
-# Wed Mar 15 16:19:48 2006
+# Linux kernel version: 2.6.16
+# Thu Mar 23 20:48:09 2006
 #
 CONFIG_PPC64=y
 CONFIG_64BIT=y
@@ -30,6 +30,7 @@ CONFIG_POWER4=y
 CONFIG_PPC_FPU=y
 CONFIG_ALTIVEC=y
 CONFIG_PPC_STD_MMU=y
+CONFIG_VIRT_CPU_ACCOUNTING=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=4
 
@@ -51,7 +52,8 @@ CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
 # CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
 # CONFIG_CPUSETS is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -85,7 +87,7 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_OBSOLETE_MODPARM=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_KMOD is not set
+CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
 
 #
@@ -130,7 +132,8 @@ CONFIG_CELL_IIC=y
 #
 # Cell Broadband Engine options
 #
-CONFIG_SPU_FS=y
+CONFIG_SPU_FS=m
+CONFIG_SPUFS_MMAP=y
 
 #
 # Kernel options
@@ -144,7 +147,7 @@ CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT is not set
 CONFIG_PREEMPT_BKL=y
 CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
+CONFIG_BINFMT_MISC=m
 CONFIG_FORCE_MAX_ZONEORDER=13
 # CONFIG_IOMMU_VMERGE is not set
 CONFIG_KEXEC=y
@@ -155,13 +158,16 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
+# CONFIG_FLATMEM_MANUAL is not set
 # CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_HAVE_MEMORY_PRESENT=y
 # CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPARSEMEM_EXTREME=y
+# CONFIG_MEMORY_HOTPLUG is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_MIGRATION=y
 # CONFIG_PPC_64K_PAGES is not set
 CONFIG_SCHED_SMT=y
 CONFIG_PROC_DEVICETREE=y
@@ -232,6 +238,7 @@ CONFIG_TCP_CONG_BIC=y
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
@@ -244,25 +251,7 @@ CONFIG_NETFILTER=y
 # Core Netfilter Configuration
 #
 # CONFIG_NETFILTER_NETLINK is not set
-CONFIG_NETFILTER_XTABLES=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+# CONFIG_NETFILTER_XTABLES is not set
 
 #
 # IP: Netfilter Configuration
@@ -278,51 +267,13 @@ CONFIG_IP_NF_IRC=m
 CONFIG_IP_NF_TFTP=m
 CONFIG_IP_NF_AMANDA=m
 # CONFIG_IP_NF_PPTP is not set
+# CONFIG_IP_NF_H323 is not set
 CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_MULTIPORT=m
-CONFIG_IP_NF_MATCH_TOS=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_HASHLIMIT=m
-CONFIG_IP_NF_MATCH_POLICY=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_SAME=m
-CONFIG_IP_NF_NAT_SNMP_BASIC=m
-CONFIG_IP_NF_NAT_IRC=m
-CONFIG_IP_NF_NAT_FTP=m
-CONFIG_IP_NF_NAT_TFTP=m
-CONFIG_IP_NF_NAT_AMANDA=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_TOS=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_DSCP=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
 
 #
 # IPv6: Netfilter Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP6_NF_QUEUE is not set
-# CONFIG_IP6_NF_IPTABLES is not set
 
 #
 # DCCP Configuration (EXPERIMENTAL)
@@ -355,7 +306,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 # QoS and/or fair queueing
 #
 # CONFIG_NET_SCHED is not set
-CONFIG_NET_CLS_ROUTE=y
 
 #
 # Network testing
@@ -408,7 +358,7 @@ CONFIG_FW_LOADER=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
-CONFIG_BLK_DEV_NBD=y
+# CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_SX8 is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
@@ -484,7 +434,23 @@ CONFIG_IDEDMA_AUTO=y
 #
 # Multi-device support (RAID and LVM)
 #
-# CONFIG_MD is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+# CONFIG_MD_RAID10 is not set
+# CONFIG_MD_RAID5 is not set
+# CONFIG_MD_RAID6 is not set
+# CONFIG_MD_MULTIPATH is not set
+# CONFIG_MD_FAULTY is not set
+CONFIG_BLK_DEV_DM=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+# CONFIG_DM_MULTIPATH_EMC is not set
 
 #
 # Fusion MPT device support
@@ -548,7 +514,7 @@ CONFIG_MII=y
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 CONFIG_E1000=m
-# CONFIG_E1000_NAPI is not set
+CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 # CONFIG_NS83820 is not set
 # CONFIG_HAMACHI is not set
@@ -560,7 +526,7 @@ CONFIG_SKGE=m
 # CONFIG_SK98LIN is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
-CONFIG_SPIDER_NET=y
+CONFIG_SPIDER_NET=m
 # CONFIG_MV643XX_ETH is not set
 
 #
@@ -678,6 +644,8 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_RTAS=y
 
 #
 # IPMI
@@ -694,14 +662,13 @@ CONFIG_WATCHDOG=y
 # Watchdog Device Drivers
 #
 # CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_WATCHDOG_RTAS is not set
+CONFIG_WATCHDOG_RTAS=y
 
 #
 # PCI-based Watchdog Cards
 #
 # CONFIG_PCIPCWATCHDOG is not set
 # CONFIG_WDTPCI is not set
-# CONFIG_RTC is not set
 CONFIG_GEN_RTC=y
 # CONFIG_GEN_RTC_X is not set
 # CONFIG_DTLK is not set
@@ -833,6 +800,7 @@ CONFIG_DUMMY_CONSOLE=y
 #
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
 # CONFIG_USB is not set
 
 #
@@ -852,7 +820,14 @@ CONFIG_USB_ARCH_HAS_OHCI=y
 #
 # InfiniBand support
 #
-# CONFIG_INFINIBAND is not set
+CONFIG_INFINIBAND=y
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+CONFIG_INFINIBAND_IPOIB=m
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
 
 #
 # EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
@@ -1037,10 +1012,6 @@ CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=m
 CONFIG_ZLIB_DEFLATE=m
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
 
 #
 # Instrumentation Support
@@ -1058,7 +1029,7 @@ CONFIG_LOG_BUF_SHIFT=15
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_MUTEXES is not set
+CONFIG_DEBUG_MUTEXES=y
 # CONFIG_DEBUG_SPINLOCK is not set
 CONFIG_DEBUG_SPINLOCK_SLEEP=y
 # CONFIG_DEBUG_KOBJECT is not set

arch/powerpc/configs/mpc8540_ads_defconfig

View file

diff --git a/arch/powerpc/configs/mpc8540_ads_defconfig b/arch/powerpc/configs/mpc8540_ads_defconfig
index 2a8290e..7f0780f 100644
--- a/arch/powerpc/configs/mpc8540_ads_defconfig
+++ b/arch/powerpc/configs/mpc8540_ads_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 
-# Sat Jan 14 15:57:54 2006
+# Linux kernel version: 2.6.16
+# Mon Mar 27 23:37:36 2006
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -9,6 +9,7 @@ CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_PPC=y
 CONFIG_EARLY_PRINTK=y
@@ -18,6 +19,7 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_PPC_OF=y
 CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
+CONFIG_DEFAULT_UIMAGE=y
 
 #
 # Processor support
@@ -42,7 +44,6 @@ CONFIG_SPE=y
 # Code maturity level options
 #
 CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 
@@ -58,6 +59,7 @@ CONFIG_SYSVIPC=y
 CONFIG_SYSCTL=y
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+# CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_EMBEDDED=y
@@ -72,10 +74,6 @@ CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_SHMEM=y
-CONFIG_CC_ALIGN_FUNCTIONS=0
-CONFIG_CC_ALIGN_LABELS=0
-CONFIG_CC_ALIGN_LOOPS=0
-CONFIG_CC_ALIGN_JUMPS=0
 CONFIG_SLAB=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
@@ -90,6 +88,8 @@ CONFIG_BASE_SMALL=0
 # Block layer
 #
 # CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
 
 #
 # IO Schedulers
@@ -183,6 +183,7 @@ CONFIG_NET=y
 #
 # Networking options
 #
+# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -220,6 +221,11 @@ CONFIG_TCP_CONG_BIC=y
 # SCTP Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_VLAN_8021Q is not set
@@ -229,11 +235,6 @@ CONFIG_TCP_CONG_BIC=y
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
-# CONFIG_TIPC is not set
 # CONFIG_NET_DIVERT is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
@@ -487,6 +488,12 @@ CONFIG_GEN_RTC=y
 # CONFIG_I2C is not set
 
 #
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
@@ -496,6 +503,7 @@ CONFIG_GEN_RTC=y
 #
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_F71805F is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
@@ -503,10 +511,6 @@ CONFIG_HWMON=y
 #
 
 #
-# Multimedia Capabilities Port drivers
-#
-
-#
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
@@ -531,6 +535,7 @@ CONFIG_HWMON=y
 #
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB_ARCH_HAS_EHCI is not set
 
 #
 # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -551,7 +556,7 @@ CONFIG_HWMON=y
 #
 
 #
-# SN Devices
+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
 #
 
 #
@@ -603,7 +608,6 @@ CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
-# CONFIG_RELAYFS_FS is not set
 # CONFIG_CONFIGFS_FS is not set
 
 #
@@ -658,6 +662,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_SGI_PARTITION is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
 
 #
@@ -695,6 +700,8 @@ CONFIG_DEBUG_MUTEXES=y
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_DEBUG_VM is not set
+# CONFIG_UNWIND_INFO is not set
+CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_DEBUGGER is not set
 # CONFIG_BDI_SWITCH is not set

arch/powerpc/kernel/Makefile

View file

diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 80e9fe2..0cc0995 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -12,12 +12,12 @@ endif
 
 obj-y				:= semaphore.o cputable.o ptrace.o syscalls.o \
 				   irq.o align.o signal_32.o pmc.o vdso.o \
-				   init_task.o process.o systbl.o
+				   init_task.o process.o systbl.o idle.o
 obj-y				+= vdso32/
 obj-$(CONFIG_PPC64)		+= setup_64.o binfmt_elf32.o sys_ppc32.o \
 				   signal_64.o ptrace32.o \
 				   paca.o cpu_setup_power4.o \
-				   firmware.o sysfs.o idle_64.o
+				   firmware.o sysfs.o
 obj-$(CONFIG_PPC64)		+= vdso64/
 obj-$(CONFIG_ALTIVEC)		+= vecemu.o vector.o
 obj-$(CONFIG_POWER4)		+= idle_power4.o
@@ -34,6 +34,11 @@ obj-$(CONFIG_IBMEBUS)           += ibmebus.o
 obj-$(CONFIG_GENERIC_TBSYNC)	+= smp-tbsync.o
 obj64-$(CONFIG_PPC_MULTIPLATFORM) += nvram_64.o
 obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o
+obj-$(CONFIG_6xx)		+= idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o
+obj-$(CONFIG_TAU)		+= tau_6xx.o
+obj32-$(CONFIG_SOFTWARE_SUSPEND) += swsusp_32.o
+obj32-$(CONFIG_MODULES)		+= module_32.o
+obj-$(CONFIG_E500)		+= perfmon_fsl_booke.o
 
 ifeq ($(CONFIG_PPC_MERGE),y)
 
@@ -51,7 +56,6 @@ obj-$(CONFIG_PPC64)		+= misc_64.o dma_64.o iommu.o
 obj-$(CONFIG_PPC_MULTIPLATFORM)	+= prom_init.o
 obj-$(CONFIG_MODULES)		+= ppc_ksyms.o
 obj-$(CONFIG_BOOTX_TEXT)	+= btext.o
-obj-$(CONFIG_6xx)		+= idle_6xx.o
 obj-$(CONFIG_SMP)		+= smp.o
 obj-$(CONFIG_KPROBES)		+= kprobes.o
 obj-$(CONFIG_PPC_UDBG_16550)	+= legacy_serial.o udbg_16550.o
@@ -77,6 +81,7 @@ smpobj-$(CONFIG_SMP)		+= smp.o
 
 endif
 
+obj-$(CONFIG_PPC32)		+= $(obj32-y)
 obj-$(CONFIG_PPC64)		+= $(obj64-y)
 
 extra-$(CONFIG_PPC_FPU)		+= fpu.o

arch/powerpc/kernel/asm-offsets.c

View file

diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index 882889b..54b48f3 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -105,8 +105,6 @@ int main(void)
 	DEFINE(ICACHEL1LINESIZE, offsetof(struct ppc64_caches, iline_size));
 	DEFINE(ICACHEL1LOGLINESIZE, offsetof(struct ppc64_caches, log_iline_size));
 	DEFINE(ICACHEL1LINESPERPAGE, offsetof(struct ppc64_caches, ilines_per_page));
-	DEFINE(PLATFORM_LPAR, PLATFORM_LPAR);
-

This diff is incomplete. Download the complete patch.