diff options
| -rw-r--r-- | arch/x86/machine/boot.h | 2 | ||||
| -rw-r--r-- | arch/x86/machine/pmap.c | 2 | ||||
| -rw-r--r-- | arch/x86/x15.lds.S | 6 | ||||
| -rw-r--r-- | kern/init.h | 2 | ||||
| -rw-r--r-- | kern/percpu.c | 2 | ||||
| -rw-r--r-- | kern/percpu.h | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/arch/x86/machine/boot.h b/arch/x86/machine/boot.h index 6b012f89..bd5eb2da 100644 --- a/arch/x86/machine/boot.h +++ b/arch/x86/machine/boot.h @@ -67,7 +67,7 @@ * Boundaries of the .boot section. */ extern char _boot; -extern char _eboot; +extern char _boot_end; extern char boot_stack[STACK_SIZE]; extern char boot_ap_stack[STACK_SIZE]; diff --git a/arch/x86/machine/pmap.c b/arch/x86/machine/pmap.c index b11587d0..a7c49610 100644 --- a/arch/x86/machine/pmap.c +++ b/arch/x86/machine/pmap.c @@ -437,7 +437,7 @@ pmap_setup_paging(void) va = vm_page_trunc((uintptr_t)&_boot); pa = va; - size = vm_page_round((uintptr_t)&_eboot) - va; + size = vm_page_round((uintptr_t)&_boot_end) - va; for (i = 0; i < size; i += PAGE_SIZE) { pmap_boot_enter(root_ptp, va, pa, PAGE_SIZE); diff --git a/arch/x86/x15.lds.S b/arch/x86/x15.lds.S index bcf5f8c8..54623031 100644 --- a/arch/x86/x15.lds.S +++ b/arch/x86/x15.lds.S @@ -34,7 +34,7 @@ SECTIONS } : boot . = ALIGN(PAGE_SIZE); - _eboot = .; + _boot_end = .; . += VM_KERNEL_OFFSET; _init = .; @@ -45,7 +45,7 @@ SECTIONS } : init . = ALIGN(PAGE_SIZE); - _einit = .; + _init_end = .; _percpu = .; .percpu 0 : AT(BOOT_VTOP(_percpu)) { @@ -54,7 +54,7 @@ SECTIONS . = _percpu + SIZEOF(.percpu); . = ALIGN(PAGE_SIZE); - _epercpu = .; + _percpu_end = .; _text = .; .text ALIGN(PAGE_SIZE) : AT(BOOT_VTOP(ADDR(.text))) { diff --git a/kern/init.h b/kern/init.h index 6f33edc8..62fecf40 100644 --- a/kern/init.h +++ b/kern/init.h @@ -36,7 +36,7 @@ * Boundaries of the .init section. */ extern char _init; -extern char _einit; +extern char _init_end; #endif /* __ASSEMBLER__ */ diff --git a/kern/percpu.c b/kern/percpu.c index 6e0c77d0..ad007724 100644 --- a/kern/percpu.c +++ b/kern/percpu.c @@ -49,7 +49,7 @@ percpu_setup(void) struct vm_page *page; unsigned int order; - percpu_area_size = &_epercpu - &_percpu; + percpu_area_size = &_percpu_end - &_percpu; printk("percpu: max_cpus: %u, section size: %zuk\n", X15_MAX_CPUS, percpu_area_size >> 10); assert(vm_page_aligned(percpu_area_size)); diff --git a/kern/percpu.h b/kern/percpu.h index 73867472..59959518 100644 --- a/kern/percpu.h +++ b/kern/percpu.h @@ -42,7 +42,7 @@ * * Architecture-specific code must enforce that the percpu section starts * at 0, thereby making the addresses of percpu variables offsets into the - * percpu area. It must also make sure the _percpu and _epercpu symbols + * percpu area. It must also make sure the _percpu and _percpu_end symbols * have valid virtual addresses, included between _init (but not part of * the init section) and _end. * @@ -68,7 +68,7 @@ * itself has different addresses. */ extern char _percpu; -extern char _epercpu; +extern char _percpu_end; /* * Expands to the address of a percpu variable. |