* Pull request: removal of most instances of mach/memory.h
@ 2011-09-07 3:13 Nicolas Pitre
2011-09-13 12:50 ` Nicolas Pitre
0 siblings, 1 reply; 22+ messages in thread
From: Nicolas Pitre @ 2011-09-07 3:13 UTC (permalink / raw)
To: linux-arm-kernel
Russell, please consider this pull request for the next merge window:
git://git.linaro.org/people/nico/linux mach_memory_h
The bulk of the patches included in there were already posted on the
list on July 5th. Some others like the OMAP debug macro cleanups were
posted and reviewed more recently.
The base for this series is your devel-stable branch where some
prerequisite series are, into which I also merged commit daece59689 in
order to get ARM_PATCH_PHYS_VIRT enabled by default as this series also
depends on this.
I also merged the patch entitled "get rid of a few StrongARM
cache-related build time constants" as this is a prerequisite for the
removal of mach/memory.h in mach-ebsa110 and mach-shark (more if the
sparsemem stuff gets moved). If you don't feel comfortable having this
patch merged then I can remove it along with those commits that depend
on it.
And the last commit switches the initially introduced logic with the
Kconfig symbol NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H since not having a
mach/memory.h has become the dominant case. However this makes for a
long and boringly trivial patch, especially if posted alone, so I didn't
post it.
The summary stat is a net reduction of almost 1000 lines, and another
step towards the ability to combine multiple SOCs in the same kernel
binary.
Here's the shortlog and diffstat:
Nicolas Pitre (53):
Merge the enabling by default of ARM_PATCH_PHYS_VIRT
ARM: mach-prima2: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size
ARM: get rid of a few StrongARM cache-related build time constants
musb_debugfs.c: remove unneeded includes on ARM
ARM: add an extra temp register to the addruart low level debugging macro
ARM: plat-omap: make OMAP_UART_INFO into a relative offset
ARM: mach-omap1: clean up debug-macro.S
ARM: mach-omap2: clean up debug-macro.S
ARM: mach-davinci: make DAVINCI_UART_INFO into a relative offset
ARM: mach-davinci: clean up debug-macro.S
ARM: prepare for removal of a bunch of <mach/memory.h> files
ARM: mach-dove: remove include/mach/memory.h
ARM: mach-kirkwood: remove mach/memory.h
ARM: mach-orion5x: remove mach/memory.h
ARM: OMAP: move OMAP1 memory config from plat/memory.h to its mach/memory.h
ARM: mach-omap2: remove mach/memory.h
ARM: mach-iop33x: remove mach/memory.h
ARM: mach-ep93xx: remove mach/memory.h and Kconfig selection of SDRAM bank
ARM: mach-s3c2410: remove memory.h
ARM: mach-mv78xx0: remove mach/memory.h
ARM: mach-vexpress: remove mach/memory.h
ARM: mach-w90x900: remove mach/memory.h
ARM: mach-pnx4008: remove mach/memory.h
ARM: mach-iop32x: remove mach/memory.h
ARM: mach-nomadik: remove mach/memory.h
ARM: mach-ux500: remove mach/memory.h
ARM: mach-versatile: remove mach/memory.h
ARM: mach-netx: remove mach/memory.h
ARM: mach-lpc32xx: remove mach/memory.h
ARM: mach-gemini: remove mach/memory.h
ARM: mach-msm: remove mach/memory.h
ARM: spear: remove mach/memory.h and plat/memory.h
ARM: mach-mxs: remove mach/memory.h
ARM: mach-nuc93x: remove mach/memory.h
ARM: mach-cns3xxx: remove mach/memory.h
ARM: mach-mmp: remove mach/memory.h
ARM: plat-tcc: remove mach/memory.h
ARM: mach-tegra: remove mach/memory.h
ARM: mach-s5pc100: remove mach/memory.h
ARM: mach-vt8500: remove mach/memory.h
ARM: mach-shark: remove mach/memory.h
ARM: mach-ebsa110: remove mach/memory.h
ARM: mach-h720x: remove mach/memory.h
ARM: mach-ixp4xx: remove mach/memory.h
ARM: mach-pxa: remove mach/memory.h
ARM: mach-davinci: remove mach/memory.h
ARM: mach-bcmring: remove mach/memory.h
ARM: mach-zynq: remove mach/memory.h
ARM: mach-prima2: remove mach/memory.h
ARM: plat-mxc: remove mach/memory.h
ARM: mach-s3c64xx: remove mach/memory.h
ARM: mach-s5p64x0: remove mach/memory.h
ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H
Documentation/arm/memory.txt | 7 +-
arch/arm/Kconfig | 28 ++++
arch/arm/include/asm/cacheflush.h | 10 ++
arch/arm/include/asm/memory.h | 9 ++-
arch/arm/kernel/debug.S | 2 +-
arch/arm/kernel/head.S | 4 +-
arch/arm/mach-at91/include/mach/debug-macro.S | 2 +-
arch/arm/mach-bcmring/include/mach/hardware.h | 3 +-
arch/arm/mach-bcmring/include/mach/memory.h | 28 ----
arch/arm/mach-clps711x/include/mach/debug-macro.S | 2 +-
arch/arm/mach-cns3xxx/include/mach/debug-macro.S | 2 +-
arch/arm/mach-cns3xxx/include/mach/memory.h | 26 ----
arch/arm/mach-davinci/cpuidle.c | 2 +-
arch/arm/mach-davinci/include/mach/ddr2.h | 4 +
arch/arm/mach-davinci/include/mach/debug-macro.S | 52 ++++-----
arch/arm/mach-davinci/include/mach/memory.h | 39 ------
arch/arm/mach-davinci/include/mach/serial.h | 3 +-
arch/arm/mach-davinci/include/mach/uncompress.h | 7 +-
arch/arm/mach-davinci/sleep.S | 2 +-
arch/arm/mach-dove/include/mach/debug-macro.S | 2 +-
arch/arm/mach-dove/include/mach/memory.h | 10 --
arch/arm/mach-ebsa110/core.c | 4 +
arch/arm/mach-ebsa110/include/mach/debug-macro.S | 2 +-
arch/arm/mach-ebsa110/include/mach/hardware.h | 5 -
arch/arm/mach-ebsa110/include/mach/memory.h | 30 -----
arch/arm/mach-ep93xx/Kconfig | 53 --------
arch/arm/mach-ep93xx/Makefile.boot | 14 --
arch/arm/mach-ep93xx/include/mach/debug-macro.S | 2 +-
arch/arm/mach-ep93xx/include/mach/memory.h | 22 ----
arch/arm/mach-exynos4/include/mach/debug-macro.S | 2 +-
arch/arm/mach-footbridge/common.c | 3 +
.../arm/mach-footbridge/include/mach/debug-macro.S | 4 +-
arch/arm/mach-footbridge/include/mach/hardware.h | 2 -
arch/arm/mach-footbridge/include/mach/memory.h | 7 -
arch/arm/mach-gemini/include/mach/debug-macro.S | 2 +-
arch/arm/mach-gemini/include/mach/memory.h | 19 ---
arch/arm/mach-h720x/include/mach/debug-macro.S | 2 +-
arch/arm/mach-h720x/include/mach/memory.h | 11 --
.../arm/mach-integrator/include/mach/debug-macro.S | 2 +-
arch/arm/mach-iop13xx/include/mach/debug-macro.S | 2 +-
arch/arm/mach-iop32x/include/mach/debug-macro.S | 2 +-
arch/arm/mach-iop32x/include/mach/memory.h | 13 --
arch/arm/mach-iop33x/include/mach/debug-macro.S | 2 +-
arch/arm/mach-iop33x/include/mach/memory.h | 13 --
arch/arm/mach-ixp2000/include/mach/debug-macro.S | 2 +-
arch/arm/mach-ixp23xx/include/mach/debug-macro.S | 2 +-
arch/arm/mach-ixp4xx/include/mach/debug-macro.S | 2 +-
arch/arm/mach-ixp4xx/include/mach/memory.h | 17 ---
arch/arm/mach-kirkwood/include/mach/debug-macro.S | 2 +-
arch/arm/mach-kirkwood/include/mach/memory.h | 10 --
arch/arm/mach-ks8695/include/mach/debug-macro.S | 2 +-
arch/arm/mach-l7200/include/mach/debug-macro.S | 2 +-
arch/arm/mach-lpc32xx/include/mach/debug-macro.S | 2 +-
arch/arm/mach-lpc32xx/include/mach/memory.h | 27 ----
arch/arm/mach-mmp/include/mach/debug-macro.S | 2 +-
arch/arm/mach-mmp/include/mach/memory.h | 14 --
arch/arm/mach-msm/include/mach/debug-macro.S | 4 +-
arch/arm/mach-msm/include/mach/memory.h | 35 ------
arch/arm/mach-mv78xx0/include/mach/debug-macro.S | 2 +-
arch/arm/mach-mv78xx0/include/mach/memory.h | 10 --
arch/arm/mach-mxs/include/mach/debug-macro.S | 2 +-
arch/arm/mach-mxs/include/mach/memory.h | 24 ----
arch/arm/mach-netx/include/mach/debug-macro.S | 2 +-
arch/arm/mach-netx/include/mach/memory.h | 26 ----
arch/arm/mach-nomadik/include/mach/debug-macro.S | 2 +-
arch/arm/mach-nomadik/include/mach/memory.h | 28 ----
arch/arm/mach-nuc93x/include/mach/memory.h | 21 ---
arch/arm/mach-omap1/include/mach/debug-macro.S | 48 +++----
arch/arm/mach-omap1/include/mach/memory.h | 53 ++++++++-
arch/arm/mach-omap2/include/mach/debug-macro.S | 81 ++++++-------
arch/arm/mach-omap2/include/mach/memory.h | 5 -
arch/arm/mach-orion5x/include/mach/debug-macro.S | 2 +-
arch/arm/mach-orion5x/include/mach/memory.h | 12 --
arch/arm/mach-pnx4008/include/mach/debug-macro.S | 2 +-
arch/arm/mach-pnx4008/include/mach/memory.h | 21 ---
arch/arm/mach-prima2/include/mach/debug-macro.S | 2 +-
arch/arm/mach-prima2/include/mach/memory.h | 21 ---
arch/arm/mach-prima2/l2x0.c | 5 +-
arch/arm/mach-prima2/prima2.c | 1 +
arch/arm/mach-pxa/include/mach/debug-macro.S | 2 +-
arch/arm/mach-pxa/include/mach/memory.h | 20 ---
arch/arm/mach-pxa/z2.c | 2 +-
arch/arm/mach-realview/include/mach/debug-macro.S | 2 +-
arch/arm/mach-rpc/include/mach/debug-macro.S | 2 +-
arch/arm/mach-rpc/include/mach/hardware.h | 2 -
arch/arm/mach-rpc/include/mach/memory.h | 6 -
arch/arm/mach-rpc/riscpc.c | 4 +
arch/arm/mach-s3c2400/include/mach/memory.h | 20 ---
arch/arm/mach-s3c2410/include/mach/debug-macro.S | 2 +-
arch/arm/mach-s3c2410/include/mach/memory.h | 16 ---
arch/arm/mach-s3c64xx/include/mach/debug-macro.S | 2 +-
arch/arm/mach-s3c64xx/include/mach/memory.h | 18 ---
arch/arm/mach-s5p64x0/include/mach/debug-macro.S | 2 +-
arch/arm/mach-s5p64x0/include/mach/memory.h | 18 ---
arch/arm/mach-s5pc100/include/mach/debug-macro.S | 2 +-
arch/arm/mach-s5pc100/include/mach/memory.h | 18 ---
arch/arm/mach-s5pv210/include/mach/debug-macro.S | 2 +-
arch/arm/mach-sa1100/generic.c | 5 +
arch/arm/mach-sa1100/include/mach/debug-macro.S | 2 +-
arch/arm/mach-sa1100/include/mach/hardware.h | 4 -
arch/arm/mach-sa1100/include/mach/memory.h | 7 -
arch/arm/mach-shark/core.c | 2 +
arch/arm/mach-shark/include/mach/debug-macro.S | 2 +-
arch/arm/mach-shark/include/mach/hardware.h | 16 ---
arch/arm/mach-shark/include/mach/memory.h | 26 ----
arch/arm/mach-spear3xx/include/mach/memory.h | 19 ---
arch/arm/mach-spear6xx/include/mach/memory.h | 19 ---
arch/arm/mach-tegra/include/mach/debug-macro.S | 2 +-
arch/arm/mach-tegra/include/mach/memory.h | 28 ----
arch/arm/mach-u300/include/mach/debug-macro.S | 2 +-
arch/arm/mach-ux500/include/mach/debug-macro.S | 2 +-
arch/arm/mach-ux500/include/mach/memory.h | 18 ---
arch/arm/mach-versatile/include/mach/debug-macro.S | 2 +-
arch/arm/mach-versatile/include/mach/memory.h | 28 ----
arch/arm/mach-vexpress/include/mach/debug-macro.S | 2 +-
arch/arm/mach-vexpress/include/mach/memory.h | 25 ----
arch/arm/mach-vt8500/include/mach/debug-macro.S | 2 +-
arch/arm/mach-vt8500/include/mach/memory.h | 28 ----
arch/arm/mach-w90x900/include/mach/memory.h | 23 ----
arch/arm/mach-zynq/include/mach/debug-macro.S | 2 +-
arch/arm/mach-zynq/include/mach/memory.h | 22 ----
arch/arm/mm/Makefile | 2 +-
arch/arm/mm/cache-v4wb-init.c | 89 ++++++++++++++
arch/arm/mm/cache-v4wb.S | 31 +----
arch/arm/mm/mmu.c | 43 ++-----
arch/arm/mm/proc-sa110.S | 6 +-
arch/arm/mm/proc-sa1100.S | 6 +-
arch/arm/plat-mxc/include/mach/debug-macro.S | 2 +-
arch/arm/plat-mxc/include/mach/memory.h | 43 -------
arch/arm/plat-omap/Kconfig | 1 +
arch/arm/plat-omap/include/plat/memory.h | 89 --------------
arch/arm/plat-omap/include/plat/serial.h | 6 +-
arch/arm/plat-omap/include/plat/uncompress.h | 8 +-
arch/arm/plat-spear/include/plat/debug-macro.S | 2 +-
arch/arm/plat-spear/include/plat/memory.h | 20 ---
arch/arm/plat-tcc/include/mach/debug-macro.S | 2 +-
arch/arm/plat-tcc/include/mach/memory.h | 18 ---
drivers/usb/musb/musb_debugfs.c | 6 -
138 files changed, 400 insertions(+), 1357 deletions(-)
^ permalink raw reply [flat|nested] 22+ messages in thread
* Pull request: removal of most instances of mach/memory.h
2011-09-07 3:13 Pull request: removal of most instances of mach/memory.h Nicolas Pitre
@ 2011-09-13 12:50 ` Nicolas Pitre
2011-09-20 17:53 ` Nicolas Pitre
0 siblings, 1 reply; 22+ messages in thread
From: Nicolas Pitre @ 2011-09-13 12:50 UTC (permalink / raw)
To: linux-arm-kernel
Ping.
On Tue, 6 Sep 2011, Nicolas Pitre wrote:
> Russell, please consider this pull request for the next merge window:
>
> git://git.linaro.org/people/nico/linux mach_memory_h
>
> The bulk of the patches included in there were already posted on the
> list on July 5th. Some others like the OMAP debug macro cleanups were
> posted and reviewed more recently.
>
> The base for this series is your devel-stable branch where some
> prerequisite series are, into which I also merged commit daece59689 in
> order to get ARM_PATCH_PHYS_VIRT enabled by default as this series also
> depends on this.
>
> I also merged the patch entitled "get rid of a few StrongARM
> cache-related build time constants" as this is a prerequisite for the
> removal of mach/memory.h in mach-ebsa110 and mach-shark (more if the
> sparsemem stuff gets moved). If you don't feel comfortable having this
> patch merged then I can remove it along with those commits that depend
> on it.
>
> And the last commit switches the initially introduced logic with the
> Kconfig symbol NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H since not having a
> mach/memory.h has become the dominant case. However this makes for a
> long and boringly trivial patch, especially if posted alone, so I didn't
> post it.
>
> The summary stat is a net reduction of almost 1000 lines, and another
> step towards the ability to combine multiple SOCs in the same kernel
> binary.
>
> Here's the shortlog and diffstat:
>
> Nicolas Pitre (53):
> Merge the enabling by default of ARM_PATCH_PHYS_VIRT
> ARM: mach-prima2: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size
> ARM: get rid of a few StrongARM cache-related build time constants
> musb_debugfs.c: remove unneeded includes on ARM
> ARM: add an extra temp register to the addruart low level debugging macro
> ARM: plat-omap: make OMAP_UART_INFO into a relative offset
> ARM: mach-omap1: clean up debug-macro.S
> ARM: mach-omap2: clean up debug-macro.S
> ARM: mach-davinci: make DAVINCI_UART_INFO into a relative offset
> ARM: mach-davinci: clean up debug-macro.S
> ARM: prepare for removal of a bunch of <mach/memory.h> files
> ARM: mach-dove: remove include/mach/memory.h
> ARM: mach-kirkwood: remove mach/memory.h
> ARM: mach-orion5x: remove mach/memory.h
> ARM: OMAP: move OMAP1 memory config from plat/memory.h to its mach/memory.h
> ARM: mach-omap2: remove mach/memory.h
> ARM: mach-iop33x: remove mach/memory.h
> ARM: mach-ep93xx: remove mach/memory.h and Kconfig selection of SDRAM bank
> ARM: mach-s3c2410: remove memory.h
> ARM: mach-mv78xx0: remove mach/memory.h
> ARM: mach-vexpress: remove mach/memory.h
> ARM: mach-w90x900: remove mach/memory.h
> ARM: mach-pnx4008: remove mach/memory.h
> ARM: mach-iop32x: remove mach/memory.h
> ARM: mach-nomadik: remove mach/memory.h
> ARM: mach-ux500: remove mach/memory.h
> ARM: mach-versatile: remove mach/memory.h
> ARM: mach-netx: remove mach/memory.h
> ARM: mach-lpc32xx: remove mach/memory.h
> ARM: mach-gemini: remove mach/memory.h
> ARM: mach-msm: remove mach/memory.h
> ARM: spear: remove mach/memory.h and plat/memory.h
> ARM: mach-mxs: remove mach/memory.h
> ARM: mach-nuc93x: remove mach/memory.h
> ARM: mach-cns3xxx: remove mach/memory.h
> ARM: mach-mmp: remove mach/memory.h
> ARM: plat-tcc: remove mach/memory.h
> ARM: mach-tegra: remove mach/memory.h
> ARM: mach-s5pc100: remove mach/memory.h
> ARM: mach-vt8500: remove mach/memory.h
> ARM: mach-shark: remove mach/memory.h
> ARM: mach-ebsa110: remove mach/memory.h
> ARM: mach-h720x: remove mach/memory.h
> ARM: mach-ixp4xx: remove mach/memory.h
> ARM: mach-pxa: remove mach/memory.h
> ARM: mach-davinci: remove mach/memory.h
> ARM: mach-bcmring: remove mach/memory.h
> ARM: mach-zynq: remove mach/memory.h
> ARM: mach-prima2: remove mach/memory.h
> ARM: plat-mxc: remove mach/memory.h
> ARM: mach-s3c64xx: remove mach/memory.h
> ARM: mach-s5p64x0: remove mach/memory.h
> ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H
>
> Documentation/arm/memory.txt | 7 +-
> arch/arm/Kconfig | 28 ++++
> arch/arm/include/asm/cacheflush.h | 10 ++
> arch/arm/include/asm/memory.h | 9 ++-
> arch/arm/kernel/debug.S | 2 +-
> arch/arm/kernel/head.S | 4 +-
> arch/arm/mach-at91/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-bcmring/include/mach/hardware.h | 3 +-
> arch/arm/mach-bcmring/include/mach/memory.h | 28 ----
> arch/arm/mach-clps711x/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-cns3xxx/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-cns3xxx/include/mach/memory.h | 26 ----
> arch/arm/mach-davinci/cpuidle.c | 2 +-
> arch/arm/mach-davinci/include/mach/ddr2.h | 4 +
> arch/arm/mach-davinci/include/mach/debug-macro.S | 52 ++++-----
> arch/arm/mach-davinci/include/mach/memory.h | 39 ------
> arch/arm/mach-davinci/include/mach/serial.h | 3 +-
> arch/arm/mach-davinci/include/mach/uncompress.h | 7 +-
> arch/arm/mach-davinci/sleep.S | 2 +-
> arch/arm/mach-dove/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-dove/include/mach/memory.h | 10 --
> arch/arm/mach-ebsa110/core.c | 4 +
> arch/arm/mach-ebsa110/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-ebsa110/include/mach/hardware.h | 5 -
> arch/arm/mach-ebsa110/include/mach/memory.h | 30 -----
> arch/arm/mach-ep93xx/Kconfig | 53 --------
> arch/arm/mach-ep93xx/Makefile.boot | 14 --
> arch/arm/mach-ep93xx/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-ep93xx/include/mach/memory.h | 22 ----
> arch/arm/mach-exynos4/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-footbridge/common.c | 3 +
> .../arm/mach-footbridge/include/mach/debug-macro.S | 4 +-
> arch/arm/mach-footbridge/include/mach/hardware.h | 2 -
> arch/arm/mach-footbridge/include/mach/memory.h | 7 -
> arch/arm/mach-gemini/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-gemini/include/mach/memory.h | 19 ---
> arch/arm/mach-h720x/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-h720x/include/mach/memory.h | 11 --
> .../arm/mach-integrator/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-iop13xx/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-iop32x/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-iop32x/include/mach/memory.h | 13 --
> arch/arm/mach-iop33x/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-iop33x/include/mach/memory.h | 13 --
> arch/arm/mach-ixp2000/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-ixp23xx/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-ixp4xx/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-ixp4xx/include/mach/memory.h | 17 ---
> arch/arm/mach-kirkwood/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-kirkwood/include/mach/memory.h | 10 --
> arch/arm/mach-ks8695/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-l7200/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-lpc32xx/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-lpc32xx/include/mach/memory.h | 27 ----
> arch/arm/mach-mmp/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-mmp/include/mach/memory.h | 14 --
> arch/arm/mach-msm/include/mach/debug-macro.S | 4 +-
> arch/arm/mach-msm/include/mach/memory.h | 35 ------
> arch/arm/mach-mv78xx0/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-mv78xx0/include/mach/memory.h | 10 --
> arch/arm/mach-mxs/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-mxs/include/mach/memory.h | 24 ----
> arch/arm/mach-netx/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-netx/include/mach/memory.h | 26 ----
> arch/arm/mach-nomadik/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-nomadik/include/mach/memory.h | 28 ----
> arch/arm/mach-nuc93x/include/mach/memory.h | 21 ---
> arch/arm/mach-omap1/include/mach/debug-macro.S | 48 +++----
> arch/arm/mach-omap1/include/mach/memory.h | 53 ++++++++-
> arch/arm/mach-omap2/include/mach/debug-macro.S | 81 ++++++-------
> arch/arm/mach-omap2/include/mach/memory.h | 5 -
> arch/arm/mach-orion5x/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-orion5x/include/mach/memory.h | 12 --
> arch/arm/mach-pnx4008/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-pnx4008/include/mach/memory.h | 21 ---
> arch/arm/mach-prima2/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-prima2/include/mach/memory.h | 21 ---
> arch/arm/mach-prima2/l2x0.c | 5 +-
> arch/arm/mach-prima2/prima2.c | 1 +
> arch/arm/mach-pxa/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-pxa/include/mach/memory.h | 20 ---
> arch/arm/mach-pxa/z2.c | 2 +-
> arch/arm/mach-realview/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-rpc/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-rpc/include/mach/hardware.h | 2 -
> arch/arm/mach-rpc/include/mach/memory.h | 6 -
> arch/arm/mach-rpc/riscpc.c | 4 +
> arch/arm/mach-s3c2400/include/mach/memory.h | 20 ---
> arch/arm/mach-s3c2410/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-s3c2410/include/mach/memory.h | 16 ---
> arch/arm/mach-s3c64xx/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-s3c64xx/include/mach/memory.h | 18 ---
> arch/arm/mach-s5p64x0/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-s5p64x0/include/mach/memory.h | 18 ---
> arch/arm/mach-s5pc100/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-s5pc100/include/mach/memory.h | 18 ---
> arch/arm/mach-s5pv210/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-sa1100/generic.c | 5 +
> arch/arm/mach-sa1100/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-sa1100/include/mach/hardware.h | 4 -
> arch/arm/mach-sa1100/include/mach/memory.h | 7 -
> arch/arm/mach-shark/core.c | 2 +
> arch/arm/mach-shark/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-shark/include/mach/hardware.h | 16 ---
> arch/arm/mach-shark/include/mach/memory.h | 26 ----
> arch/arm/mach-spear3xx/include/mach/memory.h | 19 ---
> arch/arm/mach-spear6xx/include/mach/memory.h | 19 ---
> arch/arm/mach-tegra/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-tegra/include/mach/memory.h | 28 ----
> arch/arm/mach-u300/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-ux500/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-ux500/include/mach/memory.h | 18 ---
> arch/arm/mach-versatile/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-versatile/include/mach/memory.h | 28 ----
> arch/arm/mach-vexpress/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-vexpress/include/mach/memory.h | 25 ----
> arch/arm/mach-vt8500/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-vt8500/include/mach/memory.h | 28 ----
> arch/arm/mach-w90x900/include/mach/memory.h | 23 ----
> arch/arm/mach-zynq/include/mach/debug-macro.S | 2 +-
> arch/arm/mach-zynq/include/mach/memory.h | 22 ----
> arch/arm/mm/Makefile | 2 +-
> arch/arm/mm/cache-v4wb-init.c | 89 ++++++++++++++
> arch/arm/mm/cache-v4wb.S | 31 +----
> arch/arm/mm/mmu.c | 43 ++-----
> arch/arm/mm/proc-sa110.S | 6 +-
> arch/arm/mm/proc-sa1100.S | 6 +-
> arch/arm/plat-mxc/include/mach/debug-macro.S | 2 +-
> arch/arm/plat-mxc/include/mach/memory.h | 43 -------
> arch/arm/plat-omap/Kconfig | 1 +
> arch/arm/plat-omap/include/plat/memory.h | 89 --------------
> arch/arm/plat-omap/include/plat/serial.h | 6 +-
> arch/arm/plat-omap/include/plat/uncompress.h | 8 +-
> arch/arm/plat-spear/include/plat/debug-macro.S | 2 +-
> arch/arm/plat-spear/include/plat/memory.h | 20 ---
> arch/arm/plat-tcc/include/mach/debug-macro.S | 2 +-
> arch/arm/plat-tcc/include/mach/memory.h | 18 ---
> drivers/usb/musb/musb_debugfs.c | 6 -
> 138 files changed, 400 insertions(+), 1357 deletions(-)
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Pull request: removal of most instances of mach/memory.h
2011-09-13 12:50 ` Nicolas Pitre
@ 2011-09-20 17:53 ` Nicolas Pitre
2011-09-26 13:15 ` Russell King - ARM Linux
0 siblings, 1 reply; 22+ messages in thread
From: Nicolas Pitre @ 2011-09-20 17:53 UTC (permalink / raw)
To: linux-arm-kernel
Re-ping.
Please let me know if there is something wrong with this series as I
would like to have sufficient time to fix it if needed.
On Tue, 13 Sep 2011, Nicolas Pitre wrote:
>
> Ping.
>
>
> On Tue, 6 Sep 2011, Nicolas Pitre wrote:
>
> > Russell, please consider this pull request for the next merge window:
> >
> > git://git.linaro.org/people/nico/linux mach_memory_h
> >
> > The bulk of the patches included in there were already posted on the
> > list on July 5th. Some others like the OMAP debug macro cleanups were
> > posted and reviewed more recently.
> >
> > The base for this series is your devel-stable branch where some
> > prerequisite series are, into which I also merged commit daece59689 in
> > order to get ARM_PATCH_PHYS_VIRT enabled by default as this series also
> > depends on this.
> >
> > I also merged the patch entitled "get rid of a few StrongARM
> > cache-related build time constants" as this is a prerequisite for the
> > removal of mach/memory.h in mach-ebsa110 and mach-shark (more if the
> > sparsemem stuff gets moved). If you don't feel comfortable having this
> > patch merged then I can remove it along with those commits that depend
> > on it.
> >
> > And the last commit switches the initially introduced logic with the
> > Kconfig symbol NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H since not having a
> > mach/memory.h has become the dominant case. However this makes for a
> > long and boringly trivial patch, especially if posted alone, so I didn't
> > post it.
> >
> > The summary stat is a net reduction of almost 1000 lines, and another
> > step towards the ability to combine multiple SOCs in the same kernel
> > binary.
> >
> > Here's the shortlog and diffstat:
> >
> > Nicolas Pitre (53):
> > Merge the enabling by default of ARM_PATCH_PHYS_VIRT
> > ARM: mach-prima2: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size
> > ARM: get rid of a few StrongARM cache-related build time constants
> > musb_debugfs.c: remove unneeded includes on ARM
> > ARM: add an extra temp register to the addruart low level debugging macro
> > ARM: plat-omap: make OMAP_UART_INFO into a relative offset
> > ARM: mach-omap1: clean up debug-macro.S
> > ARM: mach-omap2: clean up debug-macro.S
> > ARM: mach-davinci: make DAVINCI_UART_INFO into a relative offset
> > ARM: mach-davinci: clean up debug-macro.S
> > ARM: prepare for removal of a bunch of <mach/memory.h> files
> > ARM: mach-dove: remove include/mach/memory.h
> > ARM: mach-kirkwood: remove mach/memory.h
> > ARM: mach-orion5x: remove mach/memory.h
> > ARM: OMAP: move OMAP1 memory config from plat/memory.h to its mach/memory.h
> > ARM: mach-omap2: remove mach/memory.h
> > ARM: mach-iop33x: remove mach/memory.h
> > ARM: mach-ep93xx: remove mach/memory.h and Kconfig selection of SDRAM bank
> > ARM: mach-s3c2410: remove memory.h
> > ARM: mach-mv78xx0: remove mach/memory.h
> > ARM: mach-vexpress: remove mach/memory.h
> > ARM: mach-w90x900: remove mach/memory.h
> > ARM: mach-pnx4008: remove mach/memory.h
> > ARM: mach-iop32x: remove mach/memory.h
> > ARM: mach-nomadik: remove mach/memory.h
> > ARM: mach-ux500: remove mach/memory.h
> > ARM: mach-versatile: remove mach/memory.h
> > ARM: mach-netx: remove mach/memory.h
> > ARM: mach-lpc32xx: remove mach/memory.h
> > ARM: mach-gemini: remove mach/memory.h
> > ARM: mach-msm: remove mach/memory.h
> > ARM: spear: remove mach/memory.h and plat/memory.h
> > ARM: mach-mxs: remove mach/memory.h
> > ARM: mach-nuc93x: remove mach/memory.h
> > ARM: mach-cns3xxx: remove mach/memory.h
> > ARM: mach-mmp: remove mach/memory.h
> > ARM: plat-tcc: remove mach/memory.h
> > ARM: mach-tegra: remove mach/memory.h
> > ARM: mach-s5pc100: remove mach/memory.h
> > ARM: mach-vt8500: remove mach/memory.h
> > ARM: mach-shark: remove mach/memory.h
> > ARM: mach-ebsa110: remove mach/memory.h
> > ARM: mach-h720x: remove mach/memory.h
> > ARM: mach-ixp4xx: remove mach/memory.h
> > ARM: mach-pxa: remove mach/memory.h
> > ARM: mach-davinci: remove mach/memory.h
> > ARM: mach-bcmring: remove mach/memory.h
> > ARM: mach-zynq: remove mach/memory.h
> > ARM: mach-prima2: remove mach/memory.h
> > ARM: plat-mxc: remove mach/memory.h
> > ARM: mach-s3c64xx: remove mach/memory.h
> > ARM: mach-s5p64x0: remove mach/memory.h
> > ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H
> >
> > Documentation/arm/memory.txt | 7 +-
> > arch/arm/Kconfig | 28 ++++
> > arch/arm/include/asm/cacheflush.h | 10 ++
> > arch/arm/include/asm/memory.h | 9 ++-
> > arch/arm/kernel/debug.S | 2 +-
> > arch/arm/kernel/head.S | 4 +-
> > arch/arm/mach-at91/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-bcmring/include/mach/hardware.h | 3 +-
> > arch/arm/mach-bcmring/include/mach/memory.h | 28 ----
> > arch/arm/mach-clps711x/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-cns3xxx/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-cns3xxx/include/mach/memory.h | 26 ----
> > arch/arm/mach-davinci/cpuidle.c | 2 +-
> > arch/arm/mach-davinci/include/mach/ddr2.h | 4 +
> > arch/arm/mach-davinci/include/mach/debug-macro.S | 52 ++++-----
> > arch/arm/mach-davinci/include/mach/memory.h | 39 ------
> > arch/arm/mach-davinci/include/mach/serial.h | 3 +-
> > arch/arm/mach-davinci/include/mach/uncompress.h | 7 +-
> > arch/arm/mach-davinci/sleep.S | 2 +-
> > arch/arm/mach-dove/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-dove/include/mach/memory.h | 10 --
> > arch/arm/mach-ebsa110/core.c | 4 +
> > arch/arm/mach-ebsa110/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-ebsa110/include/mach/hardware.h | 5 -
> > arch/arm/mach-ebsa110/include/mach/memory.h | 30 -----
> > arch/arm/mach-ep93xx/Kconfig | 53 --------
> > arch/arm/mach-ep93xx/Makefile.boot | 14 --
> > arch/arm/mach-ep93xx/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-ep93xx/include/mach/memory.h | 22 ----
> > arch/arm/mach-exynos4/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-footbridge/common.c | 3 +
> > .../arm/mach-footbridge/include/mach/debug-macro.S | 4 +-
> > arch/arm/mach-footbridge/include/mach/hardware.h | 2 -
> > arch/arm/mach-footbridge/include/mach/memory.h | 7 -
> > arch/arm/mach-gemini/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-gemini/include/mach/memory.h | 19 ---
> > arch/arm/mach-h720x/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-h720x/include/mach/memory.h | 11 --
> > .../arm/mach-integrator/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-iop13xx/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-iop32x/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-iop32x/include/mach/memory.h | 13 --
> > arch/arm/mach-iop33x/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-iop33x/include/mach/memory.h | 13 --
> > arch/arm/mach-ixp2000/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-ixp23xx/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-ixp4xx/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-ixp4xx/include/mach/memory.h | 17 ---
> > arch/arm/mach-kirkwood/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-kirkwood/include/mach/memory.h | 10 --
> > arch/arm/mach-ks8695/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-l7200/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-lpc32xx/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-lpc32xx/include/mach/memory.h | 27 ----
> > arch/arm/mach-mmp/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-mmp/include/mach/memory.h | 14 --
> > arch/arm/mach-msm/include/mach/debug-macro.S | 4 +-
> > arch/arm/mach-msm/include/mach/memory.h | 35 ------
> > arch/arm/mach-mv78xx0/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-mv78xx0/include/mach/memory.h | 10 --
> > arch/arm/mach-mxs/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-mxs/include/mach/memory.h | 24 ----
> > arch/arm/mach-netx/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-netx/include/mach/memory.h | 26 ----
> > arch/arm/mach-nomadik/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-nomadik/include/mach/memory.h | 28 ----
> > arch/arm/mach-nuc93x/include/mach/memory.h | 21 ---
> > arch/arm/mach-omap1/include/mach/debug-macro.S | 48 +++----
> > arch/arm/mach-omap1/include/mach/memory.h | 53 ++++++++-
> > arch/arm/mach-omap2/include/mach/debug-macro.S | 81 ++++++-------
> > arch/arm/mach-omap2/include/mach/memory.h | 5 -
> > arch/arm/mach-orion5x/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-orion5x/include/mach/memory.h | 12 --
> > arch/arm/mach-pnx4008/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-pnx4008/include/mach/memory.h | 21 ---
> > arch/arm/mach-prima2/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-prima2/include/mach/memory.h | 21 ---
> > arch/arm/mach-prima2/l2x0.c | 5 +-
> > arch/arm/mach-prima2/prima2.c | 1 +
> > arch/arm/mach-pxa/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-pxa/include/mach/memory.h | 20 ---
> > arch/arm/mach-pxa/z2.c | 2 +-
> > arch/arm/mach-realview/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-rpc/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-rpc/include/mach/hardware.h | 2 -
> > arch/arm/mach-rpc/include/mach/memory.h | 6 -
> > arch/arm/mach-rpc/riscpc.c | 4 +
> > arch/arm/mach-s3c2400/include/mach/memory.h | 20 ---
> > arch/arm/mach-s3c2410/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-s3c2410/include/mach/memory.h | 16 ---
> > arch/arm/mach-s3c64xx/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-s3c64xx/include/mach/memory.h | 18 ---
> > arch/arm/mach-s5p64x0/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-s5p64x0/include/mach/memory.h | 18 ---
> > arch/arm/mach-s5pc100/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-s5pc100/include/mach/memory.h | 18 ---
> > arch/arm/mach-s5pv210/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-sa1100/generic.c | 5 +
> > arch/arm/mach-sa1100/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-sa1100/include/mach/hardware.h | 4 -
> > arch/arm/mach-sa1100/include/mach/memory.h | 7 -
> > arch/arm/mach-shark/core.c | 2 +
> > arch/arm/mach-shark/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-shark/include/mach/hardware.h | 16 ---
> > arch/arm/mach-shark/include/mach/memory.h | 26 ----
> > arch/arm/mach-spear3xx/include/mach/memory.h | 19 ---
> > arch/arm/mach-spear6xx/include/mach/memory.h | 19 ---
> > arch/arm/mach-tegra/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-tegra/include/mach/memory.h | 28 ----
> > arch/arm/mach-u300/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-ux500/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-ux500/include/mach/memory.h | 18 ---
> > arch/arm/mach-versatile/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-versatile/include/mach/memory.h | 28 ----
> > arch/arm/mach-vexpress/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-vexpress/include/mach/memory.h | 25 ----
> > arch/arm/mach-vt8500/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-vt8500/include/mach/memory.h | 28 ----
> > arch/arm/mach-w90x900/include/mach/memory.h | 23 ----
> > arch/arm/mach-zynq/include/mach/debug-macro.S | 2 +-
> > arch/arm/mach-zynq/include/mach/memory.h | 22 ----
> > arch/arm/mm/Makefile | 2 +-
> > arch/arm/mm/cache-v4wb-init.c | 89 ++++++++++++++
> > arch/arm/mm/cache-v4wb.S | 31 +----
> > arch/arm/mm/mmu.c | 43 ++-----
> > arch/arm/mm/proc-sa110.S | 6 +-
> > arch/arm/mm/proc-sa1100.S | 6 +-
> > arch/arm/plat-mxc/include/mach/debug-macro.S | 2 +-
> > arch/arm/plat-mxc/include/mach/memory.h | 43 -------
> > arch/arm/plat-omap/Kconfig | 1 +
> > arch/arm/plat-omap/include/plat/memory.h | 89 --------------
> > arch/arm/plat-omap/include/plat/serial.h | 6 +-
> > arch/arm/plat-omap/include/plat/uncompress.h | 8 +-
> > arch/arm/plat-spear/include/plat/debug-macro.S | 2 +-
> > arch/arm/plat-spear/include/plat/memory.h | 20 ---
> > arch/arm/plat-tcc/include/mach/debug-macro.S | 2 +-
> > arch/arm/plat-tcc/include/mach/memory.h | 18 ---
> > drivers/usb/musb/musb_debugfs.c | 6 -
> > 138 files changed, 400 insertions(+), 1357 deletions(-)
> >
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel at lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> >
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Pull request: removal of most instances of mach/memory.h
2011-09-20 17:53 ` Nicolas Pitre
@ 2011-09-26 13:15 ` Russell King - ARM Linux
2011-09-26 13:58 ` Nicolas Pitre
0 siblings, 1 reply; 22+ messages in thread
From: Russell King - ARM Linux @ 2011-09-26 13:15 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Sep 20, 2011 at 01:53:49PM -0400, Nicolas Pitre wrote:
> Re-ping.
>
> Please let me know if there is something wrong with this series as I
> would like to have sufficient time to fix it if needed.
I think it's fairly obvious why I've not taken this (because of the
StrongARM changes which I've still not yet tested.) Once I've sorted
that out I can take it, but not before then. Especially so as my
firewall uses this CPU and I don't want it to break and force me
offline as a result.
However, as you've guessed I don't currently have the bandwidth to
test those changes at the moment - and as the rest of this series
relies on that change, it would be very difficult to revert it later
if it proves to be a problem.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Pull request: removal of most instances of mach/memory.h
2011-09-26 13:15 ` Russell King - ARM Linux
@ 2011-09-26 13:58 ` Nicolas Pitre
2011-09-26 14:33 ` Nicolas Pitre
0 siblings, 1 reply; 22+ messages in thread
From: Nicolas Pitre @ 2011-09-26 13:58 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, 26 Sep 2011, Russell King - ARM Linux wrote:
> On Tue, Sep 20, 2011 at 01:53:49PM -0400, Nicolas Pitre wrote:
> > Re-ping.
> >
> > Please let me know if there is something wrong with this series as I
> > would like to have sufficient time to fix it if needed.
>
> I think it's fairly obvious why I've not taken this (because of the
> StrongARM changes which I've still not yet tested.) Once I've sorted
> that out I can take it, but not before then. Especially so as my
> firewall uses this CPU and I don't want it to break and force me
> offline as a result.
As I said in that same message:
| I also merged the patch entitled "get rid of a few StrongARM
| cache-related build time constants" as this is a prerequisite for the
| removal of mach/memory.h in mach-ebsa110 and mach-shark (more if the
| sparsemem stuff gets moved). If you don't feel comfortable having
| this patch merged then I can remove it along with those commits that depend
| on it.
So let me remove that and ask you to pull again.
Nicolas
^ permalink raw reply [flat|nested] 22+ messages in thread
* Pull request: removal of most instances of mach/memory.h
2011-09-26 13:58 ` Nicolas Pitre
@ 2011-09-26 14:33 ` Nicolas Pitre
2011-09-26 19:10 ` Russell King - ARM Linux
0 siblings, 1 reply; 22+ messages in thread
From: Nicolas Pitre @ 2011-09-26 14:33 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, 26 Sep 2011, Nicolas Pitre wrote:
> On Mon, 26 Sep 2011, Russell King - ARM Linux wrote:
>
> > On Tue, Sep 20, 2011 at 01:53:49PM -0400, Nicolas Pitre wrote:
> > > Re-ping.
> > >
> > > Please let me know if there is something wrong with this series as I
> > > would like to have sufficient time to fix it if needed.
> >
> > I think it's fairly obvious why I've not taken this (because of the
> > StrongARM changes which I've still not yet tested.) Once I've sorted
> > that out I can take it, but not before then. Especially so as my
> > firewall uses this CPU and I don't want it to break and force me
> > offline as a result.
>
> As I said in that same message:
>
> | I also merged the patch entitled "get rid of a few StrongARM
> | cache-related build time constants" as this is a prerequisite for the
> | removal of mach/memory.h in mach-ebsa110 and mach-shark (more if the
> | sparsemem stuff gets moved). If you don't feel comfortable having
> | this patch merged then I can remove it along with those commits that depend
> | on it.
>
> So let me remove that and ask you to pull again.
Here it is. Please pull:
git://git.linaro.org/people/nico/linux mach_memory_h
Same blurb as in the original pull request, except for the above quoted
paragraph as the StrongARM stuff has now been kept out. The new
shortlog and diffstat follow.
Nicolas Pitre (50):
Merge the enabling by default of ARM_PATCH_PHYS_VIRT
ARM: mach-prima2: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size
musb_debugfs.c: remove unneeded includes on ARM
ARM: add an extra temp register to the low level debugging addruart macro
ARM: plat-omap: make OMAP_UART_INFO into a relative offset
ARM: mach-omap1: clean up debug-macro.S
ARM: mach-omap2: clean up debug-macro.S
ARM: mach-davinci: make DAVINCI_UART_INFO into a relative offset
ARM: mach-davinci: clean up debug-macro.S
ARM: prepare for removal of a bunch of <mach/memory.h> files
ARM: mach-dove: remove include/mach/memory.h
ARM: mach-kirkwood: remove mach/memory.h
ARM: mach-orion5x: remove mach/memory.h
ARM: OMAP: move OMAP1 memory config from plat/memory.h to its mach/memory.h
ARM: mach-omap2: remove mach/memory.h
ARM: mach-iop33x: remove mach/memory.h
ARM: mach-ep93xx: remove mach/memory.h and Kconfig selection of SDRAM bank
ARM: mach-s3c2410: remove memory.h
ARM: mach-mv78xx0: remove mach/memory.h
ARM: mach-vexpress: remove mach/memory.h
ARM: mach-w90x900: remove mach/memory.h
ARM: mach-pnx4008: remove mach/memory.h
ARM: mach-iop32x: remove mach/memory.h
ARM: mach-nomadik: remove mach/memory.h
ARM: mach-ux500: remove mach/memory.h
ARM: mach-versatile: remove mach/memory.h
ARM: mach-netx: remove mach/memory.h
ARM: mach-lpc32xx: remove mach/memory.h
ARM: mach-gemini: remove mach/memory.h
ARM: mach-msm: remove mach/memory.h
ARM: spear: remove mach/memory.h and plat/memory.h
ARM: mach-mxs: remove mach/memory.h
ARM: mach-nuc93x: remove mach/memory.h
ARM: mach-cns3xxx: remove mach/memory.h
ARM: mach-mmp: remove mach/memory.h
ARM: plat-tcc: remove mach/memory.h
ARM: mach-tegra: remove mach/memory.h
ARM: mach-s5pc100: remove mach/memory.h
ARM: mach-vt8500: remove mach/memory.h
ARM: mach-h720x: remove mach/memory.h
ARM: mach-ixp4xx: remove mach/memory.h
ARM: mach-pxa: remove mach/memory.h
ARM: mach-davinci: remove mach/memory.h
ARM: mach-bcmring: remove mach/memory.h
ARM: mach-zynq: remove mach/memory.h
ARM: mach-prima2: remove mach/memory.h
ARM: plat-mxc: remove mach/memory.h
ARM: mach-s3c64xx: remove mach/memory.h
ARM: mach-s5p64x0: remove mach/memory.h
ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H
arch/arm/Kconfig | 30 +++++
arch/arm/include/asm/memory.h | 9 ++-
arch/arm/kernel/debug.S | 4 +-
arch/arm/kernel/head.S | 4 +-
arch/arm/mach-at91/include/mach/debug-macro.S | 2 +-
arch/arm/mach-bcmring/include/mach/hardware.h | 3 +-
arch/arm/mach-bcmring/include/mach/memory.h | 28 ----
arch/arm/mach-clps711x/include/mach/debug-macro.S | 2 +-
arch/arm/mach-cns3xxx/include/mach/debug-macro.S | 2 +-
arch/arm/mach-cns3xxx/include/mach/memory.h | 26 ----
arch/arm/mach-davinci/cpuidle.c | 2 +-
arch/arm/mach-davinci/include/mach/ddr2.h | 4 +
arch/arm/mach-davinci/include/mach/debug-macro.S | 52 ++++-----
arch/arm/mach-davinci/include/mach/memory.h | 39 ------
arch/arm/mach-davinci/include/mach/serial.h | 3 +-
arch/arm/mach-davinci/include/mach/uncompress.h | 7 +-
arch/arm/mach-davinci/sleep.S | 2 +-
arch/arm/mach-dove/include/mach/debug-macro.S | 2 +-
arch/arm/mach-dove/include/mach/memory.h | 10 --
arch/arm/mach-ebsa110/include/mach/debug-macro.S | 2 +-
arch/arm/mach-ep93xx/Kconfig | 53 --------
arch/arm/mach-ep93xx/Makefile.boot | 14 --
arch/arm/mach-ep93xx/include/mach/debug-macro.S | 2 +-
arch/arm/mach-ep93xx/include/mach/memory.h | 22 ----
arch/arm/mach-exynos4/include/mach/debug-macro.S | 2 +-
.../arm/mach-footbridge/include/mach/debug-macro.S | 4 +-
arch/arm/mach-gemini/include/mach/debug-macro.S | 2 +-
arch/arm/mach-gemini/include/mach/memory.h | 19 ---
arch/arm/mach-h720x/include/mach/debug-macro.S | 2 +-
arch/arm/mach-h720x/include/mach/memory.h | 11 --
.../arm/mach-integrator/include/mach/debug-macro.S | 2 +-
arch/arm/mach-iop13xx/include/mach/debug-macro.S | 2 +-
arch/arm/mach-iop32x/include/mach/debug-macro.S | 2 +-
arch/arm/mach-iop32x/include/mach/memory.h | 13 --
arch/arm/mach-iop33x/include/mach/debug-macro.S | 2 +-
arch/arm/mach-iop33x/include/mach/memory.h | 13 --
arch/arm/mach-ixp2000/include/mach/debug-macro.S | 2 +-
arch/arm/mach-ixp23xx/include/mach/debug-macro.S | 2 +-
arch/arm/mach-ixp4xx/include/mach/debug-macro.S | 2 +-
arch/arm/mach-ixp4xx/include/mach/memory.h | 17 ---
arch/arm/mach-kirkwood/include/mach/debug-macro.S | 2 +-
arch/arm/mach-kirkwood/include/mach/memory.h | 10 --
arch/arm/mach-ks8695/include/mach/debug-macro.S | 2 +-
arch/arm/mach-l7200/include/mach/debug-macro.S | 2 +-
arch/arm/mach-lpc32xx/include/mach/debug-macro.S | 2 +-
arch/arm/mach-lpc32xx/include/mach/memory.h | 27 ----
arch/arm/mach-mmp/include/mach/debug-macro.S | 2 +-
arch/arm/mach-mmp/include/mach/memory.h | 14 --
arch/arm/mach-msm/include/mach/debug-macro.S | 4 +-
arch/arm/mach-msm/include/mach/memory.h | 35 ------
arch/arm/mach-mv78xx0/include/mach/debug-macro.S | 2 +-
arch/arm/mach-mv78xx0/include/mach/memory.h | 10 --
arch/arm/mach-mxs/include/mach/debug-macro.S | 2 +-
arch/arm/mach-mxs/include/mach/memory.h | 24 ----
arch/arm/mach-netx/include/mach/debug-macro.S | 2 +-
arch/arm/mach-netx/include/mach/memory.h | 26 ----
arch/arm/mach-nomadik/include/mach/debug-macro.S | 2 +-
arch/arm/mach-nomadik/include/mach/memory.h | 28 ----
arch/arm/mach-nuc93x/include/mach/memory.h | 21 ---
arch/arm/mach-omap1/include/mach/debug-macro.S | 48 +++----
arch/arm/mach-omap1/include/mach/memory.h | 53 ++++++++-
arch/arm/mach-omap2/include/mach/debug-macro.S | 81 ++++++-------
arch/arm/mach-omap2/include/mach/memory.h | 5 -
arch/arm/mach-orion5x/include/mach/debug-macro.S | 2 +-
arch/arm/mach-orion5x/include/mach/memory.h | 12 --
arch/arm/mach-pnx4008/include/mach/debug-macro.S | 2 +-
arch/arm/mach-pnx4008/include/mach/memory.h | 21 ---
arch/arm/mach-prima2/include/mach/debug-macro.S | 2 +-
arch/arm/mach-prima2/include/mach/memory.h | 21 ---
arch/arm/mach-prima2/l2x0.c | 5 +-
arch/arm/mach-prima2/prima2.c | 1 +
arch/arm/mach-pxa/include/mach/debug-macro.S | 2 +-
arch/arm/mach-pxa/include/mach/memory.h | 20 ---
arch/arm/mach-pxa/z2.c | 2 +-
arch/arm/mach-realview/include/mach/debug-macro.S | 2 +-
arch/arm/mach-rpc/include/mach/debug-macro.S | 2 +-
arch/arm/mach-s3c2400/include/mach/memory.h | 20 ---
arch/arm/mach-s3c2410/include/mach/debug-macro.S | 2 +-
arch/arm/mach-s3c2410/include/mach/memory.h | 16 ---
arch/arm/mach-s3c64xx/include/mach/debug-macro.S | 2 +-
arch/arm/mach-s3c64xx/include/mach/memory.h | 18 ---
arch/arm/mach-s5p64x0/include/mach/debug-macro.S | 2 +-
arch/arm/mach-s5p64x0/include/mach/memory.h | 18 ---
arch/arm/mach-s5pc100/include/mach/debug-macro.S | 2 +-
arch/arm/mach-s5pc100/include/mach/memory.h | 18 ---
arch/arm/mach-s5pv210/include/mach/debug-macro.S | 2 +-
arch/arm/mach-sa1100/include/mach/debug-macro.S | 2 +-
arch/arm/mach-shark/include/mach/debug-macro.S | 2 +-
arch/arm/mach-spear3xx/include/mach/memory.h | 19 ---
arch/arm/mach-spear6xx/include/mach/memory.h | 19 ---
arch/arm/mach-tegra/include/mach/debug-macro.S | 2 +-
arch/arm/mach-tegra/include/mach/memory.h | 28 ----
arch/arm/mach-u300/include/mach/debug-macro.S | 2 +-
arch/arm/mach-ux500/include/mach/debug-macro.S | 2 +-
arch/arm/mach-ux500/include/mach/memory.h | 18 ---
arch/arm/mach-versatile/include/mach/debug-macro.S | 2 +-
arch/arm/mach-versatile/include/mach/memory.h | 28 ----
arch/arm/mach-vexpress/include/mach/debug-macro.S | 2 +-
arch/arm/mach-vexpress/include/mach/memory.h | 25 ----
arch/arm/mach-vt8500/include/mach/debug-macro.S | 2 +-
arch/arm/mach-vt8500/include/mach/memory.h | 28 ----
arch/arm/mach-w90x900/include/mach/memory.h | 23 ----
arch/arm/mach-zynq/include/mach/debug-macro.S | 2 +-
arch/arm/mach-zynq/include/mach/memory.h | 22 ----
arch/arm/plat-mxc/include/mach/debug-macro.S | 2 +-
arch/arm/plat-mxc/include/mach/memory.h | 43 -------
arch/arm/plat-omap/Kconfig | 1 +
arch/arm/plat-omap/include/plat/memory.h | 89 --------------
arch/arm/plat-omap/include/plat/serial.h | 6 +-
arch/arm/plat-omap/include/plat/uncompress.h | 8 +-
arch/arm/plat-spear/include/plat/debug-macro.S | 2 +-
arch/arm/plat-spear/include/plat/memory.h | 20 ---
arch/arm/plat-tcc/include/mach/debug-macro.S | 2 +-
arch/arm/plat-tcc/include/mach/memory.h | 18 ---
drivers/usb/musb/musb_debugfs.c | 6 -
115 files changed, 256 insertions(+), 1188 deletions(-)
^ permalink raw reply [flat|nested] 22+ messages in thread
* Pull request: removal of most instances of mach/memory.h
2011-09-26 14:33 ` Nicolas Pitre
@ 2011-09-26 19:10 ` Russell King - ARM Linux
2011-09-26 20:00 ` Nicolas Pitre
2011-10-04 18:54 ` Nicolas Pitre
0 siblings, 2 replies; 22+ messages in thread
From: Russell King - ARM Linux @ 2011-09-26 19:10 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Sep 26, 2011 at 10:33:28AM -0400, Nicolas Pitre wrote:
> ARM: mach-ep93xx: remove mach/memory.h and Kconfig selection of SDRAM bank
Are you planning to totally kill off ZBOOT_ROM too? Because removing
the zreladdr stuff is doing exactly that.
This also gives additional merge conflicts elsewhere, and while git
rerere makes some of them easy, the quantity is going to be a right
pain to deal with on a repeated basis.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Pull request: removal of most instances of mach/memory.h
2011-09-26 19:10 ` Russell King - ARM Linux
@ 2011-09-26 20:00 ` Nicolas Pitre
2011-09-26 20:10 ` Nicolas Pitre
2011-09-26 22:38 ` Russell King - ARM Linux
2011-10-04 18:54 ` Nicolas Pitre
1 sibling, 2 replies; 22+ messages in thread
From: Nicolas Pitre @ 2011-09-26 20:00 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, 26 Sep 2011, Russell King - ARM Linux wrote:
> On Mon, Sep 26, 2011 at 10:33:28AM -0400, Nicolas Pitre wrote:
> > ARM: mach-ep93xx: remove mach/memory.h and Kconfig selection of SDRAM bank
>
> Are you planning to totally kill off ZBOOT_ROM too? Because removing
> the zreladdr stuff is doing exactly that.
It looks like ZBOOT_ROM is not used on that platform at all. However,
the ability to have a single defconfig and binary for the whole platform
is something that the mach-ep93xx maintainers are looking for. Having
ZBOOT_ROM depend on and use CONFIG_PHYS_OFFSET would probably makes
sense eventually.
> This also gives additional merge conflicts elsewhere, and while git
> rerere makes some of them easy, the quantity is going to be a right
> pain to deal with on a repeated basis.
Again, I'm perfectly willing to use a different base for this series and
fix the conflicts myself if you give me one.
Nicolas
^ permalink raw reply [flat|nested] 22+ messages in thread
* Pull request: removal of most instances of mach/memory.h
2011-09-26 20:00 ` Nicolas Pitre
@ 2011-09-26 20:10 ` Nicolas Pitre
2011-09-26 22:38 ` Russell King - ARM Linux
2011-09-26 22:38 ` Russell King - ARM Linux
1 sibling, 1 reply; 22+ messages in thread
From: Nicolas Pitre @ 2011-09-26 20:10 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, 26 Sep 2011, Nicolas Pitre wrote:
> On Mon, 26 Sep 2011, Russell King - ARM Linux wrote:
>
> > This also gives additional merge conflicts elsewhere, and while git
> > rerere makes some of them easy, the quantity is going to be a right
> > pain to deal with on a repeated basis.
>
> Again, I'm perfectly willing to use a different base for this series and
> fix the conflicts myself if you give me one.
Nevermind, I see that you merged it anyway.
You may consider the rerere.autoupdate config option if you want Git to
automatically pick the conflict resolution without you manually
confirming them all the time.
Nicolas
^ permalink raw reply [flat|nested] 22+ messages in thread
* Pull request: removal of most instances of mach/memory.h
2011-09-26 20:00 ` Nicolas Pitre
2011-09-26 20:10 ` Nicolas Pitre
@ 2011-09-26 22:38 ` Russell King - ARM Linux
2011-09-26 23:01 ` Nicolas Pitre
1 sibling, 1 reply; 22+ messages in thread
From: Russell King - ARM Linux @ 2011-09-26 22:38 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Sep 26, 2011 at 04:00:11PM -0400, Nicolas Pitre wrote:
> On Mon, 26 Sep 2011, Russell King - ARM Linux wrote:
>
> > On Mon, Sep 26, 2011 at 10:33:28AM -0400, Nicolas Pitre wrote:
> > > ARM: mach-ep93xx: remove mach/memory.h and Kconfig selection of SDRAM bank
> >
> > Are you planning to totally kill off ZBOOT_ROM too? Because removing
> > the zreladdr stuff is doing exactly that.
>
> It looks like ZBOOT_ROM is not used on that platform at all. However,
> the ability to have a single defconfig and binary for the whole platform
> is something that the mach-ep93xx maintainers are looking for. Having
> ZBOOT_ROM depend on and use CONFIG_PHYS_OFFSET would probably makes
> sense eventually.
You miss the point. Removing zreladdr actively _prevents_ anyone from
then choosing to build a kernel with ZBOOT_ROM enabled targetted for one
platform if that's what they want, because the decompressor then loses
the information it needs to properly locate the kernel.
> > This also gives additional merge conflicts elsewhere, and while git
> > rerere makes some of them easy, the quantity is going to be a right
> > pain to deal with on a repeated basis.
>
> Again, I'm perfectly willing to use a different base for this series and
> fix the conflicts myself if you give me one.
That's difficult when there are a number of unstable branches involved.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Pull request: removal of most instances of mach/memory.h
2011-09-26 20:10 ` Nicolas Pitre
@ 2011-09-26 22:38 ` Russell King - ARM Linux
2011-09-26 23:03 ` Nicolas Pitre
0 siblings, 1 reply; 22+ messages in thread
From: Russell King - ARM Linux @ 2011-09-26 22:38 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Sep 26, 2011 at 04:10:03PM -0400, Nicolas Pitre wrote:
> On Mon, 26 Sep 2011, Nicolas Pitre wrote:
>
> > On Mon, 26 Sep 2011, Russell King - ARM Linux wrote:
> >
> > > This also gives additional merge conflicts elsewhere, and while git
> > > rerere makes some of them easy, the quantity is going to be a right
> > > pain to deal with on a repeated basis.
> >
> > Again, I'm perfectly willing to use a different base for this series and
> > fix the conflicts myself if you give me one.
>
> Nevermind, I see that you merged it anyway.
>
> You may consider the rerere.autoupdate config option if you want Git to
> automatically pick the conflict resolution without you manually
> confirming them all the time.
rerere doesn't deal with modified/deleted conflicts though.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Pull request: removal of most instances of mach/memory.h
2011-09-26 22:38 ` Russell King - ARM Linux
@ 2011-09-26 23:01 ` Nicolas Pitre
2011-09-26 23:18 ` Russell King - ARM Linux
0 siblings, 1 reply; 22+ messages in thread
From: Nicolas Pitre @ 2011-09-26 23:01 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, 26 Sep 2011, Russell King - ARM Linux wrote:
> On Mon, Sep 26, 2011 at 04:00:11PM -0400, Nicolas Pitre wrote:
> > On Mon, 26 Sep 2011, Russell King - ARM Linux wrote:
> >
> > > On Mon, Sep 26, 2011 at 10:33:28AM -0400, Nicolas Pitre wrote:
> > > > ARM: mach-ep93xx: remove mach/memory.h and Kconfig selection of SDRAM bank
> > >
> > > Are you planning to totally kill off ZBOOT_ROM too? Because removing
> > > the zreladdr stuff is doing exactly that.
> >
> > It looks like ZBOOT_ROM is not used on that platform at all. However,
> > the ability to have a single defconfig and binary for the whole platform
> > is something that the mach-ep93xx maintainers are looking for. Having
> > ZBOOT_ROM depend on and use CONFIG_PHYS_OFFSET would probably makes
> > sense eventually.
>
> You miss the point. Removing zreladdr actively _prevents_ anyone from
> then choosing to build a kernel with ZBOOT_ROM enabled targetted for one
> platform if that's what they want, because the decompressor then loses
> the information it needs to properly locate the kernel.
Sure. My point is that ZBOOT_ROM should eventually be coupled with
CONFIG_PHYS_OFFSET to derive the zreladdr value. Like for XIP_KERNEL,
there is no real point having ZBOOT_ROM when ARM_PATCH_PHYS_VIRT is set,
and when not set we have the equivalent zreladdr information elsewhere
already.
Nicolas
^ permalink raw reply [flat|nested] 22+ messages in thread
* Pull request: removal of most instances of mach/memory.h
2011-09-26 22:38 ` Russell King - ARM Linux
@ 2011-09-26 23:03 ` Nicolas Pitre
2011-09-26 23:29 ` Russell King - ARM Linux
0 siblings, 1 reply; 22+ messages in thread
From: Nicolas Pitre @ 2011-09-26 23:03 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, 26 Sep 2011, Russell King - ARM Linux wrote:
> On Mon, Sep 26, 2011 at 04:10:03PM -0400, Nicolas Pitre wrote:
> > On Mon, 26 Sep 2011, Nicolas Pitre wrote:
> >
> > > On Mon, 26 Sep 2011, Russell King - ARM Linux wrote:
> > >
> > > > This also gives additional merge conflicts elsewhere, and while git
> > > > rerere makes some of them easy, the quantity is going to be a right
> > > > pain to deal with on a repeated basis.
> > >
> > > Again, I'm perfectly willing to use a different base for this series and
> > > fix the conflicts myself if you give me one.
> >
> > Nevermind, I see that you merged it anyway.
> >
> > You may consider the rerere.autoupdate config option if you want Git to
> > automatically pick the conflict resolution without you manually
> > confirming them all the time.
>
> rerere doesn't deal with modified/deleted conflicts though.
True. That can be considered a limitation worth fixing.
Nicolas
^ permalink raw reply [flat|nested] 22+ messages in thread
* Pull request: removal of most instances of mach/memory.h
2011-09-26 23:01 ` Nicolas Pitre
@ 2011-09-26 23:18 ` Russell King - ARM Linux
2011-09-26 23:32 ` Nicolas Pitre
0 siblings, 1 reply; 22+ messages in thread
From: Russell King - ARM Linux @ 2011-09-26 23:18 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Sep 26, 2011 at 07:01:22PM -0400, Nicolas Pitre wrote:
> On Mon, 26 Sep 2011, Russell King - ARM Linux wrote:
>
> > On Mon, Sep 26, 2011 at 04:00:11PM -0400, Nicolas Pitre wrote:
> > > On Mon, 26 Sep 2011, Russell King - ARM Linux wrote:
> > >
> > > > On Mon, Sep 26, 2011 at 10:33:28AM -0400, Nicolas Pitre wrote:
> > > > > ARM: mach-ep93xx: remove mach/memory.h and Kconfig selection of SDRAM bank
> > > >
> > > > Are you planning to totally kill off ZBOOT_ROM too? Because removing
> > > > the zreladdr stuff is doing exactly that.
> > >
> > > It looks like ZBOOT_ROM is not used on that platform at all. However,
> > > the ability to have a single defconfig and binary for the whole platform
> > > is something that the mach-ep93xx maintainers are looking for. Having
> > > ZBOOT_ROM depend on and use CONFIG_PHYS_OFFSET would probably makes
> > > sense eventually.
> >
> > You miss the point. Removing zreladdr actively _prevents_ anyone from
> > then choosing to build a kernel with ZBOOT_ROM enabled targetted for one
> > platform if that's what they want, because the decompressor then loses
> > the information it needs to properly locate the kernel.
>
> Sure. My point is that ZBOOT_ROM should eventually be coupled with
> CONFIG_PHYS_OFFSET to derive the zreladdr value. Like for XIP_KERNEL,
> there is no real point having ZBOOT_ROM when ARM_PATCH_PHYS_VIRT is set,
> and when not set we have the equivalent zreladdr information elsewhere
> already.
I strongly disagree on a technical point - ARM_PATCH_PHYS_VIRT and
ZBOOT_ROM are entirely separate options _technically_ - there is no
inter-dependence between them. ZBOOT_ROM just needs to know where
to place the decompressed image, and once it knows that, the kernel
can discover the P:V translation all by itself.
Moreover, PHYS_OFFSET does *not* define where the kernel ends up.
Remember that we sometimes place the kernel 1MB + 32K into the
physical memory space - you can't encode that into CONFIG_PHYS_OFFSET
and hope that both PHYS_OFFSET and zreladdr end up at the right place.
So this is argument is actually highly flawed technically. You're
trying to combine two things which are actually different.
Or are we now in the business of breaking old platforms?
^ permalink raw reply [flat|nested] 22+ messages in thread
* Pull request: removal of most instances of mach/memory.h
2011-09-26 23:03 ` Nicolas Pitre
@ 2011-09-26 23:29 ` Russell King - ARM Linux
2011-09-27 0:40 ` Nicolas Pitre
0 siblings, 1 reply; 22+ messages in thread
From: Russell King - ARM Linux @ 2011-09-26 23:29 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Sep 26, 2011 at 07:03:12PM -0400, Nicolas Pitre wrote:
> On Mon, 26 Sep 2011, Russell King - ARM Linux wrote:
>
> > On Mon, Sep 26, 2011 at 04:10:03PM -0400, Nicolas Pitre wrote:
> > > On Mon, 26 Sep 2011, Nicolas Pitre wrote:
> > >
> > > > On Mon, 26 Sep 2011, Russell King - ARM Linux wrote:
> > > >
> > > > > This also gives additional merge conflicts elsewhere, and while git
> > > > > rerere makes some of them easy, the quantity is going to be a right
> > > > > pain to deal with on a repeated basis.
> > > >
> > > > Again, I'm perfectly willing to use a different base for this series and
> > > > fix the conflicts myself if you give me one.
> > >
> > > Nevermind, I see that you merged it anyway.
> > >
> > > You may consider the rerere.autoupdate config option if you want Git to
> > > automatically pick the conflict resolution without you manually
> > > confirming them all the time.
> >
> > rerere doesn't deal with modified/deleted conflicts though.
>
> True. That can be considered a limitation worth fixing.
Well. Now I'm not impressed, having investigated the reason behind
some of these conflicts.
The reason I'm getting the modify/delete conflict is because you've
made the same change to arch/arm/mach-prima2/include/mach/memory.h
as the one which you already submitted to me.
commit e922fe6625fb4700f041e5984ba6c09a1cadae65
Author: Nicolas Pitre <nicolas.pitre@linaro.org>
AuthorDate: Wed Sep 21 20:52:40 2011 +0100
Commit: Russell King <rmk+kernel@arm.linux.org.uk>
CommitDate: Mon Sep 26 12:31:09 2011 +0100
ARM: 7093/1: mach-prima2: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size
The branch that contained the ARM_DMA_ZONE_SIZE removal missed prima2.
Original comment:
Restrict DMA-able region to workaround silicon limitation.
The limitation restricts buffers available for DMA to SD/MMC
hardware to be below 256MB.
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
vs
commit 98b0124f0e2b88ec74cbd9345cf6195e527ce251
Author: Nicolas Pitre <nicolas.pitre@linaro.org>
AuthorDate: Fri Sep 2 21:05:10 2011 -0400
Commit: Nicolas Pitre <nico@fluxnic.net>
CommitDate: Tue Sep 6 17:25:54 2011 -0400
ARM: mach-prima2: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size
Original comment:
Restrict DMA-able region to workaround silicon limitation.
The limitation restricts buffers available for DMA to SD/MMC
hardware to be below 256MB.
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
I've no idea why you submitted this change to me if you'd already merged
it into your own tree - this is total madness and is just making more
work for me with no reason.
A little more discipline and communication (such as asking me to drop
the duplicate commit _first_) would be nice.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Pull request: removal of most instances of mach/memory.h
2011-09-26 23:18 ` Russell King - ARM Linux
@ 2011-09-26 23:32 ` Nicolas Pitre
0 siblings, 0 replies; 22+ messages in thread
From: Nicolas Pitre @ 2011-09-26 23:32 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, 27 Sep 2011, Russell King - ARM Linux wrote:
> On Mon, Sep 26, 2011 at 07:01:22PM -0400, Nicolas Pitre wrote:
> > On Mon, 26 Sep 2011, Russell King - ARM Linux wrote:
> >
> > > On Mon, Sep 26, 2011 at 04:00:11PM -0400, Nicolas Pitre wrote:
> > > > On Mon, 26 Sep 2011, Russell King - ARM Linux wrote:
> > > >
> > > > > On Mon, Sep 26, 2011 at 10:33:28AM -0400, Nicolas Pitre wrote:
> > > > > > ARM: mach-ep93xx: remove mach/memory.h and Kconfig selection of SDRAM bank
> > > > >
> > > > > Are you planning to totally kill off ZBOOT_ROM too? Because removing
> > > > > the zreladdr stuff is doing exactly that.
> > > >
> > > > It looks like ZBOOT_ROM is not used on that platform at all. However,
> > > > the ability to have a single defconfig and binary for the whole platform
> > > > is something that the mach-ep93xx maintainers are looking for. Having
> > > > ZBOOT_ROM depend on and use CONFIG_PHYS_OFFSET would probably makes
> > > > sense eventually.
> > >
> > > You miss the point. Removing zreladdr actively _prevents_ anyone from
> > > then choosing to build a kernel with ZBOOT_ROM enabled targetted for one
> > > platform if that's what they want, because the decompressor then loses
> > > the information it needs to properly locate the kernel.
> >
> > Sure. My point is that ZBOOT_ROM should eventually be coupled with
> > CONFIG_PHYS_OFFSET to derive the zreladdr value. Like for XIP_KERNEL,
> > there is no real point having ZBOOT_ROM when ARM_PATCH_PHYS_VIRT is set,
> > and when not set we have the equivalent zreladdr information elsewhere
> > already.
>
> I strongly disagree on a technical point - ARM_PATCH_PHYS_VIRT and
> ZBOOT_ROM are entirely separate options _technically_ - there is no
> inter-dependence between them. ZBOOT_ROM just needs to know where
> to place the decompressed image, and once it knows that, the kernel
> can discover the P:V translation all by itself.
What's the point having a discoverable P:V translation if you have to
specify the location of the decompressed image? Might as well compile
the kernel with PATCH_PHYS_VIRT turned off in that case.
> Moreover, PHYS_OFFSET does *not* define where the kernel ends up.
> Remember that we sometimes place the kernel 1MB + 32K into the
> physical memory space - you can't encode that into CONFIG_PHYS_OFFSET
> and hope that both PHYS_OFFSET and zreladdr end up at the right place.
Technically, zreladdr = PHYS_OFFSET + TEXT_OFFSET. Always been.
And TEXT_OFFSET is always constant. Some platforms have restrictions on
TEXT_OFFSET which is basically making it large enough. Most other
platforms don't care.
> So this is argument is actually highly flawed technically. You're
> trying to combine two things which are actually different.
I don't see why they have to be different.
Nicolas
^ permalink raw reply [flat|nested] 22+ messages in thread
* Pull request: removal of most instances of mach/memory.h
2011-09-26 23:29 ` Russell King - ARM Linux
@ 2011-09-27 0:40 ` Nicolas Pitre
2011-09-27 0:52 ` Nicolas Pitre
0 siblings, 1 reply; 22+ messages in thread
From: Nicolas Pitre @ 2011-09-27 0:40 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, 27 Sep 2011, Russell King - ARM Linux wrote:
> On Mon, Sep 26, 2011 at 07:03:12PM -0400, Nicolas Pitre wrote:
> > On Mon, 26 Sep 2011, Russell King - ARM Linux wrote:
> >
> > > On Mon, Sep 26, 2011 at 04:10:03PM -0400, Nicolas Pitre wrote:
> > > > On Mon, 26 Sep 2011, Nicolas Pitre wrote:
> > > >
> > > > > On Mon, 26 Sep 2011, Russell King - ARM Linux wrote:
> > > > >
> > > > > > This also gives additional merge conflicts elsewhere, and while git
> > > > > > rerere makes some of them easy, the quantity is going to be a right
> > > > > > pain to deal with on a repeated basis.
> > > > >
> > > > > Again, I'm perfectly willing to use a different base for this series and
> > > > > fix the conflicts myself if you give me one.
> > > >
> > > > Nevermind, I see that you merged it anyway.
> > > >
> > > > You may consider the rerere.autoupdate config option if you want Git to
> > > > automatically pick the conflict resolution without you manually
> > > > confirming them all the time.
> > >
> > > rerere doesn't deal with modified/deleted conflicts though.
> >
> > True. That can be considered a limitation worth fixing.
>
> Well. Now I'm not impressed, having investigated the reason behind
> some of these conflicts.
>
> The reason I'm getting the modify/delete conflict is because you've
> made the same change to arch/arm/mach-prima2/include/mach/memory.h
> as the one which you already submitted to me.
>
> I've no idea why you submitted this change to me if you'd already merged
> it into your own tree - this is total madness and is just making more
> work for me with no reason.
I submitted that change to you separately via the patch system because I
was getting no feedback from you despite two subsequent pings. Hence
after more than two weeks of total silence I decided to send the obvious
pieces separately.
Today you replied saying that the series is unacceptable because it
contains a patch you can't test right now, even if I clearly stated that
I could remove it in my pull request message.
Then I notice you merged both the separate patch and the modified
request, although I had given up hope about the later.
> A little more discipline and communication (such as asking me to drop
> the duplicate commit _first_) would be nice.
Certainly. Improving communication both ways might help.
Nicolas
^ permalink raw reply [flat|nested] 22+ messages in thread
* Pull request: removal of most instances of mach/memory.h
2011-09-27 0:40 ` Nicolas Pitre
@ 2011-09-27 0:52 ` Nicolas Pitre
2011-09-27 7:21 ` Russell King - ARM Linux
0 siblings, 1 reply; 22+ messages in thread
From: Nicolas Pitre @ 2011-09-27 0:52 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, 26 Sep 2011, Nicolas Pitre wrote:
> On Tue, 27 Sep 2011, Russell King - ARM Linux wrote:
>
> > A little more discipline and communication (such as asking me to drop
> > the duplicate commit _first_) would be nice.
>
> Certainly. Improving communication both ways might help.
One way this could be improved would be for your patch system to send
notification emails with the submitter address explicit in the To:
field. Right now it contains linux-arm-patches at lists.arm.linux.org.uk
only, therefore those emails don't get sorted with the best priority
they could get.
Nicolas
^ permalink raw reply [flat|nested] 22+ messages in thread
* Pull request: removal of most instances of mach/memory.h
2011-09-27 0:52 ` Nicolas Pitre
@ 2011-09-27 7:21 ` Russell King - ARM Linux
2011-09-27 12:31 ` Nicolas Pitre
0 siblings, 1 reply; 22+ messages in thread
From: Russell King - ARM Linux @ 2011-09-27 7:21 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Sep 26, 2011 at 08:52:48PM -0400, Nicolas Pitre wrote:
> On Mon, 26 Sep 2011, Nicolas Pitre wrote:
>
> > On Tue, 27 Sep 2011, Russell King - ARM Linux wrote:
> >
> > > A little more discipline and communication (such as asking me to drop
> > > the duplicate commit _first_) would be nice.
> >
> > Certainly. Improving communication both ways might help.
>
> One way this could be improved would be for your patch system to send
> notification emails with the submitter address explicit in the To:
> field. Right now it contains linux-arm-patches at lists.arm.linux.org.uk
> only, therefore those emails don't get sorted with the best priority
> they could get.
Stop splitting hairs.
The fact of the matter is that you should have said in the final pull
request that you'd also sent one of the patches to the patch system
_whether_ _or_ _not_ it was applied. Whether it was applied or not
is completely irrelevant - because either way it requires some action
(either to remove it from my git tree if applied _OR_ discard it from
the patch system if not.)
The fact you didn't mention it in the final pull request at all is the
problem.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Pull request: removal of most instances of mach/memory.h
2011-09-27 7:21 ` Russell King - ARM Linux
@ 2011-09-27 12:31 ` Nicolas Pitre
0 siblings, 0 replies; 22+ messages in thread
From: Nicolas Pitre @ 2011-09-27 12:31 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, 27 Sep 2011, Russell King - ARM Linux wrote:
> The fact of the matter is that you should have said in the final pull
> request that you'd also sent one of the patches to the patch system
> _whether_ _or_ _not_ it was applied. Whether it was applied or not
> is completely irrelevant - because either way it requires some action
> (either to remove it from my git tree if applied _OR_ discard it from
> the patch system if not.)
>
> The fact you didn't mention it in the final pull request at all is the
> problem.
Yes, you'reright.
Nicolas
^ permalink raw reply [flat|nested] 22+ messages in thread
* Pull request: removal of most instances of mach/memory.h
2011-09-26 19:10 ` Russell King - ARM Linux
2011-09-26 20:00 ` Nicolas Pitre
@ 2011-10-04 18:54 ` Nicolas Pitre
2011-10-17 0:48 ` Nicolas Pitre
1 sibling, 1 reply; 22+ messages in thread
From: Nicolas Pitre @ 2011-10-04 18:54 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, 26 Sep 2011, Russell King - ARM Linux wrote:
> This also gives additional merge conflicts elsewhere, and while git
> rerere makes some of them easy, the quantity is going to be a right
> pain to deal with on a repeated basis.
Does this mean that you will only merge this before asking Linus to
pull? I would like to know on which leg I should stand with this
series.
Nicolas
^ permalink raw reply [flat|nested] 22+ messages in thread
* Pull request: removal of most instances of mach/memory.h
2011-10-04 18:54 ` Nicolas Pitre
@ 2011-10-17 0:48 ` Nicolas Pitre
0 siblings, 0 replies; 22+ messages in thread
From: Nicolas Pitre @ 2011-10-17 0:48 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, 4 Oct 2011, Nicolas Pitre wrote:
> On Mon, 26 Sep 2011, Russell King - ARM Linux wrote:
>
> > This also gives additional merge conflicts elsewhere, and while git
> > rerere makes some of them easy, the quantity is going to be a right
> > pain to deal with on a repeated basis.
>
> Does this mean that you will only merge this before asking Linus to
> pull? I would like to know on which leg I should stand with this
> series.
Here's where things stand with this series from my end:
1) The SA/XScale cache maintenance mapping patch is still untested on
SA110, hence this patch and all those that depended on it have been
dropped for now.
2) The EP93xx patch removed the ability to use ZBOOT_ROM on
corresponding machines, so this patch has been dropped until the
ZBOOT_ROM facility is reworked in a more generic way.
3) Performing a test merge with your for-next branch produces merge
conflicts in arch/arm/Kconfig and arch/arm/plat-omap/Kconfig only,
and they are very trivial to fix.
4) During the few days this series was pulled into linux-next via the
arm-soc tree, no issues were reported.
5) I can't recall any further objections to this series, neither from
you nor anyone else.
If I'm missing something, or if I overlooked a previous comment of
yours, I'd be glad to address it promptly.
I therefore would appreciate if you could pull the following:
git://git.linaro.org/people/nico/linux mach_memory_h
The updated diffstat follows:
arch/arm/Kconfig | 30 +++++
arch/arm/include/asm/memory.h | 9 ++-
arch/arm/kernel/debug.S | 4 +-
arch/arm/kernel/head.S | 4 +-
arch/arm/mach-at91/include/mach/debug-macro.S | 2 +-
arch/arm/mach-bcmring/include/mach/hardware.h | 3 +-
arch/arm/mach-bcmring/include/mach/memory.h | 28 ----
arch/arm/mach-clps711x/include/mach/debug-macro.S | 2 +-
arch/arm/mach-cns3xxx/include/mach/debug-macro.S | 2 +-
arch/arm/mach-cns3xxx/include/mach/memory.h | 26 ----
arch/arm/mach-davinci/cpuidle.c | 2 +-
arch/arm/mach-davinci/include/mach/ddr2.h | 4 +
arch/arm/mach-davinci/include/mach/debug-macro.S | 52 ++++-----
arch/arm/mach-davinci/include/mach/memory.h | 39 ------
arch/arm/mach-davinci/include/mach/serial.h | 3 +-
arch/arm/mach-davinci/include/mach/uncompress.h | 7 +-
arch/arm/mach-davinci/sleep.S | 2 +-
arch/arm/mach-dove/include/mach/debug-macro.S | 2 +-
arch/arm/mach-dove/include/mach/memory.h | 10 --
arch/arm/mach-ebsa110/include/mach/debug-macro.S | 2 +-
arch/arm/mach-ep93xx/include/mach/debug-macro.S | 2 +-
arch/arm/mach-exynos4/include/mach/debug-macro.S | 2 +-
.../arm/mach-footbridge/include/mach/debug-macro.S | 4 +-
arch/arm/mach-gemini/include/mach/debug-macro.S | 2 +-
arch/arm/mach-gemini/include/mach/memory.h | 19 ---
arch/arm/mach-h720x/include/mach/debug-macro.S | 2 +-
arch/arm/mach-h720x/include/mach/memory.h | 11 --
.../arm/mach-integrator/include/mach/debug-macro.S | 2 +-
arch/arm/mach-iop13xx/include/mach/debug-macro.S | 2 +-
arch/arm/mach-iop32x/include/mach/debug-macro.S | 2 +-
arch/arm/mach-iop32x/include/mach/memory.h | 13 --
arch/arm/mach-iop33x/include/mach/debug-macro.S | 2 +-
arch/arm/mach-iop33x/include/mach/memory.h | 13 --
arch/arm/mach-ixp2000/include/mach/debug-macro.S | 2 +-
arch/arm/mach-ixp23xx/include/mach/debug-macro.S | 2 +-
arch/arm/mach-ixp4xx/include/mach/debug-macro.S | 2 +-
arch/arm/mach-ixp4xx/include/mach/memory.h | 17 ---
arch/arm/mach-kirkwood/include/mach/debug-macro.S | 2 +-
arch/arm/mach-kirkwood/include/mach/memory.h | 10 --
arch/arm/mach-ks8695/include/mach/debug-macro.S | 2 +-
arch/arm/mach-l7200/include/mach/debug-macro.S | 2 +-
arch/arm/mach-lpc32xx/include/mach/debug-macro.S | 2 +-
arch/arm/mach-lpc32xx/include/mach/memory.h | 27 ----
arch/arm/mach-mmp/include/mach/debug-macro.S | 2 +-
arch/arm/mach-mmp/include/mach/memory.h | 14 --
arch/arm/mach-msm/include/mach/debug-macro.S | 4 +-
arch/arm/mach-msm/include/mach/memory.h | 35 ------
arch/arm/mach-mv78xx0/include/mach/debug-macro.S | 2 +-
arch/arm/mach-mv78xx0/include/mach/memory.h | 10 --
arch/arm/mach-mxs/include/mach/debug-macro.S | 2 +-
arch/arm/mach-mxs/include/mach/memory.h | 24 ----
arch/arm/mach-netx/include/mach/debug-macro.S | 2 +-
arch/arm/mach-netx/include/mach/memory.h | 26 ----
arch/arm/mach-nomadik/include/mach/debug-macro.S | 2 +-
arch/arm/mach-nomadik/include/mach/memory.h | 28 ----
arch/arm/mach-nuc93x/include/mach/memory.h | 21 ---
arch/arm/mach-omap1/include/mach/debug-macro.S | 48 +++----
arch/arm/mach-omap1/include/mach/memory.h | 53 ++++++++-
arch/arm/mach-omap2/include/mach/debug-macro.S | 81 ++++++-------
arch/arm/mach-omap2/include/mach/memory.h | 5 -
arch/arm/mach-orion5x/include/mach/debug-macro.S | 2 +-
arch/arm/mach-orion5x/include/mach/memory.h | 12 --
arch/arm/mach-pnx4008/include/mach/debug-macro.S | 2 +-
arch/arm/mach-pnx4008/include/mach/memory.h | 21 ---
arch/arm/mach-prima2/include/mach/debug-macro.S | 2 +-
arch/arm/mach-prima2/include/mach/memory.h | 21 ---
arch/arm/mach-prima2/l2x0.c | 5 +-
arch/arm/mach-prima2/prima2.c | 1 +
arch/arm/mach-pxa/include/mach/debug-macro.S | 2 +-
arch/arm/mach-pxa/include/mach/memory.h | 20 ---
arch/arm/mach-pxa/z2.c | 2 +-
arch/arm/mach-realview/include/mach/debug-macro.S | 2 +-
arch/arm/mach-rpc/include/mach/debug-macro.S | 2 +-
arch/arm/mach-s3c2400/include/mach/memory.h | 20 ---
arch/arm/mach-s3c2410/include/mach/debug-macro.S | 2 +-
arch/arm/mach-s3c2410/include/mach/memory.h | 16 ---
arch/arm/mach-s3c64xx/include/mach/debug-macro.S | 2 +-
arch/arm/mach-s3c64xx/include/mach/memory.h | 18 ---
arch/arm/mach-s5p64x0/include/mach/debug-macro.S | 2 +-
arch/arm/mach-s5p64x0/include/mach/memory.h | 18 ---
arch/arm/mach-s5pc100/include/mach/debug-macro.S | 2 +-
arch/arm/mach-s5pc100/include/mach/memory.h | 18 ---
arch/arm/mach-s5pv210/include/mach/debug-macro.S | 2 +-
arch/arm/mach-sa1100/include/mach/debug-macro.S | 2 +-
arch/arm/mach-shark/include/mach/debug-macro.S | 2 +-
arch/arm/mach-spear3xx/include/mach/memory.h | 19 ---
arch/arm/mach-spear6xx/include/mach/memory.h | 19 ---
arch/arm/mach-tegra/include/mach/debug-macro.S | 2 +-
arch/arm/mach-tegra/include/mach/memory.h | 28 ----
arch/arm/mach-u300/include/mach/debug-macro.S | 2 +-
arch/arm/mach-ux500/include/mach/debug-macro.S | 2 +-
arch/arm/mach-ux500/include/mach/memory.h | 18 ---
arch/arm/mach-versatile/include/mach/debug-macro.S | 2 +-
arch/arm/mach-versatile/include/mach/memory.h | 28 ----
arch/arm/mach-vexpress/include/mach/debug-macro.S | 2 +-
arch/arm/mach-vexpress/include/mach/memory.h | 25 ----
arch/arm/mach-vt8500/include/mach/debug-macro.S | 2 +-
arch/arm/mach-vt8500/include/mach/memory.h | 28 ----
arch/arm/mach-w90x900/include/mach/memory.h | 23 ----
arch/arm/mach-zynq/include/mach/debug-macro.S | 2 +-
arch/arm/mach-zynq/include/mach/memory.h | 22 ----
arch/arm/plat-mxc/include/mach/debug-macro.S | 2 +-
arch/arm/plat-mxc/include/mach/memory.h | 43 -------
arch/arm/plat-omap/Kconfig | 1 +
arch/arm/plat-omap/include/plat/memory.h | 89 --------------
arch/arm/plat-omap/include/plat/serial.h | 6 +-
arch/arm/plat-omap/include/plat/uncompress.h | 8 +-
arch/arm/plat-spear/include/plat/debug-macro.S | 2 +-
arch/arm/plat-spear/include/plat/memory.h | 20 ---
arch/arm/plat-tcc/include/mach/debug-macro.S | 2 +-
arch/arm/plat-tcc/include/mach/memory.h | 18 ---
drivers/usb/musb/musb_debugfs.c | 6 -
112 files changed, 256 insertions(+), 1099 deletions(-)
Nicolas
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2011-10-17 0:48 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-07 3:13 Pull request: removal of most instances of mach/memory.h Nicolas Pitre
2011-09-13 12:50 ` Nicolas Pitre
2011-09-20 17:53 ` Nicolas Pitre
2011-09-26 13:15 ` Russell King - ARM Linux
2011-09-26 13:58 ` Nicolas Pitre
2011-09-26 14:33 ` Nicolas Pitre
2011-09-26 19:10 ` Russell King - ARM Linux
2011-09-26 20:00 ` Nicolas Pitre
2011-09-26 20:10 ` Nicolas Pitre
2011-09-26 22:38 ` Russell King - ARM Linux
2011-09-26 23:03 ` Nicolas Pitre
2011-09-26 23:29 ` Russell King - ARM Linux
2011-09-27 0:40 ` Nicolas Pitre
2011-09-27 0:52 ` Nicolas Pitre
2011-09-27 7:21 ` Russell King - ARM Linux
2011-09-27 12:31 ` Nicolas Pitre
2011-09-26 22:38 ` Russell King - ARM Linux
2011-09-26 23:01 ` Nicolas Pitre
2011-09-26 23:18 ` Russell King - ARM Linux
2011-09-26 23:32 ` Nicolas Pitre
2011-10-04 18:54 ` Nicolas Pitre
2011-10-17 0:48 ` Nicolas Pitre
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.