diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-02-04 16:48:10 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-02-04 16:48:10 +0100 |
| commit | 87f7f8fe328388a1430a4c27cbe684f3925fd8a5 (patch) | |
| tree | 175f262540488db3ee5e3fa027a0167e14b7f733 | |
| parent | x86: cpa, eliminate CPA_ enum (diff) | |
| download | linux-87f7f8fe328388a1430a4c27cbe684f3925fd8a5.tar.xz linux-87f7f8fe328388a1430a4c27cbe684f3925fd8a5.zip | |
x86: cpa, clean up code flow
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/x86/mm/pageattr.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index fb2eedba76ad..4f033505127e 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c @@ -423,8 +423,8 @@ out_unlock: 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 @@ repeat: * 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; } /** |