Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

1fdb24e9 · Linus Torvalds <[email protected]> · 2011-10-28 12:02:27 -07:00

* 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits)
  ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET
  ARM: gic, local timers: use the request_percpu_irq() interface
  ARM: gic: consolidate PPI handling
  ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H
  ARM: mach-s5p64x0: remove mach/memory.h
  ARM: mach-s3c64xx: remove mach/memory.h
  ARM: plat-mxc: remove mach/memory.h
  ARM: mach-prima2: remove mach/memory.h
  ARM: mach-zynq: remove mach/memory.h
  ARM: mach-bcmring: remove mach/memory.h
  ARM: mach-davinci: remove mach/memory.h
  ARM: mach-pxa: remove mach/memory.h
  ARM: mach-ixp4xx: remove mach/memory.h
  ARM: mach-h720x: remove mach/memory.h
  ARM: mach-vt8500: remove mach/memory.h
  ARM: mach-s5pc100: remove mach/memory.h
  ARM: mach-tegra: remove mach/memory.h
  ARM: plat-tcc: remove mach/memory.h
  ARM: mach-mmp: remove mach/memory.h
  ARM: mach-cns3xxx: remove mach/memory.h
  ...

Fix up mostly pretty trivial conflicts in:
 - arch/arm/Kconfig
 - arch/arm/include/asm/localtimer.h
 - arch/arm/kernel/Makefile
 - arch/arm/mach-shmobile/board-ap4evb.c
 - arch/arm/mach-u300/core.c
 - arch/arm/mm/dma-mapping.c
 - arch/arm/mm/proc-v7.S
 - arch/arm/plat-omap/Kconfig
largely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP ->
CONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and
addition of NEED_MACH_MEMORY_H next to HAVE_IDE.

Commit: 1fdb24e969110fafea36d3b393bea438f702c87f
Parents: f362f98e · 531a6a94

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

Changes

524 files changed · +7566 −2887

