korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 21:38:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

CRIS v10: vmlinux.lds.S: ix kernel oops on boot and use common defines

Browse Source 
- Move alignment to page size of init data outside ifdef for BLK_DEV_INITRD.
  The reservation up to page size of memory after init data was previously
  not done if BLK_DEV_INITRD was undefined.
  This caused a kernel oops when init memory pages were freed after startup,
  data placed in the same page as the last init memory would also be freed
  and reused, with disastrous results.

- Use macros for initcalls and .text sections.

- Replace hardcoded page size constant with PAGE_SIZE define.

- Change include/asm-cris/page.h to use the _AC macro to instead
  of testing __ASSEMBLY__.

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Mikael Starvik <mikael.starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jesper Nilsson 2008-01-17 15:21:11 -08:00 committed by Linus Torvalds
parent efe7cf2dcf
commit b0e86f0a3b
2 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
arch/cris/arch-v10/vmlinux.lds.S
View File

@ -9,7 +9,8 @@
*/ */
#include <asm-generic/vmlinux.lds.h> #include <asm-generic/vmlinux.lds.h>
#include <asm/page.h>
jiffies = jiffies_64; jiffies = jiffies_64;
SECTIONS SECTIONS
{ {
@ -23,7 +24,7 @@ SECTIONS
_stext = .; _stext = .;
__stext = .; __stext = .;
.text : { .text : {
*(.text) TEXT_TEXT
SCHED_TEXT SCHED_TEXT
LOCK_TEXT LOCK_TEXT
*(.fixup) *(.fixup)
@ -49,10 +50,10 @@ SECTIONS
__edata = . ; /* End of data section */ __edata = . ; /* End of data section */
_edata = . ; _edata = . ;
. = ALIGN(8192); /* init_task and stack, must be aligned */ . = ALIGN(PAGE_SIZE); /* init_task and stack, must be aligned */
.data.init_task : { *(.data.init_task) } .data.init_task : { *(.data.init_task) }
. = ALIGN(8192); /* Init code and data */ . = ALIGN(PAGE_SIZE); /* Init code and data */
__init_begin = .; __init_begin = .;
.init.text : { .init.text : {
_sinittext = .; _sinittext = .;
@ -66,13 +67,7 @@ SECTIONS
__setup_end = .; __setup_end = .;
.initcall.init : { .initcall.init : {
__initcall_start = .; __initcall_start = .;
*(.initcall1.init); INITCALLS
*(.initcall2.init);
*(.initcall3.init);
*(.initcall4.init);
*(.initcall5.init);
*(.initcall6.init);
*(.initcall7.init);
__initcall_end = .; __initcall_end = .;
} }
@ -88,16 +83,18 @@ SECTIONS
__initramfs_start = .; __initramfs_start = .;
*(.init.ramfs) *(.init.ramfs)
__initramfs_end = .; __initramfs_end = .;
/* We fill to the next page, so we can discard all init
pages without needing to consider what payload might be
appended to the kernel image. */
FILL (0);
. = ALIGN (8192);
} }
#endif #endif
__vmlinux_end = .; /* last address of the physical file */ __vmlinux_end = .; /* last address of the physical file */
__init_end = .;
/*
* We fill to the next page, so we can discard all init
* pages without needing to consider what payload might be
* appended to the kernel image.
*/
. = ALIGN(PAGE_SIZE);
__init_end = .;
__data_end = . ; /* Move to _edata ? */ __data_end = . ; /* Move to _edata ? */
__bss_start = .; /* BSS */ __bss_start = .; /* BSS */

7
include/asm-cris/page.h
View File

@ -4,14 +4,11 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm/arch/page.h> #include <asm/arch/page.h>
#include <linux/const.h>
/* PAGE_SHIFT determines the page size */ /* PAGE_SHIFT determines the page size */
#define PAGE_SHIFT 13 #define PAGE_SHIFT 13
#ifndef __ASSEMBLY__ #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
#define PAGE_SIZE (1UL << PAGE_SHIFT)
#else
#define PAGE_SIZE (1 << PAGE_SHIFT)
#endif
#define PAGE_MASK (~(PAGE_SIZE-1)) #define PAGE_MASK (~(PAGE_SIZE-1))
#define clear_page(page) memset((void *)(page), 0, PAGE_SIZE) #define clear_page(page) memset((void *)(page), 0, PAGE_SIZE)