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

Commit 800fc3ee authored by David Gibson's avatar David Gibson Committed by Paul Mackerras
Browse files

[PATCH] powerpc: Remove imalloc.h 



asm-ppc64/imalloc.h is only included from files in arch/powerpc/mm.
We already have a header for mm local definitions,
arch/powerpc/mm/mmu_decl.h.  Thus, this patch moves the contents of
imalloc.h into mmu_decl.h.  The only exception are the definitions of
PHBS_IO_BASE, IMALLOC_BASE and IMALLOC_END.  Those are moved into
pgtable.h, next to similar definitions of VMALLOC_START and
VMALLOC_SIZE.

Built for multiplatform 32bit and 64bit (ARCH=powerpc).

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 0e6850f6

arch/powerpc/mm/imalloc.c

+2 −1
Original line number Diff line number Diff line
@@ -14,9 +14,10 @@ 
#include <asm/pgalloc.h>

#include <asm/pgtable.h>

#include <asm/semaphore.h>

#include <asm/imalloc.h>

#include <asm/cacheflush.h>



#include "mmu_decl.h"



static DECLARE_MUTEX(imlist_sem);

struct vm_struct * imlist = NULL;

arch/powerpc/mm/init_64.c

+2 −1
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ 
#include <asm/iommu.h>

#include <asm/abs_addr.h>

#include <asm/vdso.h>

#include <asm/imalloc.h>



#include "mmu_decl.h"



#ifdef DEBUG

#define DBG(fmt...) printk(fmt)

arch/powerpc/mm/mmu_decl.h

+13 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ extern void invalidate_tlbcam_entry(int index); 


extern int __map_without_bats;

extern unsigned long ioremap_base;

extern unsigned long ioremap_bot;

extern unsigned int rtas_data, rtas_size;



extern PTE *Hash, *Hash_end;
@@ -42,6 +41,7 @@ extern unsigned long Hash_size, Hash_mask; 
extern unsigned int num_tlbcam_entries;

#endif



extern unsigned long ioremap_bot;

extern unsigned long __max_low_memory;

extern unsigned long __initial_memory_limit;

extern unsigned long total_memory;
@@ -84,4 +84,16 @@ static inline void flush_HPTE(unsigned context, unsigned long va, 
	else

		_tlbie(va);

}

#else /* CONFIG_PPC64 */

/* imalloc region types */

#define IM_REGION_UNUSED	0x1

#define IM_REGION_SUBSET	0x2

#define IM_REGION_EXISTS	0x4

#define IM_REGION_OVERLAP	0x8

#define IM_REGION_SUPERSET	0x10



extern struct vm_struct * im_get_free_area(unsigned long size);

extern struct vm_struct * im_get_area(unsigned long v_addr, unsigned long size,

				      int region_type);

extern void im_free(void *addr);

#endif

arch/powerpc/mm/pgtable_64.c

+2 −1
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ 
#include <asm/iommu.h>

#include <asm/abs_addr.h>

#include <asm/vdso.h>

#include <asm/imalloc.h>



#include "mmu_decl.h"



unsigned long ioremap_bot = IMALLOC_BASE;

static unsigned long phbs_io_bot = PHBS_IO_BASE;

include/asm-ppc64/imalloc.h

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
#ifndef _PPC64_IMALLOC_H

#define _PPC64_IMALLOC_H



/*

 * Define the address range of the imalloc VM area.

 */

#define PHBS_IO_BASE  	  VMALLOC_END

#define IMALLOC_BASE      (PHBS_IO_BASE + 0x80000000ul)	/* Reserve 2 gigs for PHBs */

#define IMALLOC_END       (VMALLOC_START + PGTABLE_RANGE)





/* imalloc region types */

#define IM_REGION_UNUSED	0x1

#define IM_REGION_SUBSET	0x2

#define IM_REGION_EXISTS	0x4

#define IM_REGION_OVERLAP	0x8

#define IM_REGION_SUPERSET	0x10



extern struct vm_struct * im_get_free_area(unsigned long size);

extern struct vm_struct * im_get_area(unsigned long v_addr, unsigned long size,

				      int region_type);

extern void im_free(void *addr);



extern unsigned long ioremap_bot;



#endif /* _PPC64_IMALLOC_H */