File	Status	Add	Del	Content
arch/arm/Kconfig	modified	+63	−0	View file
arch/arm/Kconfig.debug	modified	+6	−0	View file
arch/arm/boot/compressed/.gitignore	modified	+9	−0	View file
arch/arm/boot/compressed/Makefile	modified	+28	−4	View file
arch/arm/boot/compressed/atags_to_fdt.c	added	+97	−0	View file
arch/arm/boot/compressed/head.S	modified	+115	−7	View file
arch/arm/boot/compressed/libfdt_env.h	added	+15	−0	View file
arch/arm/boot/compressed/misc.c	modified	+1	−41	View file
arch/arm/boot/compressed/string.c	added	+127	−0	View file
arch/arm/boot/compressed/vmlinux.lds.in	modified	+4	−0	View file
arch/arm/common/gic.c	modified	+220	−11	View file
arch/arm/include/asm/dma-mapping.h	modified	+7	−0	View file
arch/arm/include/asm/entry-macro-multi.S	modified	+0	−7	View file
arch/arm/include/asm/hardirq.h	modified	+0	−3	View file
arch/arm/include/asm/hardware/entry-macro-gic.S	modified	+2	−17	View file
arch/arm/include/asm/hardware/gic.h	modified	+8	−1	View file
arch/arm/include/asm/hw_breakpoint.h	modified	+2	−0	View file
arch/arm/include/asm/localtimer.h	modified	+8	−14	View file
arch/arm/include/asm/mach/arch.h	modified	+1	−1	View file
arch/arm/include/asm/mach/map.h	modified	+1	−0	View file
arch/arm/include/asm/memory.h	modified	+8	−10	View file
arch/arm/include/asm/pgtable.h	modified	+3	−0	View file
arch/arm/include/asm/pmu.h	modified	+74	−19	View file
arch/arm/include/asm/proc-fns.h	modified	+8	−0	View file
arch/arm/include/asm/smp.h	modified	+0	−5	View file
arch/arm/include/asm/smp_twd.h	modified	+1	−1	View file
arch/arm/include/asm/suspend.h	modified	+1	−16	View file
arch/arm/kernel/Makefile	modified	+8	−1	View file
arch/arm/kernel/debug.S	modified	+2	−2	View file
arch/arm/kernel/head.S	modified	+2	−2	View file
arch/arm/kernel/hw_breakpoint.c	modified	+170	−105	View file
arch/arm/kernel/irq.c	modified	+0	−3	View file
arch/arm/kernel/kprobes-arm.c	modified	+4	−0	View file
arch/arm/kernel/kprobes-test-arm.c	added	+1323	−0	View file
arch/arm/kernel/kprobes-test-thumb.c	added	+1187	−0	View file
arch/arm/kernel/kprobes-test.c	added	+1748	−0	View file
arch/arm/kernel/kprobes-test.h	added	+392	−0	View file
arch/arm/kernel/kprobes-thumb.c	modified	+7	−0	View file
arch/arm/kernel/kprobes.h	modified	+8	−0	View file
arch/arm/kernel/perf_event.c	modified	+254	−221	View file
arch/arm/kernel/perf_event_v6.c	modified	+59	−28	View file
arch/arm/kernel/perf_event_v7.c	modified	+196	−199	View file
arch/arm/kernel/perf_event_xscale.c	modified	+47	−43	View file
arch/arm/kernel/pmu.c	modified	+8	−174	View file
arch/arm/kernel/setup.c	modified	+2	−19	View file
arch/arm/kernel/sleep.S	modified	+27	−58	View file
arch/arm/kernel/smp.c	modified	+1	−37	View file
arch/arm/kernel/smp_twd.c	modified	+45	−2	View file
arch/arm/kernel/suspend.c	added	+72	−0	View file
arch/arm/mach-at91/at91sam9g45.c	modified	+2	−0	View file
arch/arm/mach-at91/include/mach/at91sam9g45.h	modified	+0	−2	View file
arch/arm/mach-at91/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-bcmring/include/mach/hardware.h	modified	+1	−2	View file
arch/arm/mach-bcmring/include/mach/memory.h	deleted	+0	−33	View before deletion
arch/arm/mach-bcmring/mm.c	modified	+3	−0	View file
arch/arm/mach-clps711x/autcpu12.c	modified	+1	−1	View file
arch/arm/mach-clps711x/cdb89712.c	modified	+1	−1	View file
arch/arm/mach-clps711x/ceiva.c	modified	+1	−1	View file
arch/arm/mach-clps711x/clep7312.c	modified	+1	−1	View file
arch/arm/mach-clps711x/edb7211-arch.c	modified	+1	−1	View file
arch/arm/mach-clps711x/fortunet.c	modified	+0	−1	View file
arch/arm/mach-clps711x/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-clps711x/p720t.c	modified	+1	−1	View file
arch/arm/mach-cns3xxx/cns3420vb.c	modified	+1	−1	View file
arch/arm/mach-cns3xxx/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-cns3xxx/include/mach/memory.h	deleted	+0	−26	View before deletion
arch/arm/mach-davinci/board-da830-evm.c	modified	+1	−1	View file
arch/arm/mach-davinci/board-da850-evm.c	modified	+1	−1	View file
arch/arm/mach-davinci/board-dm355-evm.c	modified	+1	−1	View file
arch/arm/mach-davinci/board-dm355-leopard.c	modified	+1	−1	View file
arch/arm/mach-davinci/board-dm365-evm.c	modified	+1	−1	View file
arch/arm/mach-davinci/board-dm644x-evm.c	modified	+1	−1	View file
arch/arm/mach-davinci/board-dm646x-evm.c	modified	+2	−2	View file
arch/arm/mach-davinci/board-mityomapl138.c	modified	+1	−1	View file
arch/arm/mach-davinci/board-neuros-osd2.c	modified	+1	−1	View file
arch/arm/mach-davinci/board-omapl138-hawk.c	modified	+1	−1	View file
arch/arm/mach-davinci/board-sffsdr.c	modified	+1	−1	View file
arch/arm/mach-davinci/board-tnetv107x-evm.c	modified	+1	−1	View file
arch/arm/mach-davinci/common.c	modified	+3	−0	View file
arch/arm/mach-davinci/cpuidle.c	modified	+1	−1	View file
arch/arm/mach-davinci/include/mach/ddr2.h	added	+4	−0	View file
arch/arm/mach-davinci/include/mach/debug-macro.S	modified	+23	−29	View file
arch/arm/mach-davinci/include/mach/memory.h	deleted	+0	−44	View before deletion
arch/arm/mach-davinci/include/mach/serial.h	modified	+2	−1	View file
arch/arm/mach-davinci/include/mach/uncompress.h	modified	+6	−1	View file
arch/arm/mach-davinci/sleep.S	modified	+1	−1	View file
arch/arm/mach-dove/cm-a510.c	modified	+1	−1	View file
arch/arm/mach-dove/dove-db-setup.c	modified	+1	−1	View file
arch/arm/mach-dove/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-dove/include/mach/memory.h	deleted	+0	−10	View before deletion
arch/arm/mach-ebsa110/core.c	modified	+1	−1	View file
arch/arm/mach-ebsa110/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-ep93xx/adssphere.c	modified	+1	−1	View file
arch/arm/mach-ep93xx/edb93xx.c	modified	+8	−8	View file
arch/arm/mach-ep93xx/gesbc9312.c	modified	+1	−1	View file
arch/arm/mach-ep93xx/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-ep93xx/micro9.c	modified	+4	−4	View file
arch/arm/mach-ep93xx/simone.c	modified	+2	−2	View file
arch/arm/mach-ep93xx/snappercl15.c	modified	+1	−1	View file
arch/arm/mach-ep93xx/ts72xx.c	modified	+1	−1	View file
arch/arm/mach-exynos4/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-exynos4/include/mach/entry-macro.S	modified	+1	−6	View file
arch/arm/mach-exynos4/mach-armlex4210.c	modified	+1	−1	View file
arch/arm/mach-exynos4/mach-nuri.c	modified	+1	−1	View file
arch/arm/mach-exynos4/mach-smdkc210.c	modified	+1	−1	View file
arch/arm/mach-exynos4/mach-smdkv310.c	modified	+1	−1	View file
arch/arm/mach-exynos4/mach-universal_c210.c	modified	+1	−1	View file
arch/arm/mach-exynos4/mct.c	modified	+5	−2	View file
arch/arm/mach-footbridge/cats-hw.c	modified	+1	−1	View file
arch/arm/mach-footbridge/ebsa285.c	modified	+1	−1	View file
arch/arm/mach-footbridge/include/mach/debug-macro.S	modified	+2	−2	View file
arch/arm/mach-footbridge/netwinder-hw.c	modified	+1	−1	View file
arch/arm/mach-footbridge/personal.c	modified	+1	−1	View file
arch/arm/mach-gemini/board-nas4220b.c	modified	+1	−1	View file
arch/arm/mach-gemini/board-rut1xx.c	modified	+1	−1	View file
arch/arm/mach-gemini/board-wbd111.c	modified	+1	−1	View file
arch/arm/mach-gemini/board-wbd222.c	modified	+1	−1	View file
arch/arm/mach-gemini/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-gemini/include/mach/memory.h	deleted	+0	−19	View before deletion
arch/arm/mach-h720x/h7201-eval.c	modified	+1	−1	View file
arch/arm/mach-h720x/h7202-eval.c	modified	+1	−1	View file
arch/arm/mach-h720x/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-h720x/include/mach/memory.h	deleted	+0	−11	View before deletion
arch/arm/mach-imx/mach-armadillo5x0.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-cpuimx27.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-cpuimx35.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-eukrea_cpuimx25.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-imx27_visstrim_m10.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-imx27ipcam.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-imx27lite.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-kzm_arm11_01.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-mx1ads.c	modified	+2	−2	View file
arch/arm/mach-imx/mach-mx21ads.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-mx25_3ds.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-mx27_3ds.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-mx27ads.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-mx31_3ds.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-mx31ads.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-mx31lilly.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-mx31lite.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-mx31moboard.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-mx35_3ds.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-mxt_td60.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-pca100.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-pcm037.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-pcm038.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-pcm043.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-qong.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-scb9328.c	modified	+1	−1	View file
arch/arm/mach-integrator/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-integrator/integrator_ap.c	modified	+1	−1	View file
arch/arm/mach-integrator/integrator_cp.c	modified	+1	−1	View file
arch/arm/mach-iop13xx/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-iop13xx/iq81340mc.c	modified	+1	−1	View file
arch/arm/mach-iop13xx/iq81340sc.c	modified	+1	−1	View file
arch/arm/mach-iop32x/em7210.c	modified	+1	−1	View file
arch/arm/mach-iop32x/glantank.c	modified	+1	−1	View file
arch/arm/mach-iop32x/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-iop32x/include/mach/memory.h	deleted	+0	−13	View before deletion
arch/arm/mach-iop32x/iq31244.c	modified	+2	−2	View file
arch/arm/mach-iop32x/iq80321.c	modified	+1	−1	View file
arch/arm/mach-iop32x/n2100.c	modified	+1	−1	View file
arch/arm/mach-iop33x/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-iop33x/include/mach/memory.h	deleted	+0	−13	View before deletion
arch/arm/mach-iop33x/iq80331.c	modified	+1	−1	View file
arch/arm/mach-iop33x/iq80332.c	modified	+1	−1	View file
arch/arm/mach-ixp2000/enp2611.c	modified	+1	−1	View file
arch/arm/mach-ixp2000/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-ixp2000/ixdp2400.c	modified	+1	−1	View file
arch/arm/mach-ixp2000/ixdp2800.c	modified	+1	−1	View file
arch/arm/mach-ixp2000/ixdp2x01.c	modified	+3	−3	View file
arch/arm/mach-ixp23xx/espresso.c	modified	+1	−1	View file
arch/arm/mach-ixp23xx/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-ixp23xx/ixdp2351.c	modified	+1	−1	View file
arch/arm/mach-ixp23xx/roadrunner.c	modified	+1	−1	View file
arch/arm/mach-ixp4xx/avila-setup.c	modified	+2	−2	View file
arch/arm/mach-ixp4xx/coyote-setup.c	modified	+2	−2	View file
arch/arm/mach-ixp4xx/dsmg600-setup.c	modified	+1	−1	View file
arch/arm/mach-ixp4xx/fsg-setup.c	modified	+1	−1	View file
arch/arm/mach-ixp4xx/gateway7001-setup.c	modified	+1	−1	View file
arch/arm/mach-ixp4xx/goramo_mlr.c	modified	+1	−1	View file
arch/arm/mach-ixp4xx/gtwx5715-setup.c	modified	+1	−1	View file
arch/arm/mach-ixp4xx/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-ixp4xx/include/mach/memory.h	deleted	+0	−17	View before deletion
arch/arm/mach-ixp4xx/ixdp425-setup.c	modified	+4	−4	View file
arch/arm/mach-ixp4xx/nas100d-setup.c	modified	+1	−1	View file
arch/arm/mach-ixp4xx/nslu2-setup.c	modified	+1	−1	View file
arch/arm/mach-ixp4xx/vulcan-setup.c	modified	+1	−1	View file
arch/arm/mach-ixp4xx/wg302v2-setup.c	modified	+1	−1	View file
arch/arm/mach-kirkwood/d2net_v2-setup.c	modified	+1	−1	View file
arch/arm/mach-kirkwood/db88f6281-bp-setup.c	modified	+1	−1	View file
arch/arm/mach-kirkwood/dockstar-setup.c	modified	+1	−1	View file
arch/arm/mach-kirkwood/guruplug-setup.c	modified	+1	−1	View file
arch/arm/mach-kirkwood/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-kirkwood/include/mach/memory.h	deleted	+0	−10	View before deletion
arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c	modified	+1	−1	View file
arch/arm/mach-kirkwood/netspace_v2-setup.c	modified	+3	−3	View file
arch/arm/mach-kirkwood/netxbig_v2-setup.c	modified	+2	−2	View file
arch/arm/mach-kirkwood/openrd-setup.c	modified	+3	−3	View file
arch/arm/mach-kirkwood/rd88f6192-nas-setup.c	modified	+1	−1	View file
arch/arm/mach-kirkwood/rd88f6281-setup.c	modified	+1	−1	View file
arch/arm/mach-kirkwood/sheevaplug-setup.c	modified	+2	−2	View file
arch/arm/mach-kirkwood/t5325-setup.c	modified	+1	−1	View file
arch/arm/mach-kirkwood/ts219-setup.c	modified	+1	−1	View file
arch/arm/mach-kirkwood/ts41x-setup.c	modified	+1	−1	View file
arch/arm/mach-ks8695/board-acs5k.c	modified	+1	−1	View file
arch/arm/mach-ks8695/board-dsm320.c	modified	+1	−1	View file
arch/arm/mach-ks8695/board-micrel.c	modified	+1	−1	View file
arch/arm/mach-ks8695/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-l7200/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-lpc32xx/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-lpc32xx/include/mach/memory.h	deleted	+0	−27	View before deletion
arch/arm/mach-lpc32xx/phy3250.c	modified	+1	−1	View file
arch/arm/mach-mmp/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-mmp/include/mach/memory.h	deleted	+0	−14	View before deletion
arch/arm/mach-msm/board-halibut.c	modified	+1	−1	View file
arch/arm/mach-msm/board-mahimahi.c	modified	+1	−1	View file
arch/arm/mach-msm/board-msm7x27.c	modified	+4	−4	View file
arch/arm/mach-msm/board-msm7x30.c	modified	+3	−3	View file
arch/arm/mach-msm/board-msm8x60.c	modified	+0	−11	View file
arch/arm/mach-msm/board-qsd8x50.c	modified	+2	−2	View file
arch/arm/mach-msm/board-sapphire.c	modified	+1	−1	View file
arch/arm/mach-msm/board-trout.c	modified	+1	−1	View file
arch/arm/mach-msm/include/mach/debug-macro.S	modified	+2	−2	View file
arch/arm/mach-msm/include/mach/entry-macro-qgic.S	modified	+1	−72	View file
arch/arm/mach-msm/include/mach/memory.h	deleted	+0	−35	View before deletion
arch/arm/mach-msm/timer.c	modified	+40	−29	View file
arch/arm/mach-mv78xx0/buffalo-wxl-setup.c	modified	+1	−1	View file
arch/arm/mach-mv78xx0/db78x00-bp-setup.c	modified	+1	−1	View file
arch/arm/mach-mv78xx0/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-mv78xx0/include/mach/memory.h	deleted	+0	−10	View before deletion
arch/arm/mach-mv78xx0/rd78x00-masa-setup.c	modified	+1	−1	View file
arch/arm/mach-mx5/board-cpuimx51.c	modified	+1	−1	View file
arch/arm/mach-mx5/board-cpuimx51sd.c	modified	+1	−1	View file
arch/arm/mach-mx5/board-mx51_3ds.c	modified	+1	−1	View file
arch/arm/mach-mx5/board-mx51_babbage.c	modified	+1	−1	View file
arch/arm/mach-mx5/board-mx51_efikamx.c	modified	+1	−1	View file
arch/arm/mach-mx5/board-mx51_efikasb.c	modified	+1	−1	View file
arch/arm/mach-mxs/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-mxs/include/mach/memory.h	deleted	+0	−24	View before deletion
arch/arm/mach-netx/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-netx/include/mach/memory.h	deleted	+0	−26	View before deletion
arch/arm/mach-netx/nxdb500.c	modified	+1	−1	View file
arch/arm/mach-netx/nxdkn.c	modified	+1	−1	View file
arch/arm/mach-netx/nxeb500hmi.c	modified	+1	−1	View file
arch/arm/mach-nomadik/board-nhk8815.c	modified	+1	−1	View file
arch/arm/mach-nomadik/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-nomadik/include/mach/memory.h	deleted	+0	−28	View before deletion
arch/arm/mach-nuc93x/include/mach/memory.h	deleted	+0	−21	View before deletion
arch/arm/mach-nuc93x/mach-nuc932evb.c	modified	+0	−1	View file
arch/arm/mach-omap1/board-ams-delta.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-fsample.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-generic.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-h2.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-h3.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-htcherald.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-innovator.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-nokia770.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-osk.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-palmte.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-palmtt.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-palmz71.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-perseus2.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-sx1.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-voiceblue.c	modified	+1	−1	View file
arch/arm/mach-omap1/include/mach/debug-macro.S	modified	+21	−27	View file
arch/arm/mach-omap1/include/mach/memory.h	modified	+52	−1	View file
arch/arm/mach-omap1/io.c	modified	+1	−0	View file
arch/arm/mach-omap2/board-2430sdp.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-3430sdp.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-3630sdp.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-4430sdp.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-am3517crane.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-am3517evm.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-apollon.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-cm-t35.c	modified	+2	−2	View file
arch/arm/mach-omap2/board-cm-t3517.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-devkit8000.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-generic.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-h4.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-igep0020.c	modified	+2	−2	View file
arch/arm/mach-omap2/board-ldp.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-n8x0.c	modified	+3	−3	View file
arch/arm/mach-omap2/board-omap3beagle.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-omap3evm.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-omap3logic.c	modified	+2	−2	View file
arch/arm/mach-omap2/board-omap3pandora.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-omap3stalker.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-omap3touchbook.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-omap4panda.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-overo.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-rm680.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-rx51.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-ti8168evm.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-zoom.c	modified	+2	−2	View file
arch/arm/mach-omap2/include/mach/debug-macro.S	modified	+36	−45	View file
arch/arm/mach-omap2/include/mach/entry-macro.S	modified	+1	−13	View file
arch/arm/mach-omap2/include/mach/memory.h	deleted	+0	−5	View before deletion
arch/arm/mach-omap2/io.c	modified	+1	−1	View file
arch/arm/mach-orion5x/d2net-setup.c	modified	+2	−2	View file
arch/arm/mach-orion5x/db88f5281-setup.c	modified	+1	−1	View file
arch/arm/mach-orion5x/dns323-setup.c	modified	+1	−1	View file
arch/arm/mach-orion5x/edmini_v2-setup.c	modified	+1	−1	View file
arch/arm/mach-orion5x/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-orion5x/include/mach/memory.h	deleted	+0	−12	View before deletion
arch/arm/mach-orion5x/kurobox_pro-setup.c	modified	+2	−2	View file
arch/arm/mach-orion5x/ls-chl-setup.c	modified	+1	−1	View file
arch/arm/mach-orion5x/ls_hgl-setup.c	modified	+1	−1	View file
arch/arm/mach-orion5x/lsmini-setup.c	modified	+1	−1	View file
arch/arm/mach-orion5x/mss2-setup.c	modified	+1	−1	View file
arch/arm/mach-orion5x/mv2120-setup.c	modified	+1	−1	View file
arch/arm/mach-orion5x/net2big-setup.c	modified	+1	−1	View file
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c	modified	+1	−1	View file
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c	modified	+1	−1	View file
arch/arm/mach-orion5x/rd88f5182-setup.c	modified	+1	−1	View file
arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c	modified	+1	−1	View file
arch/arm/mach-orion5x/terastation_pro2-setup.c	modified	+1	−1	View file
arch/arm/mach-orion5x/ts209-setup.c	modified	+1	−1	View file
arch/arm/mach-orion5x/ts409-setup.c	modified	+1	−1	View file
arch/arm/mach-orion5x/ts78xx-setup.c	modified	+1	−1	View file
arch/arm/mach-orion5x/wnr854t-setup.c	modified	+1	−1	View file
arch/arm/mach-orion5x/wrt350n-v2-setup.c	modified	+1	−1	View file
arch/arm/mach-pnx4008/core.c	modified	+1	−1	View file
arch/arm/mach-pnx4008/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-pnx4008/include/mach/memory.h	deleted	+0	−21	View before deletion
arch/arm/mach-prima2/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-prima2/include/mach/memory.h	deleted	+0	−21	View before deletion
arch/arm/mach-prima2/l2x0.c	modified	+2	−3	View file
arch/arm/mach-prima2/prima2.c	modified	+2	−1	View file
arch/arm/mach-pxa/balloon3.c	modified	+1	−1	View file
arch/arm/mach-pxa/capc7117.c	modified	+1	−1	View file
arch/arm/mach-pxa/cm-x2xx.c	modified	+1	−1	View file
arch/arm/mach-pxa/cm-x300.c	modified	+1	−1	View file
arch/arm/mach-pxa/colibri-pxa270.c	modified	+2	−2	View file
arch/arm/mach-pxa/colibri-pxa300.c	modified	+1	−1	View file
arch/arm/mach-pxa/colibri-pxa320.c	modified	+1	−1	View file
arch/arm/mach-pxa/csb726.c	modified	+1	−1	View file
arch/arm/mach-pxa/em-x270.c	modified	+2	−2	View file
arch/arm/mach-pxa/eseries.c	modified	+6	−6	View file
arch/arm/mach-pxa/ezx.c	modified	+6	−6	View file
arch/arm/mach-pxa/gumstix.c	modified	+1	−1	View file
arch/arm/mach-pxa/h5000.c	modified	+1	−1	View file
arch/arm/mach-pxa/himalaya.c	modified	+1	−1	View file
arch/arm/mach-pxa/hx4700.c	modified	+1	−1	View file
arch/arm/mach-pxa/icontrol.c	modified	+1	−1	View file
arch/arm/mach-pxa/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-pxa/include/mach/memory.h	deleted	+0	−20	View before deletion
arch/arm/mach-pxa/littleton.c	modified	+1	−1	View file
arch/arm/mach-pxa/lpd270.c	modified	+1	−1	View file
arch/arm/mach-pxa/magician.c	modified	+1	−1	View file
arch/arm/mach-pxa/mainstone.c	modified	+1	−1	View file
arch/arm/mach-pxa/mioa701.c	modified	+1	−1	View file
arch/arm/mach-pxa/mp900.c	modified	+1	−1	View file
arch/arm/mach-pxa/palmld.c	modified	+1	−1	View file
arch/arm/mach-pxa/palmt5.c	modified	+1	−1	View file
arch/arm/mach-pxa/palmtc.c	modified	+1	−1	View file
arch/arm/mach-pxa/palmte2.c	modified	+1	−1	View file
arch/arm/mach-pxa/palmtreo.c	modified	+2	−2	View file
arch/arm/mach-pxa/palmtx.c	modified	+1	−1	View file
arch/arm/mach-pxa/palmz72.c	modified	+1	−1	View file
arch/arm/mach-pxa/pcm027.c	modified	+1	−1	View file
arch/arm/mach-pxa/raumfeld.c	modified	+3	−3	View file
arch/arm/mach-pxa/saar.c	modified	+1	−1	View file
arch/arm/mach-pxa/saarb.c	modified	+1	−1	View file
arch/arm/mach-pxa/stargate2.c	modified	+2	−2	View file
arch/arm/mach-pxa/tavorevb.c	modified	+1	−1	View file
arch/arm/mach-pxa/tavorevb3.c	modified	+1	−1	View file
arch/arm/mach-pxa/trizeps4.c	modified	+2	−2	View file
arch/arm/mach-pxa/viper.c	modified	+1	−1	View file
arch/arm/mach-pxa/vpac270.c	modified	+1	−1	View file
arch/arm/mach-pxa/xcep.c	modified	+1	−1	View file
arch/arm/mach-pxa/z2.c	modified	+2	−2	View file
arch/arm/mach-pxa/zeus.c	modified	+1	−1	View file
arch/arm/mach-pxa/zylonite.c	modified	+1	−1	View file
arch/arm/mach-realview/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-realview/realview_eb.c	modified	+1	−1	View file
arch/arm/mach-realview/realview_pb1176.c	modified	+1	−1	View file
arch/arm/mach-realview/realview_pb11mp.c	modified	+1	−1	View file
arch/arm/mach-realview/realview_pba8.c	modified	+1	−1	View file
arch/arm/mach-realview/realview_pbx.c	modified	+1	−1	View file
arch/arm/mach-rpc/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-rpc/riscpc.c	modified	+1	−1	View file
arch/arm/mach-s3c2400/include/mach/memory.h	deleted	+0	−20	View before deletion
arch/arm/mach-s3c2410/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-s3c2410/include/mach/memory.h	deleted	+0	−16	View before deletion
arch/arm/mach-s3c2410/mach-amlm5900.c	modified	+1	−1	View file
arch/arm/mach-s3c2410/mach-bast.c	modified	+1	−1	View file
arch/arm/mach-s3c2410/mach-h1940.c	modified	+1	−1	View file
arch/arm/mach-s3c2410/mach-n30.c	modified	+2	−2	View file
arch/arm/mach-s3c2410/mach-otom.c	modified	+1	−1	View file
arch/arm/mach-s3c2410/mach-qt2410.c	modified	+1	−1	View file
arch/arm/mach-s3c2410/mach-smdk2410.c	modified	+1	−1	View file
arch/arm/mach-s3c2410/mach-tct_hammer.c	modified	+1	−1	View file
arch/arm/mach-s3c2410/mach-vr1000.c	modified	+1	−1	View file
arch/arm/mach-s3c2412/mach-jive.c	modified	+1	−1	View file
arch/arm/mach-s3c2412/mach-smdk2413.c	modified	+3	−3	View file
arch/arm/mach-s3c2412/mach-vstms.c	modified	+1	−1	View file
arch/arm/mach-s3c2416/mach-smdk2416.c	modified	+1	−1	View file
arch/arm/mach-s3c2440/mach-anubis.c	modified	+1	−1	View file
arch/arm/mach-s3c2440/mach-at2440evb.c	modified	+1	−1	View file
arch/arm/mach-s3c2440/mach-gta02.c	modified	+1	−1	View file
arch/arm/mach-s3c2440/mach-mini2440.c	modified	+1	−1	View file
arch/arm/mach-s3c2440/mach-nexcoder.c	modified	+1	−1	View file
arch/arm/mach-s3c2440/mach-osiris.c	modified	+1	−1	View file
arch/arm/mach-s3c2440/mach-rx1950.c	modified	+1	−1	View file
arch/arm/mach-s3c2440/mach-rx3715.c	modified	+1	−1	View file
arch/arm/mach-s3c2440/mach-smdk2440.c	modified	+1	−1	View file
arch/arm/mach-s3c2443/mach-smdk2443.c	modified	+1	−1	View file
arch/arm/mach-s3c64xx/cpu.c	modified	+2	−0	View file
arch/arm/mach-s3c64xx/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-s3c64xx/include/mach/memory.h	deleted	+0	−20	View before deletion
arch/arm/mach-s3c64xx/mach-anw6410.c	modified	+1	−1	View file
arch/arm/mach-s3c64xx/mach-crag6410.c	modified	+1	−1	View file
arch/arm/mach-s3c64xx/mach-hmt.c	modified	+1	−1	View file
arch/arm/mach-s3c64xx/mach-mini6410.c	modified	+1	−1	View file
arch/arm/mach-s3c64xx/mach-ncp.c	modified	+1	−1	View file
arch/arm/mach-s3c64xx/mach-real6410.c	modified	+1	−1	View file
arch/arm/mach-s3c64xx/mach-smartq5.c	modified	+1	−1	View file
arch/arm/mach-s3c64xx/mach-smartq7.c	modified	+1	−1	View file
arch/arm/mach-s3c64xx/mach-smdk6400.c	modified	+1	−1	View file
arch/arm/mach-s3c64xx/mach-smdk6410.c	modified	+1	−1	View file
arch/arm/mach-s5p64x0/cpu.c	modified	+3	−0	View file
arch/arm/mach-s5p64x0/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-s5p64x0/include/mach/memory.h	deleted	+0	−19	View before deletion
arch/arm/mach-s5p64x0/mach-smdk6440.c	modified	+1	−1	View file
arch/arm/mach-s5p64x0/mach-smdk6450.c	modified	+1	−1	View file
arch/arm/mach-s5pc100/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-s5pc100/include/mach/memory.h	deleted	+0	−18	View before deletion
arch/arm/mach-s5pc100/mach-smdkc100.c	modified	+1	−1	View file
arch/arm/mach-s5pv210/cpu.c	modified	+2	−0	View file
arch/arm/mach-s5pv210/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-s5pv210/include/mach/memory.h	modified	+0	−1	View file
arch/arm/mach-s5pv210/mach-aquila.c	modified	+1	−1	View file
arch/arm/mach-s5pv210/mach-goni.c	modified	+1	−1	View file
arch/arm/mach-s5pv210/mach-smdkc110.c	modified	+1	−1	View file
arch/arm/mach-s5pv210/mach-smdkv210.c	modified	+1	−1	View file
arch/arm/mach-s5pv210/mach-torbreck.c	modified	+1	−1	View file
arch/arm/mach-sa1100/assabet.c	modified	+1	−1	View file
arch/arm/mach-sa1100/badge4.c	modified	+1	−1	View file
arch/arm/mach-sa1100/h3100.c	modified	+1	−1	View file
arch/arm/mach-sa1100/h3600.c	modified	+1	−1	View file
arch/arm/mach-sa1100/hackkit.c	modified	+1	−1	View file
arch/arm/mach-sa1100/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-sa1100/jornada720.c	modified	+1	−1	View file
arch/arm/mach-sa1100/lart.c	modified	+1	−1	View file
arch/arm/mach-sa1100/nanoengine.c	modified	+1	−1	View file
arch/arm/mach-sa1100/shannon.c	modified	+1	−1	View file
arch/arm/mach-sa1100/simpad.c	modified	+1	−1	View file
arch/arm/mach-shark/core.c	modified	+1	−1	View file
arch/arm/mach-shark/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-shmobile/board-ag5evm.c	modified	+3	−0	View file
arch/arm/mach-shmobile/board-ap4evb.c	modified	+3	−0	View file
arch/arm/mach-shmobile/board-g3evm.c	modified	+3	−0	View file
arch/arm/mach-shmobile/board-g4evm.c	modified	+3	−0	View file
arch/arm/mach-shmobile/board-mackerel.c	modified	+3	−0	View file
arch/arm/mach-shmobile/entry-intc.S	modified	+0	−3	View file
arch/arm/mach-shmobile/include/mach/entry-macro.S	modified	+0	−3	View file
arch/arm/mach-shmobile/include/mach/memory.h	modified	+0	−3	View file
arch/arm/mach-spear3xx/include/mach/memory.h	deleted	+0	−19	View before deletion
arch/arm/mach-spear3xx/spear300_evb.c	modified	+1	−1	View file
arch/arm/mach-spear3xx/spear310_evb.c	modified	+1	−1	View file
arch/arm/mach-spear3xx/spear320_evb.c	modified	+1	−1	View file
arch/arm/mach-spear6xx/include/mach/memory.h	deleted	+0	−19	View before deletion
arch/arm/mach-spear6xx/spear600_evb.c	modified	+1	−1	View file
arch/arm/mach-tcc8k/board-tcc8000-sdk.c	modified	+1	−1	View file
arch/arm/mach-tegra/board-harmony.c	modified	+1	−1	View file
arch/arm/mach-tegra/board-paz00.c	modified	+1	−1	View file
arch/arm/mach-tegra/board-seaboard.c	modified	+3	−3	View file
arch/arm/mach-tegra/board-trimslice.c	modified	+1	−1	View file
arch/arm/mach-tegra/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-tegra/include/mach/memory.h	deleted	+0	−28	View before deletion
arch/arm/mach-u300/core.c	modified	+3	−0	View file
arch/arm/mach-u300/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-u300/include/mach/memory.h	modified	+4	−9	View file
arch/arm/mach-u300/u300.c	modified	+1	−1	View file
arch/arm/mach-ux500/board-mop500.c	modified	+3	−3	View file
arch/arm/mach-ux500/board-u5500.c	modified	+1	−1	View file
arch/arm/mach-ux500/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-ux500/include/mach/memory.h	deleted	+0	−18	View before deletion
arch/arm/mach-versatile/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-versatile/include/mach/memory.h	deleted	+0	−28	View before deletion
arch/arm/mach-versatile/versatile_ab.c	modified	+1	−1	View file
arch/arm/mach-versatile/versatile_pb.c	modified	+1	−1	View file
arch/arm/mach-vexpress/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-vexpress/include/mach/memory.h	deleted	+0	−25	View before deletion
arch/arm/mach-vexpress/v2m.c	modified	+1	−1	View file
arch/arm/mach-vt8500/bv07.c	modified	+1	−1	View file
arch/arm/mach-vt8500/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-vt8500/include/mach/memory.h	deleted	+0	−28	View before deletion
arch/arm/mach-vt8500/wm8505_7in.c	modified	+1	−1	View file
arch/arm/mach-w90x900/include/mach/memory.h	deleted	+0	−23	View before deletion
arch/arm/mach-w90x900/mach-nuc910evb.c	modified	+0	−1	View file
arch/arm/mach-w90x900/mach-nuc950evb.c	modified	+0	−1	View file
arch/arm/mach-w90x900/mach-nuc960evb.c	modified	+0	−1	View file
arch/arm/mach-zynq/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/mach-zynq/include/mach/memory.h	deleted	+0	−22	View before deletion
arch/arm/mm/dma-mapping.c	modified	+33	−11	View file
arch/arm/mm/init.c	modified	+0	−9	View file
arch/arm/mm/mmu.c	modified	+8	−0	View file
arch/arm/mm/proc-arm920.S	modified	+8	−13	View file
arch/arm/mm/proc-arm926.S	modified	+8	−13	View file
arch/arm/mm/proc-sa1100.S	modified	+10	−15	View file
arch/arm/mm/proc-v6.S	modified	+19	−25	View file
arch/arm/mm/proc-v7.S	modified	+22	−28	View file
arch/arm/mm/proc-xsc3.S	modified	+11	−17	View file
arch/arm/mm/proc-xscale.S	modified	+10	−15	View file
arch/arm/plat-mxc/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/plat-mxc/include/mach/memory.h	deleted	+0	−58	View before deletion
arch/arm/plat-omap/Kconfig	modified	+1	−0	View file
arch/arm/plat-omap/include/plat/io.h	modified	+2	−0	View file
arch/arm/plat-omap/include/plat/memory.h	deleted	+0	−102	View before deletion
arch/arm/plat-omap/include/plat/serial.h	modified	+3	−3	View file
arch/arm/plat-omap/include/plat/uncompress.h	modified	+7	−1	View file
arch/arm/plat-omap/io.c	modified	+8	−0	View file
arch/arm/plat-spear/include/plat/debug-macro.S	modified	+1	−1	View file
arch/arm/plat-spear/include/plat/memory.h	deleted	+0	−20	View before deletion
arch/arm/plat-tcc/include/mach/debug-macro.S	modified	+1	−1	View file
arch/arm/plat-tcc/include/mach/memory.h	deleted	+0	−18	View before deletion
arch/arm/vfp/vfpmodule.c	modified	+22	−9	View file
drivers/usb/musb/musb_debugfs.c	modified	+0	−6	View file
include/linux/cpu_pm.h	added	+109	−0	View file
kernel/Makefile	modified	+1	−0	View file
kernel/cpu_pm.c	added	+233	−0	View file
kernel/power/Kconfig	modified	+4	−0	View file

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

arch/arm/Kconfig

View file

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e91cec4..5ca86e7 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -29,6 +29,7 @@ config ARM
 	select HAVE_GENERIC_HARDIRQS
 	select HAVE_SPARSE_IRQ
 	select GENERIC_IRQ_SHOW
+	select CPU_PM if (SUSPEND || CPU_IDLE)
 	help
 	  The ARM series is a line of low-power-consumption RISC chip designs
 	  licensed by ARM Ltd and targeted at embedded applications and
@@ -211,6 +212,19 @@ config ARM_PATCH_PHYS_VIRT
 	  this feature (eg, building a kernel for a single machine) and
 	  you need to shrink the kernel to the minimal size.
 
+config NEED_MACH_MEMORY_H
+	bool
+	help
+	  Select this when mach/memory.h is required to provide special
+	  definitions for this platform.  The need for mach/memory.h should
+	  be avoided when possible.
+
+config PHYS_OFFSET
+	hex "Physical address of main memory"
+	depends on !ARM_PATCH_PHYS_VIRT && !NEED_MACH_MEMORY_H
+	help
+	  Please provide the physical address corresponding to the
+	  location of main memory in your system.
 
 config GENERIC_BUG
 	def_bool y
@@ -247,6 +261,7 @@ config ARCH_INTEGRATOR
 	select GENERIC_CLOCKEVENTS
 	select PLAT_VERSATILE
 	select PLAT_VERSATILE_FPGA_IRQ
