linux.git/arch/arm/include/asm/memory.h, branch v2.6.37 Linux kernel source tree Merge branch 'misc' into devel 2010-07-31T13:20:02+00:00 Russell King rmk+kernel@arm.linux.org.uk 2010-07-31T13:20:02+00:00 ceb0885d3b01bb2e2f18765770e212914f2864be Conflicts: arch/arm/mm/init.c 
Conflicts:
	arch/arm/mm/init.c
ARM: 6225/1: make TCM allocation static and common for all archs 2010-07-27T09:42:38+00:00 Linus Walleij linus.walleij@stericsson.com 2010-07-12T20:53:28+00:00 1dbd30e9890fd69e50b17edd70ca583546b0fe4e This changes the TCM handling so that a fixed area is reserved at 0xfffe0000-0xfffeffff for TCM. This areas is used by XScale but XScale does not have TCM so the mechanisms are mutually exclusive. This change is needed to make TCM detection more dynamic while still being able to compile code into it, and is a must for the unified ARM goals: the current TCM allocation at different places in memory for each machine would be a nightmare if you want to compile a single image for more than one machine with TCM so it has to be nailed down in one place. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> 
This changes the TCM handling so that a fixed area is reserved at
0xfffe0000-0xfffeffff for TCM. This areas is used by XScale but
XScale does not have TCM so the mechanisms are mutually exclusive.

This change is needed to make TCM detection more dynamic while
still being able to compile code into it, and is a must for the
unified ARM goals: the current TCM allocation at different places
in memory for each machine would be a nightmare if you want to
compile a single image for more than one machine with TCM so it
has to be nailed down in one place.

Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
ARM: Remove 'node' argument form arch_adjust_zones() 2010-07-16T09:57:36+00:00 Russell King rmk+kernel@arm.linux.org.uk 2010-05-22T19:58:51+00:00 b65b4781fbd5846a82cdac0c32818af1a7452d1f Since we no longer support discontigmem, node is always zero, so remove this argument. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> 
Since we no longer support discontigmem, node is always zero, so
remove this argument.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
ARM: Remove DISCONTIGMEM support 2010-07-16T09:57:35+00:00 Russell King rmk+kernel@arm.linux.org.uk 2010-05-07T16:40:33+00:00 be370302742ff9948f2a42b15cb2ba174d97b930 Everything should now be using sparsemem rather than discontigmem, so remove the code supporting discontigmem from ARM. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> 
Everything should now be using sparsemem rather than discontigmem, so
remove the code supporting discontigmem from ARM.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
ARM: 5928/1: Change type of VMALLOC_END to unsigned long. 2010-02-15T21:40:33+00:00 Fenkart/Bostandzhyan andreas.fenkart@streamunlimited.com 2010-02-07T20:47:17+00:00 c931b4f655a1b86c929384e674eb8c31795f3bd7 Makes it consistent with VMALLOC_START Tested-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Andreas Fenkart <andreas.fenkart@streamunlimited.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> 
Makes it consistent with VMALLOC_START

Tested-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Andreas Fenkart <andreas.fenkart@streamunlimited.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
ARM: 5927/1: Make delimiters of DMA area globally visibly. 2010-02-15T21:40:32+00:00 Fenkart/Bostandzhyan andreas.fenkart@streamunlimited.com 2010-02-07T20:46:33+00:00 a7bd08c82e4f74387a39eeebb942712f23967420 Adds DMA area to 'virtual memory map' startup message Tested-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Andreas Fenkart <andreas.fenkart@streamunlimited.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> 
Adds DMA area to 'virtual memory map' startup message

Tested-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Andreas Fenkart <andreas.fenkart@streamunlimited.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Merge branch 'pending-dma-streaming' (early part) into devel 2009-12-04T15:00:11+00:00 Russell King rmk+kernel@arm.linux.org.uk 2009-12-04T15:00:08+00:00 2fc42814d8a9dd757abc7f80fbf11e9247e97d40 






ARM: dma-mapping: simplify page_to_dma() and __pfn_to_bus()
2009-11-23T12:53:26+00:00

Russell King
rmk+kernel@arm.linux.org.uk

2009-10-31T15:58:30+00:00

1c4a4f48a14861a567c8861355bc8252da3a003f

The non-highmem() and the __pfn_to_bus() based page_to_dma() both
compile to the same code, so its pointless having these two different
approaches.  Use the __pfn_to_bus() based version.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Tested-By: Jamie Iles <jamie@jamieiles.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>





The non-highmem() and the __pfn_to_bus() based page_to_dma() both
compile to the same code, so its pointless having these two different
approaches.  Use the __pfn_to_bus() based version.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Tested-By: Jamie Iles <jamie@jamieiles.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>







ARM: provide phys_to_page() to complement page_to_phys()
2009-11-23T12:53:20+00:00

Russell King
rmk+kernel@arm.linux.org.uk

2009-10-31T17:51:57+00:00

719301ff1c77b6da7b1b6f78a1e51af64a678619

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Tested-By: Jamie Iles <jamie@jamieiles.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>





Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Tested-By: Jamie Iles <jamie@jamieiles.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>







Revert "[ARM] unconditionally define __virt_to_phys and __phys_to_virt"
2009-10-19T15:51:28+00:00

Russell King
rmk+kernel@arm.linux.org.uk

2009-10-19T15:51:28+00:00

a8cf81ffe0284660fe405e7189f47f1b032f5261

This reverts commit 75f4aa15cf05ce6d99c8261cf57dcd749877fd1c.

We have a couple of platforms which require non-linear P:V mappings,
so we need these to be overridable.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>





This reverts commit 75f4aa15cf05ce6d99c8261cf57dcd749877fd1c.

We have a couple of platforms which require non-linear P:V mappings,
so we need these to be overridable.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>