Skip to content

Commit

Permalink
[POWERPC] Add error return from htab_remove_mapping()
Browse files Browse the repository at this point in the history
If the platform doesn't support hpte_removebolted(), gracefully
return failure rather than success.

Signed-off-by: Badari Pulavarty <pbadari@us.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Badari Pulavarty authored and Paul Mackerras committed Apr 1, 2008
1 parent 3faac21 commit 52db9b4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
14 changes: 9 additions & 5 deletions arch/powerpc/mm/hash_utils_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend,
return ret < 0 ? ret : 0;
}

static void htab_remove_mapping(unsigned long vstart, unsigned long vend,
static int htab_remove_mapping(unsigned long vstart, unsigned long vend,
int psize, int ssize)
{
unsigned long vaddr;
Expand All @@ -202,12 +202,15 @@ static void htab_remove_mapping(unsigned long vstart, unsigned long vend,
step = 1 << shift;

if (!ppc_md.hpte_removebolted) {
printk("Sub-arch doesn't implement hpte_removebolted\n");
return;
printk(KERN_WARNING "Platform doesn't implement "
"hpte_removebolted\n");
return -EINVAL;
}

for (vaddr = vstart; vaddr < vend; vaddr += step)
ppc_md.hpte_removebolted(vaddr, psize, ssize);

return 0;
}

static int __init htab_dt_scan_seg_sizes(unsigned long node,
Expand Down Expand Up @@ -454,9 +457,10 @@ void create_section_mapping(unsigned long start, unsigned long end)
mmu_linear_psize, mmu_kernel_ssize));
}

void remove_section_mapping(unsigned long start, unsigned long end)
int remove_section_mapping(unsigned long start, unsigned long end)
{
htab_remove_mapping(start, end, mmu_linear_psize, mmu_kernel_ssize);
return htab_remove_mapping(start, end, mmu_linear_psize,
mmu_kernel_ssize);
}
#endif /* CONFIG_MEMORY_HOTPLUG */

Expand Down
2 changes: 1 addition & 1 deletion include/asm-powerpc/sparsemem.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#ifdef CONFIG_MEMORY_HOTPLUG
extern void create_section_mapping(unsigned long start, unsigned long end);
extern void remove_section_mapping(unsigned long start, unsigned long end);
extern int remove_section_mapping(unsigned long start, unsigned long end);
#ifdef CONFIG_NUMA
extern int hot_add_scn_to_nid(unsigned long scn_addr);
#else
Expand Down

0 comments on commit 52db9b4

Please sign in to comment.