+	select NEED_MACH_MEMORY_H
 	help
 	  Support for ARM's Integrator platform.
 
@@ -262,6 +277,7 @@ config ARCH_REALVIEW
 	select PLAT_VERSATILE_CLCD
 	select ARM_TIMER_SP804
 	select GPIO_PL061 if GPIOLIB
+	select NEED_MACH_MEMORY_H
 	help
 	  This enables support for ARM Ltd RealView boards.
 
@@ -322,6 +338,7 @@ config ARCH_CLPS711X
 	bool "Cirrus Logic CLPS711x/EP721x-based"
 	select CPU_ARM720T
 	select ARCH_USES_GETTIMEOFFSET
+	select NEED_MACH_MEMORY_H
 	help
 	  Support for Cirrus Logic 711x/721x based boards.
 
@@ -361,6 +378,7 @@ config ARCH_EBSA110
 	select ISA
 	select NO_IOPORT
 	select ARCH_USES_GETTIMEOFFSET
+	select NEED_MACH_MEMORY_H
 	help
 	  This is an evaluation board for the StrongARM processor available
 	  from Digital. It has limited hardware on-board, including an
@@ -376,6 +394,7 @@ config ARCH_EP93XX
 	select ARCH_REQUIRE_GPIOLIB
 	select ARCH_HAS_HOLES_MEMORYMODEL
 	select ARCH_USES_GETTIMEOFFSET
+	select NEED_MEMORY_H
 	help
 	  This enables support for the Cirrus EP93xx series of CPUs.
 
@@ -385,6 +404,7 @@ config ARCH_FOOTBRIDGE
 	select FOOTBRIDGE
 	select GENERIC_CLOCKEVENTS
 	select HAVE_IDE
+	select NEED_MACH_MEMORY_H
 	help
 	  Support for systems based on the DC21285 companion chip
 	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
@@ -434,6 +454,7 @@ config ARCH_IOP13XX
 	select PCI
 	select ARCH_SUPPORTS_MSI
 	select VMSPLIT_1G
+	select NEED_MACH_MEMORY_H
 	help
 	  Support for Intel's IOP13XX (XScale) family of processors.
 
@@ -464,6 +485,7 @@ config ARCH_IXP23XX
 	select CPU_XSC3
  	select PCI
 	select ARCH_USES_GETTIMEOFFSET
+	select NEED_MACH_MEMORY_H
 	help
 	  Support for Intel's IXP23xx (XScale) family of processors.
 
@@ -473,6 +495,7 @@ config ARCH_IXP2000
 	select CPU_XSCALE
 	select PCI
 	select ARCH_USES_GETTIMEOFFSET
+	select NEED_MACH_MEMORY_H
 	help
 	  Support for Intel's IXP2400/2800 (XScale) family of processors.
 
@@ -565,6 +588,7 @@ config ARCH_KS8695
 	select CPU_ARM922T
 	select ARCH_REQUIRE_GPIOLIB
 	select ARCH_USES_GETTIMEOFFSET
+	select NEED_MACH_MEMORY_H
 	help
 	  Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
 	  System-on-Chip devices.
@@ -657,6 +681,7 @@ config ARCH_SHMOBILE
 	select SPARSE_IRQ
 	select MULTI_IRQ_HANDLER
 	select PM_GENERIC_DOMAINS if PM
+	select NEED_MACH_MEMORY_H
 	help
 	  Support for Renesas's SH-Mobile and R-Mobile ARM platforms.
 
@@ -672,6 +697,7 @@ config ARCH_RPC
 	select ARCH_SPARSEMEM_ENABLE
 	select ARCH_USES_GETTIMEOFFSET
 	select HAVE_IDE
+	select NEED_MACH_MEMORY_H
 	help
 	  On the Acorn Risc-PC, Linux can support the internal IDE disk and
 	  CD-ROM interface, serial and parallel port, and the floppy drive.
@@ -691,6 +717,7 @@ config ARCH_SA1100
 	select TICK_ONESHOT
 	select ARCH_REQUIRE_GPIOLIB
 	select HAVE_IDE
+	select NEED_MACH_MEMORY_H
 	help
 	  Support for StrongARM 11x0 based boards.
 
@@ -782,6 +809,7 @@ config ARCH_S5PV210
 	select HAVE_S3C2410_I2C if I2C
 	select HAVE_S3C_RTC if RTC_CLASS
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
+	select NEED_MACH_MEMORY_H
 	help
 	  Samsung S5PV210/S5PC110 series based systems
 
@@ -798,6 +826,7 @@ config ARCH_EXYNOS4
 	select HAVE_S3C_RTC if RTC_CLASS
 	select HAVE_S3C2410_I2C if I2C
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
+	select NEED_MACH_MEMORY_H
 	help
 	  Samsung EXYNOS4 series based systems
 
@@ -809,6 +838,7 @@ config ARCH_SHARK
 	select ZONE_DMA
 	select PCI
 	select ARCH_USES_GETTIMEOFFSET
