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

Commit 10146801 authored by Greg Ungerer's avatar Greg Ungerer Committed by Linus Torvalds
Browse files

m68knommu: remove is_in_rom() function 



Remove is_in_rom() function.  It doesn't actually serve the purpose it was
intended to.  If you look at the use of it _access_ok() (which is the only use
of it) then it is obvious that most of memory is marked as access_ok.  No
point having is_in_rom() then, so remove it.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a4c8b915

arch/m68knommu/kernel/m68k_ksyms.c

+0 −2
Original line number Diff line number Diff line
@@ -81,8 +81,6 @@ EXPORT_SYMBOL(__mulsi3); 
EXPORT_SYMBOL(__udivsi3);

EXPORT_SYMBOL(__umodsi3);



EXPORT_SYMBOL(is_in_rom);



#ifdef CONFIG_COLDFIRE

extern unsigned int *dma_device_address;

extern unsigned long dma_base_addr, _ramend;

arch/m68knommu/mm/memory.c

+0 −20
Original line number Diff line number Diff line
@@ -33,23 +33,3 @@ unsigned long kernel_map(unsigned long paddr, unsigned long size, 
	return paddr;

}



int is_in_rom(unsigned long addr)

{

	extern unsigned long _ramstart, _ramend;



	/*

	 *	What we are really trying to do is determine if addr is

	 *	in an allocated kernel memory region. If not then assume

	 *	we cannot free it or otherwise de-allocate it. Ideally

	 *	we could restrict this to really being in a ROM or flash,

	 *	but that would need to be done on a board by board basis,

	 *	not globally.

	 */

	if ((addr < _ramstart) || (addr >= _ramend))

		return(1);



	/* Default case, not in ROM */

	return(0);

}

include/asm-m68knommu/pgtable.h

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ static inline int pte_file(pte_t pte) { return 0; } 
 * These would be in other places but having them here reduces the diffs.

 */

extern unsigned int kobjsize(const void *objp);

extern int is_in_rom(unsigned long);



/*

 * No page table caches to initialise.

include/asm-m68knommu/uaccess.h

+7 −4
Original line number Diff line number Diff line
@@ -15,12 +15,15 @@ 


#define access_ok(type,addr,size)	_access_ok((unsigned long)(addr),(size))



/*

 * It is not enough to just have access_ok check for a real RAM address.

 * This would disallow the case of code/ro-data running XIP in flash/rom.

 * Ideally we would check the possible flash ranges too, but that is

 * currently not so easy.

 */

static inline int _access_ok(unsigned long addr, unsigned long size)

{

	extern unsigned long memory_start, memory_end;



	return (((addr >= memory_start) && (addr+size < memory_end)) ||

		(is_in_rom(addr) && is_in_rom(addr+size)));

	return 1;

}



/*