summaryrefslogtreecommitdiffstats
path: root/arch/cris/arch-v32
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-01-21 11:33:36 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-21 11:33:36 -0800
commit96461fdb3ace6753d29eaa43387bcd6d540710e9 (patch)
tree939be083f993627d1e301c3cc78955d4768c11a9 /arch/cris/arch-v32
parent278e5acae1321978686e85ca92906054a36aa19b (diff)
parentf9f3f864b5e8c09d7837d8980edba4ad52969819 (diff)
downloadop-kernel-dev-96461fdb3ace6753d29eaa43387bcd6d540710e9.zip
op-kernel-dev-96461fdb3ace6753d29eaa43387bcd6d540710e9.tar.gz
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
Diffstat (limited to 'arch/cris/arch-v32')
-rw-r--r--arch/cris/arch-v32/kernel/head.S6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/cris/arch-v32/kernel/head.S b/arch/cris/arch-v32/kernel/head.S
index ea63668..5ce83eb 100644
--- a/arch/cris/arch-v32/kernel/head.S
+++ b/arch/cris/arch-v32/kernel/head.S
@@ -4,6 +4,8 @@
* Copyright (C) 2003, Axis Communications AB
*/
+#include <linux/init.h>
+
#define ASSEMBLER_MACROS_ONLY
/*
@@ -36,7 +38,7 @@
.global nand_boot
.global swapper_pg_dir
- .text
+ __HEAD
tstart:
;; This is the entry point of the kernel. The CPU is currently in
;; supervisor mode.
@@ -177,7 +179,7 @@ _inflash0:
;; Put the following in a section so that storage for it can be
;; reclaimed after init is finished.
- .section ".init.text", "ax"
+ __INIT
_inflash:
OpenPOWER on IntegriCloud