From 9d3b3992db22bfa2ec89e077f1c75621c1776df2 Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Sat, 25 Mar 2006 16:30:28 +0100 Subject: [PATCH] --- yaml --- r: 23819 b: refs/heads/master c: eaeae0cc985fa1df753da7edc8d02635cbc1ba39 h: refs/heads/master i: 23817: c72059fc199127231e1ab3a507db95c62ea0c944 23815: 51bae8eb317dc7567c9aa7f8992c08011b520a57 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/head.S | 1 + trunk/arch/x86_64/kernel/vmlinux.lds.S | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c71c8a2241de..59a52406600e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f44a669805ab2c18b347436ec5333173b821268 +refs/heads/master: eaeae0cc985fa1df753da7edc8d02635cbc1ba39 diff --git a/trunk/arch/x86_64/kernel/head.S b/trunk/arch/x86_64/kernel/head.S index 0cddcc038422..6df05e6034fa 100644 --- a/trunk/arch/x86_64/kernel/head.S +++ b/trunk/arch/x86_64/kernel/head.S @@ -26,6 +26,7 @@ */ .text + .section .bootstrap.text .code32 .globl startup_32 /* %bx: 1 if coming from smp trampoline on secondary cpu */ diff --git a/trunk/arch/x86_64/kernel/vmlinux.lds.S b/trunk/arch/x86_64/kernel/vmlinux.lds.S index 74db0062d4a2..029be20accef 100644 --- a/trunk/arch/x86_64/kernel/vmlinux.lds.S +++ b/trunk/arch/x86_64/kernel/vmlinux.lds.S @@ -20,6 +20,7 @@ SECTIONS phys_startup_64 = startup_64 - LOAD_OFFSET; _text = .; /* Text and read-only data */ .text : AT(ADDR(.text) - LOAD_OFFSET) { + *(.bootstrap.text) *(.text) SCHED_TEXT LOCK_TEXT