x86: cpa, clean up code flow (87f7f8fe) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/x86/mm/pageattr.c

+9 −11

Original line number	Diff line number	Diff line
		@@ -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,28 +476,26 @@ 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;
		err = split_large_page(kpte, address);
		if (!err) {
		cpa->flushtlb = 1;

		goto repeat;
		}

		return err;
		}

		/**
		* change_page_attr_addr - Change page table attributes in linear mapping
		* @address: Virtual address in linear mapping.