lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: cpa, clean up code flow

Browse Source 
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Ingo Molnar
2008-02-04 16:48:10 +01:00
parent beaff6333b
commit 87f7f8fe32
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
arch/x86/mm/pageattr.c
View File

@@ -423,8 +423,8 @@ out_unlock:
static int __change_page_attr(unsigned long address, struct cpa_data *cpa) static int __change_page_attr(unsigned long address, struct cpa_data *cpa)
{ {
int level, do_split, err;
struct page *kpte_page; struct page *kpte_page;
int level, do_split;
pte_t *kpte; pte_t *kpte;
repeat: repeat:
@@ -476,26 +476,24 @@ repeat:
* and just change the pte: * and just change the pte:
*/ */
do_split = try_preserve_large_page(kpte, address, cpa); 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, * When the range fits into the existing large page,
* return. cp->numpages and cpa->tlbflush have been updated in * return. cp->numpages and cpa->tlbflush have been updated in
* try_large_page: * try_large_page:
*/ */
if (do_split == 0) if (do_split <= 0)
return 0; return do_split;
/* /*
* We have to split the large page: * We have to split the large page:
*/ */
do_split = split_large_page(kpte, address); err = split_large_page(kpte, address);
if (do_split) if (!err) {
return do_split; cpa->flushtlb = 1;
cpa->flushtlb = 1; goto repeat;
}
goto repeat; return err;
} }
/** /**