openrisc: Use the declarations provided by <asm/sections.h>
Openrisc's private vmlinux.h duplicates a few definitions that are already provided by asm-generic/sections.h. The former is used by setup.c only, while the latter is already used everywhere else. Convert setup.c to use the generic version: - Include <asm/sections.h>, - Remove the (slightly different) extern declarations, - Remove the no longer needed address-of ('&') operators. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Jonas Bonn <jonas@southpole.se>
This commit is contained in:
parent
f38d45dd5a
commit
be5940c9fd
|
@ -40,6 +40,7 @@
|
||||||
#include <linux/device.h>
|
#include <linux/device.h>
|
||||||
#include <linux/of_platform.h>
|
#include <linux/of_platform.h>
|
||||||
|
|
||||||
|
#include <asm/sections.h>
|
||||||
#include <asm/segment.h>
|
#include <asm/segment.h>
|
||||||
#include <asm/pgtable.h>
|
#include <asm/pgtable.h>
|
||||||
#include <asm/types.h>
|
#include <asm/types.h>
|
||||||
|
@ -77,7 +78,7 @@ static unsigned long __init setup_memory(void)
|
||||||
|
|
||||||
ram_start_pfn = PFN_UP(memory_start);
|
ram_start_pfn = PFN_UP(memory_start);
|
||||||
/* free_ram_start_pfn is first page after kernel */
|
/* free_ram_start_pfn is first page after kernel */
|
||||||
free_ram_start_pfn = PFN_UP(__pa(&_end));
|
free_ram_start_pfn = PFN_UP(__pa(_end));
|
||||||
ram_end_pfn = PFN_DOWN(memblock_end_of_DRAM());
|
ram_end_pfn = PFN_DOWN(memblock_end_of_DRAM());
|
||||||
|
|
||||||
max_pfn = ram_end_pfn;
|
max_pfn = ram_end_pfn;
|
||||||
|
@ -290,10 +291,10 @@ void __init setup_arch(char **cmdline_p)
|
||||||
setup_cpuinfo();
|
setup_cpuinfo();
|
||||||
|
|
||||||
/* process 1's initial memory region is the kernel code/data */
|
/* process 1's initial memory region is the kernel code/data */
|
||||||
init_mm.start_code = (unsigned long)&_stext;
|
init_mm.start_code = (unsigned long)_stext;
|
||||||
init_mm.end_code = (unsigned long)&_etext;
|
init_mm.end_code = (unsigned long)_etext;
|
||||||
init_mm.end_data = (unsigned long)&_edata;
|
init_mm.end_data = (unsigned long)_edata;
|
||||||
init_mm.brk = (unsigned long)&_end;
|
init_mm.brk = (unsigned long)_end;
|
||||||
|
|
||||||
#ifdef CONFIG_BLK_DEV_INITRD
|
#ifdef CONFIG_BLK_DEV_INITRD
|
||||||
initrd_start = (unsigned long)&__initrd_start;
|
initrd_start = (unsigned long)&__initrd_start;
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
#ifndef __OPENRISC_VMLINUX_H_
|
#ifndef __OPENRISC_VMLINUX_H_
|
||||||
#define __OPENRISC_VMLINUX_H_
|
#define __OPENRISC_VMLINUX_H_
|
||||||
|
|
||||||
extern char _stext, _etext, _edata, _end;
|
|
||||||
#ifdef CONFIG_BLK_DEV_INITRD
|
#ifdef CONFIG_BLK_DEV_INITRD
|
||||||
extern char __initrd_start, __initrd_end;
|
extern char __initrd_start, __initrd_end;
|
||||||
extern char __initramfs_start;
|
extern char __initramfs_start;
|
||||||
|
|
Loading…
Reference in New Issue