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

Commit 7e140591 authored by Jonathan Neuschäfer's avatar Jonathan Neuschäfer Committed by Michael Ellerman
Browse files

powerpc/mm/32: Remove the reserved memory hack 



This hack, introduced in commit c5df7f77 ("powerpc: allow ioremap
within reserved memory regions") is now unnecessary.

Signed-off-by: default avatarJonathan Neuschäfer <j.neuschaefer@gmx.net>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 57deb8fe

arch/powerpc/mm/init_32.c

+0 −5
Original line number Diff line number Diff line
@@ -88,11 +88,6 @@ void MMU_init(void); 
int __map_without_bats;

int __map_without_ltlbs;



/*

 * This tells the system to allow ioremapping memory marked as reserved.

 */

int __allow_ioremap_reserved;



/* max amount of low RAM to map in */

unsigned long __max_low_memory = MAX_LOW_MEM;

arch/powerpc/mm/mmu_decl.h

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ extern void setbat(int index, unsigned long virt, phys_addr_t phys, 
		   unsigned int size, pgprot_t prot);



extern int __map_without_bats;

extern int __allow_ioremap_reserved;

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
@@ -148,8 +148,7 @@ __ioremap_caller(phys_addr_t addr, unsigned long size, unsigned long flags, 
	 * mem_init() sets high_memory so only do the check after that.

	 */

	if (slab_is_available() && (p < virt_to_phys(high_memory)) &&

	    page_is_ram(__phys_to_pfn(p)) &&

	    !(__allow_ioremap_reserved && memblock_is_region_reserved(p, size))) {

	    page_is_ram(__phys_to_pfn(p))) {

		printk("__ioremap(): phys addr 0x%llx is RAM lr %ps\n",

		       (unsigned long long)p, __builtin_return_address(0));

		return NULL;