OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[POWERPC] Add error return from htab_remove_mapping() 

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>
This commit is contained in:
Badari Pulavarty 2008-03-28 11:37:21 +11:00 committed by Paul Mackerras
parent 3faac21546
commit 52db9b4426
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/powerpc/mm/hash_utils_64.c
View File

@ -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;
@ -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,
@ -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 */

2
include/asm-powerpc/sparsemem.h
View File

@ -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