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

Commit e974cd4b authored by Christophe Leroy's avatar Christophe Leroy Committed by Scott Wood
Browse files

powerpc32: remove ioremap_base 



ioremap_base is not initialised and is nowhere used so remove it

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarScott Wood <oss@buserror.net>
parent c562eb06

arch/powerpc/include/asm/nohash/32/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ extern int icache_44x_need_flush; 
 * We no longer map larger than phys RAM with the BATs so we don't have

 * to worry about the VMALLOC_OFFSET causing problems.  We do have to worry

 * about clashes between our early calls to ioremap() that start growing down

 * from ioremap_base being run into the VM area allocations (growing upwards

 * from IOREMAP_TOP being run into the VM area allocations (growing upwards

 * from VMALLOC_START).  For this reason we have ioremap_bot to check when

 * we actually run into our mappings setup in the early boot with the VM

 * system.  This really does become a problem for machines with good amounts

arch/powerpc/mm/mmu_decl.h

+0 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ extern void setbat(int index, unsigned long virt, phys_addr_t phys, 


extern int __map_without_bats;

extern int __allow_ioremap_reserved;

extern unsigned long ioremap_base;

extern unsigned int rtas_data, rtas_size;



struct hash_pte;

arch/powerpc/mm/pgtable_32.c

+1 −2
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 


#include "mmu_decl.h"



unsigned long ioremap_base;

unsigned long ioremap_bot;

EXPORT_SYMBOL(ioremap_bot);	/* aka VMALLOC_END */
@@ -173,7 +172,7 @@ __ioremap_caller(phys_addr_t addr, unsigned long size, unsigned long flags, 
	/*

	 * Choose an address to map it to.

	 * Once the vmalloc system is running, we use it.

	 * Before then, we use space going down from ioremap_base

	 * Before then, we use space going down from IOREMAP_TOP

	 * (ioremap_bot records where we're up to).

	 */

	p = addr & PAGE_MASK;

arch/powerpc/platforms/embedded6xx/mpc10x.h

+0 −10
Original line number Diff line number Diff line
@@ -24,13 +24,11 @@ 
 *   Processor: 0x80000000 - 0x807fffff -> PCI I/O: 0x00000000 - 0x007fffff

 *   Processor: 0xc0000000 - 0xdfffffff -> PCI MEM: 0x00000000 - 0x1fffffff

 *   PCI MEM:   0x80000000 -> Processor System Memory: 0x00000000

 *   EUMB mapped to: ioremap_base - 0x00100000 (ioremap_base - 1 MB)

 *

 * MAP B (CHRP Map)

 *   Processor: 0xfe000000 - 0xfebfffff -> PCI I/O: 0x00000000 - 0x00bfffff

 *   Processor: 0x80000000 - 0xbfffffff -> PCI MEM: 0x80000000 - 0xbfffffff

 *   PCI MEM:   0x00000000 -> Processor System Memory: 0x00000000

 *   EUMB mapped to: ioremap_base - 0x00100000 (ioremap_base - 1 MB)

 */



/*
@@ -138,14 +136,6 @@ 
#define MPC10X_EUMB_WP_OFFSET		0x000ff000 /* Data path diagnostic, watchpoint reg offset */

#define MPC10X_EUMB_WP_SIZE		0x00001000 /* Data path diagnostic, watchpoint reg size */



/*

 * Define some recommended places to put the EUMB regs.

 * For both maps, recommend putting the EUMB from 0xeff00000 to 0xefffffff.

 */

extern unsigned long			ioremap_base;

#define	MPC10X_MAPA_EUMB_BASE		(ioremap_base - MPC10X_EUMB_SIZE)

#define	MPC10X_MAPB_EUMB_BASE		MPC10X_MAPA_EUMB_BASE



enum ppc_sys_devices {

	MPC10X_IIC1,

	MPC10X_DMA0,