|
@@ -37,7 +37,7 @@
|
|
|
#include <asm/vdso.h>
|
|
|
#include <asm/vdso_datapage.h>
|
|
|
|
|
|
-extern char vdso_start, vdso_end;
|
|
|
+extern char vdso_start[], vdso_end[];
|
|
|
static unsigned long vdso_pages __ro_after_init;
|
|
|
|
|
|
/*
|
|
@@ -125,14 +125,14 @@ static int __init vdso_init(void)
|
|
|
struct page **vdso_pagelist;
|
|
|
unsigned long pfn;
|
|
|
|
|
|
- if (memcmp(&vdso_start, "\177ELF", 4)) {
|
|
|
+ if (memcmp(vdso_start, "\177ELF", 4)) {
|
|
|
pr_err("vDSO is not a valid ELF object!\n");
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
|
|
|
- vdso_pages = (&vdso_end - &vdso_start) >> PAGE_SHIFT;
|
|
|
+ vdso_pages = (vdso_end - vdso_start) >> PAGE_SHIFT;
|
|
|
pr_info("vdso: %ld pages (%ld code @ %p, %ld data @ %p)\n",
|
|
|
- vdso_pages + 1, vdso_pages, &vdso_start, 1L, vdso_data);
|
|
|
+ vdso_pages + 1, vdso_pages, vdso_start, 1L, vdso_data);
|
|
|
|
|
|
/* Allocate the vDSO pagelist, plus a page for the data. */
|
|
|
vdso_pagelist = kcalloc(vdso_pages + 1, sizeof(struct page *),
|
|
@@ -145,7 +145,7 @@ static int __init vdso_init(void)
|
|
|
|
|
|
|
|
|
/* Grab the vDSO code pages. */
|
|
|
- pfn = sym_to_pfn(&vdso_start);
|
|
|
+ pfn = sym_to_pfn(vdso_start);
|
|
|
|
|
|
for (i = 0; i < vdso_pages; i++)
|
|
|
vdso_pagelist[i + 1] = pfn_to_page(pfn + i);
|