[PATCHv4 14/28] x86/vdso: Rename vdso_image {.data=>.text}

[Dmitry Safonov]

To avoid any confusion with VVAR.

Co-developed-by: Andrei Vagin <ava...@openvz.org>
Signed-off-by: Andrei Vagin <ava...@openvz.org>
Signed-off-by: Dmitry Safonov <d...@arista.com>
---
 arch/x86/entry/vdso/vdso2c.h | 2 +-
 arch/x86/entry/vdso/vma.c    | 6 +++---
 arch/x86/include/asm/vdso.h  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/x86/entry/vdso/vdso2c.h b/arch/x86/entry/vdso/vdso2c.h
index 80be339ee93e..7556bb70ed8b 100644
--- a/arch/x86/entry/vdso/vdso2c.h
+++ b/arch/x86/entry/vdso/vdso2c.h
@@ -158,7 +158,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
        fprintf(outfile, "\n};\n\n");
 
        fprintf(outfile, "const struct vdso_image %s = {\n", image_name);
-       fprintf(outfile, "\t.data = raw_data,\n");
+       fprintf(outfile, "\t.text = raw_data,\n");
        fprintf(outfile, "\t.size = %lu,\n", mapping_size);
        if (alt_sec) {
                fprintf(outfile, "\t.alt = %lu,\n",
diff --git a/arch/x86/entry/vdso/vma.c b/arch/x86/entry/vdso/vma.c
index d2b421233ba5..c30a33b2963b 100644
--- a/arch/x86/entry/vdso/vma.c
+++ b/arch/x86/entry/vdso/vma.c
@@ -32,8 +32,8 @@ void __init init_vdso_image(const struct vdso_image *image)
 {
        BUG_ON(image->size % PAGE_SIZE != 0);
 
-       apply_alternatives((struct alt_instr *)(image->data + image->alt),
-                          (struct alt_instr *)(image->data + image->alt +
+       apply_alternatives((struct alt_instr *)(image->text + image->alt),
+                          (struct alt_instr *)(image->text + image->alt +
                                                image->alt_len));
 }
 
@@ -47,7 +47,7 @@ static vm_fault_t vdso_fault(const struct vm_special_mapping 
*sm,
        if (!image || (vmf->pgoff << PAGE_SHIFT) >= image->size)
                return VM_FAULT_SIGBUS;
 
-       vmf->page = virt_to_page(image->data + (vmf->pgoff << PAGE_SHIFT));
+       vmf->page = virt_to_page(image->text + (vmf->pgoff << PAGE_SHIFT));
        get_page(vmf->page);
        return 0;
 }
diff --git a/arch/x86/include/asm/vdso.h b/arch/x86/include/asm/vdso.h
index 230474e2ddb5..dffdc12cc7d6 100644
--- a/arch/x86/include/asm/vdso.h
+++ b/arch/x86/include/asm/vdso.h
@@ -11,7 +11,7 @@
 #include <linux/mm_types.h>
 
 struct vdso_image {
-       void *data;
+       void *text;
        unsigned long size;   /* Always a multiple of PAGE_SIZE */
 
        unsigned long alt, alt_len;
-- 
2.22.0