x86: fix two modpost warnings
PATCH 1/1 x86: fix two modpost warnings
Even though it's only the difference of the two __initdata symbols that's being calculated, modpost still doesn't like this. So rather calculate the size once in an __init function and store it for later use.
Signed-off-by Jan Beulich <[email protected]>
--- arch/x86/vdso/vma.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
arch/x86/vdso/vma.c +6 -5
@@ -21,7 +21,8 @@ int vdso_enabled = 1;extern char vdso_start[], vdso_end[];extern unsigned short vdso_sync_cpuid; -struct page **vdso_pages; +static struct page **vdso_pages; +static unsigned vdso_size;static inline void *var_ref (void *p,char *name) {
@@ -38,6 +39,7 @@ static int __init init_vdso_vars(void)int i;char *vbase; + vdso_size = npages <<PAGE_SHIFT ; vdso_pages =kmalloc (sizeof (struct page *) * npages,GFP_KERNEL );if (!vdso_pages) goto oom;
@@ -101,20 +103,19 @@ int arch_setup_additional_pages(struct lstruct mm_struct *mm = current->mm;unsigned long addr;int ret; -unsigned len =round_up (vdso_end - vdso_start,PAGE_SIZE );if (!vdso_enabled)return 0 ;down_write (&mm->mmap_sem); - addr =vdso_addr (mm->start_stack, len); - addr =get_unmapped_area (NULL , addr, len,0 ,0 ); + addr =vdso_addr (mm->start_stack, vdso_size); + addr =get_unmapped_area (NULL , addr, vdso_size,0 ,0 );if (IS_ERR_VALUE (addr)) { ret = addr; goto up_fail; } - ret = install_special_mapping(mm, addr, len, + ret = install_special_mapping(mm, addr, vdso_size, VM_READ|VM_EXEC| VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC| VM_ALWAYSDUMP,
Quoted 6 lines · Jan Beulich
Even though it's only the difference of the two
__initdatasymbols that's being calculated, modpost still doesn't like this. So rather calculate the size once in an__initfunction and store it for later use.Signed-off-by Jan Beulich <[email protected]>
Applied to x86/cleanups, thanks!
-hpa