Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72464dba authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap: Split vmalloc.h for mach-omap1 and mach-omap2 



Earlier patch "omap: Remap L3, L4 to get more kernel io address space"
changed the VMALLOC_END.

However, this change causes problems on mach-omap1:

BUG: mapping for 0xe0000000 at 0xe0000000 overlaps vmalloc space
BUG: mapping for 0xe1000000 at 0xe1000000 overlaps vmalloc space

Fix this by creating separate vmalloc.h files for mach-omap1
and mach-omap2.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent c97c6864

arch/arm/plat-omap/include/mach/vmalloc.h→arch/arm/mach-omap1/include/mach/vmalloc.h

+1 −5
Original line number Diff line number Diff line 
/*

 *  arch/arm/plat-omap/include/mach/vmalloc.h

 *  arch/arm/mach-omap1/include/mach/vmalloc.h

 *

 *  Copyright (C) 2000 Russell King.

 *
@@ -17,8 +17,4 @@ 
 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

 */

#ifdef CONFIG_ARCH_OMAP1

#define VMALLOC_END	(PAGE_OFFSET + 0x18000000)
 
#else

#define VMALLOC_END	(PAGE_OFFSET + 0x38000000)

#endif

arch/arm/mach-omap2/include/mach/vmalloc.h

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/*

 *  arch/arm/plat-omap/include/mach/vmalloc.h

 *

 *  Copyright (C) 2000 Russell King.

 *

 * 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

 */

#define VMALLOC_END	  (PAGE_OFFSET + 0x38000000)