[PATCH v2 07/11] arm64: vdso: Rename vdso_pages to vdso_text_pages

[Mark Brown]

In preparation for having multiple data pages rename the current vdso_pages
to vdso_text_pages.

Signed-off-by: Mark Brown <broonie at kernel.org>
---
 arch/arm64/kernel/vdso.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c
index 95e69df42141..032249f70460 100644
--- a/arch/arm64/kernel/vdso.c
+++ b/arch/arm64/kernel/vdso.c
@@ -47,7 +47,7 @@ struct vdso_abi_info {
 	const char *name;
 	const char *vdso_code_start;
 	const char *vdso_code_end;
-	unsigned long vdso_pages;
+	unsigned long vdso_text_pages;
 	/* Data Mapping */
 	struct vm_special_mapping *dm;
 	/* Code Mapping */
@@ -108,13 +108,13 @@ static int __vdso_init(enum vdso_abi abi)
 		pr_err("vDSO is not page aligned\n");
 		return -EINVAL;
 	}
-	vdso_info[abi].vdso_pages = (
+	vdso_info[abi].vdso_text_pages = (
 			vdso_info[abi].vdso_code_end -
 			vdso_info[abi].vdso_code_start) >>
 			PAGE_SHIFT;
 
 	/* Allocate the vDSO pagelist, plus a page for the data. */
-	vdso_pagelist = kcalloc(vdso_info[abi].vdso_pages + 1,
+	vdso_pagelist = kcalloc(vdso_info[abi].vdso_text_pages + 1,
 				sizeof(struct page *),
 				GFP_KERNEL);
 	if (vdso_pagelist == NULL)
@@ -127,7 +127,7 @@ static int __vdso_init(enum vdso_abi abi)
 	/* Grab the vDSO code pages. */
 	pfn = sym_to_pfn(vdso_info[abi].vdso_code_start);
 
-	for (i = 0; i < vdso_info[abi].vdso_pages; i++)
+	for (i = 0; i < vdso_info[abi].vdso_text_pages; i++)
 		vdso_pagelist[i + 1] = pfn_to_page(pfn + i);
 
 	vdso_info[abi].dm->pages = &vdso_pagelist[0];
@@ -145,7 +145,7 @@ static int __setup_additional_pages(enum vdso_abi abi,
 	unsigned long gp_flags = 0;
 	void *ret;
 
-	vdso_text_len = vdso_info[abi].vdso_pages << PAGE_SHIFT;
+	vdso_text_len = vdso_info[abi].vdso_text_pages << PAGE_SHIFT;
 	/* Be sure to map the data page */
 	vdso_mapping_len = vdso_text_len + PAGE_SIZE;
 
-- 
2.20.1