diff options
| author | Nicolas Iooss <nicolas.iooss_linux@m4x.org> | 2014-10-12 07:02:11 -0400 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2015-05-31 07:14:05 -0400 |
| commit | d5f20be7cab85e6e701751323eea77c7935ae522 (patch) | |
| tree | d560ec0a1869a1399291d216e3b4df4d2a33ed43 /arch/um/kernel | |
| parent | ba155e2d21f6bf05de86a78dbe5bfd8757604a65 (diff) | |
um: Create asm/sections.h
arch/um/kernel/dyn.lds.S and arch/um/kernel/uml.lds.S define some
UML-specific symbols. These symbols are used in the kernel part of UML
with extern declarations.
Move these declarations to a new header, asm/sections.h, like other
architectures do.
Signed-off-by: Nicolas Iooss <nicolas.iooss_linux@m4x.org>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/kernel')
| -rw-r--r-- | arch/um/kernel/physmem.c | 3 | ||||
| -rw-r--r-- | arch/um/kernel/skas/mmu.c | 3 | ||||
| -rw-r--r-- | arch/um/kernel/um_arch.c | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c index 9034fc8056b4..249c9feb5485 100644 --- a/arch/um/kernel/physmem.c +++ b/arch/um/kernel/physmem.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | #include <linux/mm.h> | 8 | #include <linux/mm.h> |
| 9 | #include <linux/pfn.h> | 9 | #include <linux/pfn.h> |
| 10 | #include <asm/page.h> | 10 | #include <asm/page.h> |
| 11 | #include <asm/sections.h> | ||
| 11 | #include <as-layout.h> | 12 | #include <as-layout.h> |
| 12 | #include <init.h> | 13 | #include <init.h> |
| 13 | #include <kern.h> | 14 | #include <kern.h> |
| @@ -55,8 +56,6 @@ void map_memory(unsigned long virt, unsigned long phys, unsigned long len, | |||
| 55 | } | 56 | } |
| 56 | } | 57 | } |
| 57 | 58 | ||
| 58 | extern int __syscall_stub_start; | ||
| 59 | |||
| 60 | /** | 59 | /** |
| 61 | * setup_physmem() - Setup physical memory for UML | 60 | * setup_physmem() - Setup physical memory for UML |
| 62 | * @start: Start address of the physical kernel memory, | 61 | * @start: Start address of the physical kernel memory, |
diff --git a/arch/um/kernel/skas/mmu.c b/arch/um/kernel/skas/mmu.c index 94abdcc1d6ad..2216eddc6893 100644 --- a/arch/um/kernel/skas/mmu.c +++ b/arch/um/kernel/skas/mmu.c | |||
| @@ -8,12 +8,11 @@ | |||
| 8 | #include <linux/slab.h> | 8 | #include <linux/slab.h> |
| 9 | #include <asm/pgalloc.h> | 9 | #include <asm/pgalloc.h> |
| 10 | #include <asm/pgtable.h> | 10 | #include <asm/pgtable.h> |
| 11 | #include <asm/sections.h> | ||
| 11 | #include <as-layout.h> | 12 | #include <as-layout.h> |
| 12 | #include <os.h> | 13 | #include <os.h> |
| 13 | #include <skas.h> | 14 | #include <skas.h> |
| 14 | 15 | ||
| 15 | extern int __syscall_stub_start; | ||
| 16 | |||
| 17 | static int init_stub_pte(struct mm_struct *mm, unsigned long proc, | 16 | static int init_stub_pte(struct mm_struct *mm, unsigned long proc, |
| 18 | unsigned long kernel) | 17 | unsigned long kernel) |
| 19 | { | 18 | { |
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c index 07f798f4bcee..ffa185d92d2d 100644 --- a/arch/um/kernel/um_arch.c +++ b/arch/um/kernel/um_arch.c | |||
| @@ -248,8 +248,6 @@ EXPORT_SYMBOL(end_iomem); | |||
| 248 | 248 | ||
| 249 | #define MIN_VMALLOC (32 * 1024 * 1024) | 249 | #define MIN_VMALLOC (32 * 1024 * 1024) |
| 250 | 250 | ||
| 251 | extern char __binary_start; | ||
| 252 | |||
| 253 | int __init linux_main(int argc, char **argv) | 251 | int __init linux_main(int argc, char **argv) |
| 254 | { | 252 | { |
| 255 | unsigned long avail, diff; | 253 | unsigned long avail, diff; |
