mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
powerpc/mm/32: Remove the reserved memory hack
This hack, introduced in commit c5df7f7751
("powerpc: allow ioremap
within reserved memory regions") is now unnecessary.
Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
parent
57deb8fea0
commit
7e1405917c
3 changed files with 1 additions and 8 deletions
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue