leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CRIS changes for 4.5

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iEYEABECAAYFAlagoW4ACgkQ31LbvUHyf1d1hwCfejdx5Ql4odS6y2GklMthWK7b
 wdUAnjL45Z6Ky1PTMxaSG+7VWIXrBYIJ
 =rawY
 -----END PGP SIGNATURE-----

Merge tag 'cris-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris

Pull CRIS updates from Jesper Nilsson:
 "Just some fixups for section mismatches from Guenter"

* tag 'cris-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris:
  cris: Fix section mismatches in architecture startup code
  cris: debugport: Fix section mismatches
This commit is contained in:
Linus Torvalds 2016-01-21 11:33:36 -08:00
commit 96461fdb3a
4 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/cris/arch-v10/kernel/debugport.c
View File

@ -468,7 +468,7 @@ etrax_console_device(struct console* co, int *index)
#endif #endif
} }
static struct console sercons = { static struct console ser_console = {
name : "ttyS", name : "ttyS",
write: console_write, write: console_write,
read : NULL, read : NULL,
@ -480,7 +480,7 @@ static struct console sercons = {
cflag : 0, cflag : 0,
next : NULL next : NULL
}; };
static struct console sercons0 = { static struct console ser0_console = {
name : "ttyS", name : "ttyS",
write: console_write, write: console_write,
read : NULL, read : NULL,
@ -493,7 +493,7 @@ static struct console sercons0 = {
next : NULL next : NULL
}; };
static struct console sercons1 = { static struct console ser1_console = {
name : "ttyS", name : "ttyS",
write: console_write, write: console_write,
read : NULL, read : NULL,
@ -505,7 +505,7 @@ static struct console sercons1 = {
cflag : 0, cflag : 0,
next : NULL next : NULL
}; };
static struct console sercons2 = { static struct console ser2_console = {
name : "ttyS", name : "ttyS",
write: console_write, write: console_write,
read : NULL, read : NULL,
@ -517,7 +517,7 @@ static struct console sercons2 = {
cflag : 0, cflag : 0,
next : NULL next : NULL
}; };
static struct console sercons3 = { static struct console ser3_console = {
name : "ttyS", name : "ttyS",
write: console_write, write: console_write,
read : NULL, read : NULL,
@ -539,17 +539,17 @@ init_etrax_debug(void)
static int first = 1; static int first = 1;
if (!first) { if (!first) {
unregister_console(&sercons); unregister_console(&ser_console);
register_console(&sercons0); register_console(&ser0_console);
register_console(&sercons1); register_console(&ser1_console);
register_console(&sercons2); register_console(&ser2_console);
register_console(&sercons3); register_console(&ser3_console);
init_dummy_console(); init_dummy_console();
return 0; return 0;
} }
first = 0; first = 0;
register_console(&sercons); register_console(&ser_console);
start_port(port); start_port(port);
#ifdef CONFIG_ETRAX_KGDB #ifdef CONFIG_ETRAX_KGDB
start_port(kgdb_port); start_port(kgdb_port);

6
arch/cris/arch-v10/kernel/head.S
View File

@ -5,6 +5,8 @@
* *
*/ */
#include <linux/init.h>
#define ASSEMBLER_MACROS_ONLY #define ASSEMBLER_MACROS_ONLY
/* The IO_* macros use the ## token concatenation operator, so /* The IO_* macros use the ## token concatenation operator, so
-traditional must not be used when assembling this file. */ -traditional must not be used when assembling this file. */
@ -25,7 +27,7 @@
.globl romfs_in_flash .globl romfs_in_flash
.globl swapper_pg_dir .globl swapper_pg_dir
.text __HEAD
;; This is the entry point of the kernel. We are in supervisor mode. ;; This is the entry point of the kernel. We are in supervisor mode.
;; 0x00000000 if Flash, 0x40004000 if DRAM ;; 0x00000000 if Flash, 0x40004000 if DRAM
@ -159,7 +161,7 @@ _inflash0:
;; Put this in a suitable section where we can reclaim storage ;; Put this in a suitable section where we can reclaim storage
;; after init. ;; after init.
.section ".init.text", "ax" __INIT
_inflash: _inflash:
#ifdef CONFIG_ETRAX_ETHERNET #ifdef CONFIG_ETRAX_ETHERNET
;; Start MII clock to make sure it is running when tranceiver is reset ;; Start MII clock to make sure it is running when tranceiver is reset

6
arch/cris/arch-v32/kernel/head.S
View File

@ -4,6 +4,8 @@
* Copyright (C) 2003, Axis Communications AB * Copyright (C) 2003, Axis Communications AB
*/ */
#include <linux/init.h>
#define ASSEMBLER_MACROS_ONLY #define ASSEMBLER_MACROS_ONLY
/* /*
@ -36,7 +38,7 @@
.global nand_boot .global nand_boot
.global swapper_pg_dir .global swapper_pg_dir
.text __HEAD
tstart: tstart:
;; This is the entry point of the kernel. The CPU is currently in ;; This is the entry point of the kernel. The CPU is currently in
;; supervisor mode. ;; supervisor mode.
@ -177,7 +179,7 @@ _inflash0:
;; Put the following in a section so that storage for it can be ;; Put the following in a section so that storage for it can be
;; reclaimed after init is finished. ;; reclaimed after init is finished.
.section ".init.text", "ax" __INIT
_inflash: _inflash:

1
arch/cris/kernel/vmlinux.lds.S
View File

@ -40,6 +40,7 @@ SECTIONS
_stext = .; _stext = .;
__stext = .; __stext = .;
.text : { .text : {
HEAD_TEXT
TEXT_TEXT TEXT_TEXT
SCHED_TEXT SCHED_TEXT
LOCK_TEXT LOCK_TEXT