+	select NEED_MACH_MEMORY_H
 	help
 	  Support for the StrongARM based Digital DNARD machine, also known
 	  as "Shark" (<http://www.shark-linux.de/shark.html>).
@@ -837,6 +867,7 @@ config ARCH_U300
 	select HAVE_MACH_CLKDEV
 	select GENERIC_GPIO
 	select ARCH_REQUIRE_GPIOLIB
+	select NEED_MACH_MEMORY_H
 	help
 	  Support for ST-Ericsson U300 series mobile platforms.
 
@@ -1835,6 +1866,38 @@ config ZBOOT_ROM_SH_MOBILE_SDHI
 
 endchoice
 
+config ARM_APPENDED_DTB
+	bool "Use appended device tree blob to zImage (EXPERIMENTAL)"
+	depends on OF && !ZBOOT_ROM && EXPERIMENTAL
+	help
+	  With this option, the boot code will look for a device tree binary
+	  (DTB) appended to zImage
+	  (e.g. cat zImage <filename>.dtb > zImage_w_dtb).
+
+	  This is meant as a backward compatibility convenience for those
+	  systems with a bootloader that can't be upgraded to accommodate
+	  the documented boot protocol using a device tree.
+
+	  Beware that there is very little in terms of protection against
+	  this option being confused by leftover garbage in memory that might
+	  look like a DTB header after a reboot if no actual DTB is appended
+	  to zImage.  Do not leave this option active in a production kernel
+	  if you don't intend to always append a DTB.  Proper passing of the
+	  location into r2 of a bootloader provided DTB is always preferable
+	  to this option.
+
+config ARM_ATAG_DTB_COMPAT
+	bool "Supplement the appended DTB with traditional ATAG information"
+	depends on ARM_APPENDED_DTB
+	help
+	  Some old bootloaders can't be updated to a DTB capable one, yet
+	  they provide ATAGs with memory configuration, the ramdisk address,
+	  the kernel cmdline string, etc.  Such information is dynamically
+	  provided by the bootloader and can't always be stored in a static
+	  DTB.  To allow a device tree enabled kernel to be used with such
+	  bootloaders, this option allows zImage to extract the information
+	  from the ATAG list and store it at run time into the appended DTB.
+
 config CMDLINE
 	string "Default kernel command string"
 	default ""

arch/arm/Kconfig.debug

View file

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index df3eb3c..f283938 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -158,4 +158,10 @@ config DEBUG_S3C_UART
 	  The uncompressor code port configuration is now handled
 	  by CONFIG_S3C_LOWLEVEL_UART_PORT.
 
+config ARM_KPROBES_TEST
+	tristate "Kprobes test module"
+	depends on KPROBES && MODULES
+	help
+	  Perform tests of kprobes API and instruction set simulation.
+
 endmenu

arch/arm/boot/compressed/.gitignore

View file

diff --git a/arch/arm/boot/compressed/.gitignore b/arch/arm/boot/compressed/.gitignore
index c602896..e0936a1 100644
--- a/arch/arm/boot/compressed/.gitignore
+++ b/arch/arm/boot/compressed/.gitignore
@@ -5,3 +5,12 @@ piggy.lzo
 piggy.lzma
 vmlinux
 vmlinux.lds
+
+# borrowed libfdt files
+fdt.c
+fdt.h
+fdt_ro.c
+fdt_rw.c
+fdt_wip.c
+libfdt.h
+libfdt_internal.h

arch/arm/boot/compressed/Makefile

View file

diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index a6b30b3..21f56ff 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -26,6 +26,10 @@ HEAD	= head.o
 OBJS	+= misc.o decompress.o
 FONTC	= $(srctree)/drivers/video/console/font_acorn_8x8.c
 
+# string library code (-Os is enforced to keep it much smaller)
+OBJS		+= string.o
+CFLAGS_string.o	:= -Os
+
 #
 # Architecture dependencies
 #
@@ -89,21 +93,41 @@ suffix_$(CONFIG_KERNEL_GZIP) = gzip
 suffix_$(CONFIG_KERNEL_LZO)  = lzo
 suffix_$(CONFIG_KERNEL_LZMA) = lzma
 
+# Borrowed libfdt files for the ATAG compatibility mode
+
+libfdt		:= fdt_rw.c fdt_ro.c fdt_wip.c fdt.c
+libfdt_hdrs	:= fdt.h libfdt.h libfdt_internal.h
+
+libfdt_objs	:= $(addsuffix .o, $(basename $(libfdt)))
+
+$(addprefix $(obj)/,$(libfdt) $(libfdt_hdrs)): $(obj)/%: $(srctree)/scripts/dtc/libfdt/%
+	$(call cmd,shipped)
+
+$(addprefix $(obj)/,$(libfdt_objs) atags_to_fdt.o): \
+	$(addprefix $(obj)/,$(libfdt_hdrs))
+
+ifeq ($(CONFIG_ARM_ATAG_DTB_COMPAT),y)
+OBJS	+= $(libfdt_objs) atags_to_fdt.o
+endif
+
 targets       := vmlinux vmlinux.lds \
 		 piggy.$(suffix_y) piggy.$(suffix_y).o \
-		 font.o font.c head.o misc.o $(OBJS)
+		 lib1funcs.o lib1funcs.S font.o font.c head.o misc.o $(OBJS)
 
 # Make sure files are removed during clean
-extra-y       += piggy.gzip piggy.lzo piggy.lzma lib1funcs.S
+extra-y       += piggy.gzip piggy.lzo piggy.lzma lib1funcs.S $(libfdt) $(libfdt_hdrs)
 
 ifeq ($(CONFIG_FUNCTION_TRACER),y)
 ORIG_CFLAGS := $(KBUILD_CFLAGS)
 KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
 endif
 
-ccflags-y := -fpic -fno-builtin
+ccflags-y := -fpic -fno-builtin -I$(obj)
 asflags-y := -Wa,-march=all
 
+# Supply kernel BSS size to the decompressor via a linker symbol.
+KBSS_SZ = $(shell size $(obj)/../../../../vmlinux | awk 'END{print $$3}')
+LDFLAGS_vmlinux = --defsym _kernel_bss_size=$(KBSS_SZ)
 # Supply ZRELADDR to the decompressor via a linker symbol.
 ifneq ($(CONFIG_AUTO_ZRELADDR),y)
 LDFLAGS_vmlinux += --defsym zreladdr=$(ZRELADDR)
@@ -123,7 +147,7 @@ LDFLAGS_vmlinux += -T
 # For __aeabi_uidivmod
 lib1funcs = $(obj)/lib1funcs.o
 
-$(obj)/lib1funcs.S: $(srctree)/arch/$(SRCARCH)/lib/lib1funcs.S FORCE
+$(obj)/lib1funcs.S: $(srctree)/arch/$(SRCARCH)/lib/lib1funcs.S
 	$(call cmd,shipped)
 
 # We need to prevent any GOTOFF relocs being used with references

arch/arm/boot/compressed/atags_to_fdt.c

View file

diff --git a/arch/arm/boot/compressed/atags_to_fdt.c b/arch/arm/boot/compressed/atags_to_fdt.c
new file mode 100644
index 0000000..6ce11c4
--- /dev/null
+++ b/arch/arm/boot/compressed/atags_to_fdt.c
@@ -0,0 +1,97 @@
+#include <asm/setup.h>
+#include <libfdt.h>
+
+static int node_offset(void *fdt, const char *node_path)
+{
+	int offset = fdt_path_offset(fdt, node_path);
+	if (offset == -FDT_ERR_NOTFOUND)
+		offset = fdt_add_subnode(fdt, 0, node_path);
+	return offset;
+}
+
+static int setprop(void *fdt, const char *node_path, const char *property,
+		   uint32_t *val_array, int size)
+{
+	int offset = node_offset(fdt, node_path);
+	if (offset < 0)
+		return offset;
+	return fdt_setprop(fdt, offset, property, val_array, size);
+}
+
+static int setprop_string(void *fdt, const char *node_path,
+			  const char *property, const char *string)
+{
+	int offset = node_offset(fdt, node_path);
+	if (offset < 0)
+		return offset;
+	return fdt_setprop_string(fdt, offset, property, string);
+}
+
+static int setprop_cell(void *fdt, const char *node_path,
+			const char *property, uint32_t val)
+{
+	int offset = node_offset(fdt, node_path);
+	if (offset < 0)
+		return offset;
+	return fdt_setprop_cell(fdt, offset, property, val);
+}
+
+/*
+ * Convert and fold provided ATAGs into the provided FDT.
+ *
+ * REturn values:
+ *    = 0 -> pretend success
+ *    = 1 -> bad ATAG (may retry with another possible ATAG pointer)
+ *    < 0 -> error from libfdt
+ */
+int atags_to_fdt(void *atag_list, void *fdt, int total_space)
+{
+	struct tag *atag = atag_list;
+	uint32_t mem_reg_property[2 * NR_BANKS];
+	int memcount = 0;
+	int ret;
+
+	/* make sure we've got an aligned pointer */
+	if ((u32)atag_list & 0x3)
+		return 1;
+
+	/* if we get a DTB here we're done already */
+	if (*(u32 *)atag_list == fdt32_to_cpu(FDT_MAGIC))
+	       return 0;
+
+	/* validate the ATAG */
+	if (atag->hdr.tag != ATAG_CORE ||
+	    (atag->hdr.size != tag_size(tag_core) &&
+	     atag->hdr.size != 2))
+		return 1;
+
+	/* let's give it all the room it could need */
+	ret = fdt_open_into(fdt, fdt, total_space);
+	if (ret < 0)
+		return ret;
+
+	for_each_tag(atag, atag_list) {
+		if (atag->hdr.tag == ATAG_CMDLINE) {
+			setprop_string(fdt, "/chosen", "bootargs",
+					atag->u.cmdline.cmdline);
+		} else if (atag->hdr.tag == ATAG_MEM) {
+			if (memcount >= sizeof(mem_reg_property)/4)
+				continue;
+			mem_reg_property[memcount++] = cpu_to_fdt32(atag->u.mem.start);
+			mem_reg_property[memcount++] = cpu_to_fdt32(atag->u.mem.size);
+		} else if (atag->hdr.tag == ATAG_INITRD2) {
+			uint32_t initrd_start, initrd_size;
+			initrd_start = atag->u.initrd.start;
+			initrd_size = atag->u.initrd.size;
+			setprop_cell(fdt, "/chosen", "linux,initrd-start",
+					initrd_start);
+			setprop_cell(fdt, "/chosen", "linux,initrd-end",
+					initrd_start + initrd_size);
+		}
+	}
+
+	if (memcount)
+		setprop(fdt, "/memory", "reg", mem_reg_property, 4*memcount);
+
+	return fdt_pack(fdt);
+}

arch/arm/boot/compressed/head.S

View file

diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index e95a598..c2effc9 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -216,6 +216,104 @@ restart:	adr	r0, LC0
 		mov	r10, r6
 #endif
 
+		mov	r5, #0			@ init dtb size to 0
+#ifdef CONFIG_ARM_APPENDED_DTB
+/*
+ *   r0  = delta
+ *   r2  = BSS start
+ *   r3  = BSS end
+ *   r4  = final kernel address
+ *   r5  = appended dtb size (still unknown)
+ *   r6  = _edata
+ *   r7  = architecture ID
+ *   r8  = atags/device tree pointer
+ *   r9  = size of decompressed image
+ *   r10 = end of this image, including  bss/stack/malloc space if non XIP
+ *   r11 = GOT start
+ *   r12 = GOT end
+ *   sp  = stack pointer
+ *
+ * if there are device trees (dtb) appended to zImage, advance r10 so that the
+ * dtb data will get relocated along with the kernel if necessary.
+ */
+
+		ldr	lr, [r6, #0]
+#ifndef __ARMEB__
+		ldr	r1, =0xedfe0dd0		@ sig is 0xd00dfeed big endian
+#else
+		ldr	r1, =0xd00dfeed
+#endif
+		cmp	lr, r1
+		bne	dtb_check_done		@ not found
+
+#ifdef CONFIG_ARM_ATAG_DTB_COMPAT
+		/*
+		 * OK... Let's do some funky business here.
+		 * If we do have a DTB appended to zImage, and we do have
+		 * an ATAG list around, we want the later to be translated
+		 * and folded into the former here.  To be on the safe side,
+		 * let's temporarily move  the stack away into the malloc
+		 * area.  No GOT fixup has occurred yet, but none of the
+		 * code we're about to call uses any global variable.
+		*/
+		add	sp, sp, #0x10000
+		stmfd	sp!, {r0-r3, ip, lr}
+		mov	r0, r8
+		mov	r1, r6
+		sub	r2, sp, r6
+		bl	atags_to_fdt
+
+		/*
+		 * If returned value is 1, there is no ATAG at the location
+		 * pointed by r8.  Try the typical 0x100 offset from start
+		 * of RAM and hope for the best.
+		 */
+		cmp	r0, #1
+		sub	r0, r4, #TEXT_OFFSET
+		add	r0, r0, #0x100
+		mov	r1, r6
+		sub	r2, sp, r6
+		blne	atags_to_fdt
+
+		ldmfd	sp!, {r0-r3, ip, lr}
+		sub	sp, sp, #0x10000
+#endif
+
+		mov	r8, r6			@ use the appended device tree
+
+		/*
+		 * Make sure that the DTB doesn't end up in the final
+		 * kernel's .bss area. To do so, we adjust the decompressed
+		 * kernel size to compensate if that .bss size is larger
+		 * than the relocated code.
+		 */
+		ldr	r5, =_kernel_bss_size
+		adr	r1, wont_overwrite
+		sub	r1, r6, r1
+		subs	r1, r5, r1
+		addhi	r9, r9, r1
+
+		/* Get the dtb's size */
+		ldr	r5, [r6, #4]
+#ifndef __ARMEB__
+		/* convert r5 (dtb size) to little endian */
+		eor	r1, r5, r5, ror #16
+		bic	r1, r1, #0x00ff0000
+		mov	r5, r5, ror #8
+		eor	r5, r5, r1, lsr #8
+#endif
+
+		/* preserve 64-bit alignment */
+		add	r5, r5, #7
+		bic	r5, r5, #7
+
+		/* relocate some pointers past the appended dtb */
+		add	r6, r6, r5
+		add	r10, r10, r5
+		add	sp, sp, r5
+dtb_check_done:
+#endif
+
 /*
  * Check to see if we will overwrite ourselves.
  *   r4  = final kernel address
@@ -223,15 +321,14 @@ restart:	adr	r0, LC0
  *   r10 = end of this image, including  bss/stack/malloc space if non XIP
  * We basically want:
  *   r4 - 16k page directory >= r10 -> OK
- *   r4 + image length <= current position (pc) -> OK
+ *   r4 + image length <= address of wont_overwrite -> OK
  */
 		add	r10, r10, #16384
 		cmp	r4, r10
 		bhs	wont_overwrite
 		add	r10, r4, r9
-   ARM(		cmp	r10, pc		)
- THUMB(		mov	lr, pc		)
- THUMB(		cmp	r10, lr		)
+		adr	r9, wont_overwrite
+		cmp	r10, r9
 		bls	wont_overwrite
 
 /*
@@ -285,14 +382,16 @@ wont_overwrite:
  *   r2  = BSS start
  *   r3  = BSS end
  *   r4  = kernel execution address
+ *   r5  = appended dtb size (0 if not present)
  *   r7  = architecture ID
  *   r8  = atags pointer
  *   r11 = GOT start
  *   r12 = GOT end
  *   sp  = stack pointer
  */
-		teq	r0, #0
+		orrs	r1, r0, r5
 		beq	not_relocated
+
 		add	r11, r11, r0
 		add	r12, r12, r0
 
@@ -307,12 +406,21 @@ wont_overwrite:
 
 		/*
 		 * Relocate all entries in the GOT table.
+		 * Bump bss entries to _edata + dtb size
 		 */
 1:		ldr	r1, [r11, #0]		@ relocate entries in the GOT
-		add	r1, r1, r0		@ table.  This fixes up the
-		str	r1, [r11], #4		@ C references.
+		add	r1, r1, r0		@ This fixes up C references
+		cmp	r1, r2			@ if entry >= bss_start &&
+		cmphs	r3, r1			@       bss_end > entry
+		addhi	r1, r1, r5		@    entry += dtb size
+		str	r1, [r11], #4		@ next entry
 		cmp	r11, r12
 		blo	1b
+
+		/* bump our bss pointers too */
+		add	r2, r2, r5
+		add	r3, r3, r5
+
 #else
 
 		/*

arch/arm/boot/compressed/libfdt_env.h

View file

diff --git a/arch/arm/boot/compressed/libfdt_env.h b/arch/arm/boot/compressed/libfdt_env.h
new file mode 100644
index 0000000..1f4e718
--- /dev/null
+++ b/arch/arm/boot/compressed/libfdt_env.h
@@ -0,0 +1,15 @@
+#ifndef _ARM_LIBFDT_ENV_H
+#define _ARM_LIBFDT_ENV_H
+
+#include <linux/types.h>
+#include <linux/string.h>
+#include <asm/byteorder.h>
+
+#define fdt16_to_cpu(x)		be16_to_cpu(x)
+#define cpu_to_fdt16(x)		cpu_to_be16(x)
+#define fdt32_to_cpu(x)		be32_to_cpu(x)
+#define cpu_to_fdt32(x)		cpu_to_be32(x)
+#define fdt64_to_cpu(x)		be64_to_cpu(x)
+#define cpu_to_fdt64(x)		cpu_to_be64(x)