From f5fae6790fd3199e45ead10f7004311abdf539e5 Mon Sep 17 00:00:00 2001
From: Max Filippov <jcmvbkbc@gmail.com>
Date: Mon, 14 Oct 2019 11:33:44 -0700
Subject: [PATCH] xtensa: merge .fixup with .text

Section .fixup contains pieces of code, merge it with the rest of the
.text section.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---
 arch/xtensa/kernel/vmlinux.lds.S | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/arch/xtensa/kernel/vmlinux.lds.S b/arch/xtensa/kernel/vmlinux.lds.S
index 01e3112cdb27..c64abc15d38f 100644
--- a/arch/xtensa/kernel/vmlinux.lds.S
+++ b/arch/xtensa/kernel/vmlinux.lds.S
@@ -117,7 +117,7 @@ SECTIONS
     SCHED_TEXT
     CPUIDLE_TEXT
     LOCK_TEXT
-
+    *(.fixup)
   }
   _etext = .;
   PROVIDE (etext = .);
@@ -126,10 +126,6 @@ SECTIONS
 
   RODATA
 
-  /*  Relocation table */
-
-  .fixup   : { *(.fixup) }
-
   EXCEPTION_TABLE(16)
   NOTES
   /* Data section */
-- 
2.20.1