hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x86/mm/pat: Simplify the free_memtype() control flow 

Simplify/streamline the quirky handling of the pat_pagerange_is_ram() logic,
and get rid of the 'err' local variable.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2019-11-19 10:18:56 +01:00
parent ef35b0fcee
commit 47553d42c5
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/mm/pat.c
View File

@ -656,7 +656,6 @@ int reserve_memtype(u64 start, u64 end, enum page_cache_mode req_type,
int free_memtype(u64 start, u64 end) int free_memtype(u64 start, u64 end)
{ {
int err = -EINVAL;
int is_range_ram; int is_range_ram;
struct memtype *entry; struct memtype *entry;
@ -671,14 +670,10 @@ int free_memtype(u64 start, u64 end)
return 0; return 0;
is_range_ram = pat_pagerange_is_ram(start, end); is_range_ram = pat_pagerange_is_ram(start, end);
if (is_range_ram == 1) { if (is_range_ram == 1)
return free_ram_pages_type(start, end);
err = free_ram_pages_type(start, end); if (is_range_ram < 0)
return err;
} else if (is_range_ram < 0) {
return -EINVAL; return -EINVAL;
}
spin_lock(&memtype_lock); spin_lock(&memtype_lock);
entry = memtype_erase(start, end); entry = memtype_erase(start, end);