Commit 87f7f8fe authored by Ingo Molnar's avatar Ingo Molnar

x86: cpa, clean up code flow

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent beaff633
......@@ -423,8 +423,8 @@ static int split_large_page(pte_t *kpte, unsigned long address)
static int __change_page_attr(unsigned long address, struct cpa_data *cpa)
{
int level, do_split, err;
struct page *kpte_page;
int level, do_split;
pte_t *kpte;
repeat:
......@@ -476,26 +476,24 @@ static int __change_page_attr(unsigned long address, struct cpa_data *cpa)
* and just change the pte:
*/
do_split = try_preserve_large_page(kpte, address, cpa);
if (do_split < 0)
return do_split;
/*
* When the range fits into the existing large page,
* return. cp->numpages and cpa->tlbflush have been updated in
* try_large_page:
*/
if (do_split == 0)
return 0;
if (do_split <= 0)
return do_split;
/*
* We have to split the large page:
*/
do_split = split_large_page(kpte, address);
if (do_split)
return do_split;
cpa->flushtlb = 1;
err = split_large_page(kpte, address);
if (!err) {
cpa->flushtlb = 1;
goto repeat;
}
goto repeat;
return err;
}
/**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment