Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

um: Use char[] for linker script address declarations

The linker script defines some variables which are declared either with
type char[] in include/asm-generic/sections.h or with a meaningless
integer type in arch/um/include/asm/sections.h.

Fix this inconsistency by declaring every variable char[].

Signed-off-by: Nicolas Iooss <nicolas.iooss_linux@m4x.org>
Signed-off-by: Richard Weinberger <richard@nod.at>

authored by

Nicolas Iooss and committed by
Richard Weinberger
05eacfd0 d5f20be7

+7 -7
+2 -2
arch/um/include/asm/sections.h
··· 3 3 4 4 #include <asm-generic/sections.h> 5 5 6 - extern char __binary_start; 7 - extern int __syscall_stub_start, __syscall_stub_end; 6 + extern char __binary_start[]; 7 + extern char __syscall_stub_start[], __syscall_stub_end[]; 8 8 9 9 #endif
+2 -2
arch/um/kernel/physmem.c
··· 109 109 * Special kludge - This page will be mapped in to userspace processes 110 110 * from physmem_fd, so it needs to be written out there. 111 111 */ 112 - os_seek_file(physmem_fd, __pa(&__syscall_stub_start)); 113 - os_write_file(physmem_fd, &__syscall_stub_start, PAGE_SIZE); 112 + os_seek_file(physmem_fd, __pa(__syscall_stub_start)); 113 + os_write_file(physmem_fd, __syscall_stub_start, PAGE_SIZE); 114 114 os_fsync_file(physmem_fd); 115 115 116 116 bootmap_size = init_bootmem(pfn, pfn + delta);
+2 -2
arch/um/kernel/skas/mmu.c
··· 92 92 int err, ret; 93 93 94 94 ret = init_stub_pte(mm, STUB_CODE, 95 - (unsigned long) &__syscall_stub_start); 95 + (unsigned long) __syscall_stub_start); 96 96 if (ret) 97 97 goto out; 98 98 ··· 100 100 if (ret) 101 101 goto out; 102 102 103 - mm->context.stub_pages[0] = virt_to_page(&__syscall_stub_start); 103 + mm->context.stub_pages[0] = virt_to_page(__syscall_stub_start); 104 104 mm->context.stub_pages[1] = virt_to_page(mm->context.id.stack); 105 105 106 106 /* dup_mmap already holds mmap_sem */
+1 -1
arch/um/kernel/um_arch.c
··· 292 292 physmem_size += UML_ROUND_UP(brk_start) - UML_ROUND_UP(&_end); 293 293 } 294 294 295 - uml_physmem = (unsigned long) &__binary_start & PAGE_MASK; 295 + uml_physmem = (unsigned long) __binary_start & PAGE_MASK; 296 296 297 297 /* Reserve up to 4M after the current brk */ 298 298 uml_reserved = ROUND_4M(brk_start) + (1 << 22);