Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable (73829af7) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/arm/memory.txt

+5 −6

Original line number	Diff line number	Diff line
		@@ -51,15 +51,14 @@ ffc00000 ffefffff DMA memory mapping region. Memory returned
		ff000000 ffbfffff Reserved for future expansion of DMA
		mapping region.

		VMALLOC_END feffffff Free for platform use, recommended.
		VMALLOC_END must be aligned to a 2MB
		boundary.

		VMALLOC_START VMALLOC_END-1 vmalloc() / ioremap() space.
		Memory returned by vmalloc/ioremap will
		be dynamically placed in this region.
		VMALLOC_START may be based upon the value
		of the high_memory variable.
		Machine specific static mappings are also
		located here through iotable_init().
		VMALLOC_START is based upon the value
		of the high_memory variable, and VMALLOC_END
		is equal to 0xff000000.

		PAGE_OFFSET high_memory-1 Kernel direct-mapped RAM region.
		This maps the platforms RAM, and typically

+7 −6

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@
		#else

		#include <asm/memory.h>
		#include <mach/vmalloc.h>
		#include <asm/pgtable-hwdef.h>

		#include <asm/pgtable-2level.h>
		@@ -33,14 +32,16 @@
		* any out-of-bounds memory accesses will hopefully be caught.
		* The vmalloc() routines leaves a hole of 4kB between each vmalloced
		* area for the same reason. ;)
		*
		* Note that platforms may override VMALLOC_START, but they must provide
		* VMALLOC_END. VMALLOC_END defines the (exclusive) limit of this space,
		* which may not overlap IO space.
		*/
		#ifndef VMALLOC_START
		#define VMALLOC_OFFSET (810241024)
		#define VMALLOC_START (((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
		#define VMALLOC_END 0xff000000UL

		/* This is a temporary hack until shmobile's DMA area size is sorted out */
		#ifdef CONFIG_ARCH_SHMOBILE
		#warning "SH-Mobile's consistent DMA size conflicts with VMALLOC_END by 144MB"
		#undef VMALLOC_END
		#define VMALLOC_END 0xF6000000UL
		#endif

		#define LIBRARY_TEXT_START 0x0c000000

+8 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@
		#include <linux/memblock.h>
		#include <linux/bug.h>
		#include <linux/compiler.h>
		#include <linux/sort.h>

		#include <asm/unified.h>
		#include <asm/cpu.h>
		@@ -890,6 +891,12 @@ static struct machine_desc * __init setup_machine_tags(unsigned int nr)
		return mdesc;
		}

		static int __init meminfo_cmp(const void _a, const void _b)
		{
		const struct membank a = _a, b = _b;
		long cmp = bank_pfn_start(a) - bank_pfn_start(b);
		return cmp < 0 ? -1 : cmp > 0 ? 1 : 0;
		}

		void __init setup_arch(char **cmdline_p)
		{
		@@ -918,6 +925,7 @@ void __init setup_arch(char **cmdline_p)

		parse_early_param();

		sort(&meminfo.bank, meminfo.nr_banks, sizeof(meminfo.bank[0]), meminfo_cmp, NULL);
		sanity_check_meminfo();
		arm_memblock_init(&meminfo, mdesc);

+0 −8

Original line number	Diff line number	Diff line
		@@ -30,14 +30,6 @@

		#ifndef __ASSEMBLY__

		#ifndef CONFIG_ARCH_AT91X40
		#define __arch_ioremap at91_ioremap
		#define __arch_iounmap at91_iounmap
		#endif

		void __iomem *at91_ioremap(unsigned long phys, size_t size, unsigned int type);
		void at91_iounmap(volatile void __iomem *addr);

		static inline unsigned int at91_sys_read(unsigned int reg_offset)
		{
		void __iomem addr = (void __iomem )AT91_VA_BASE_SYS;

deleted100644 → 0

+0 −28

Original line number	Diff line number	Diff line
		/*
		* arch/arm/mach-at91/include/mach/vmalloc.h
		*
		* Copyright (C) 2003 SAN People
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		* the Free Software Foundation; either version 2 of the License, or
		* (at your option) any later version.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
		*/

		#ifndef __ASM_ARCH_VMALLOC_H
		#define __ASM_ARCH_VMALLOC_H

		#include <mach/hardware.h>

		#define VMALLOC_END (AT91_VIRT_BASE & PGDIR_MASK)

		#endif