2009-09-05 10:33:04

by Jaswinder Singh Rajput

Subject: [PATCH] x86: fix section mismatch kernel/time.c

Commit dd0a70c8 move tsc_init to late_time_init which leads to :

WARNING: arch/x86/built-in.o(.text+0x397f): Section mismatch in reference from the function x86_late_time_init() to the function .init.text:tsc_init()
The function x86_late_time_init() references
the function __init tsc_init().
This is often because x86_late_time_init lacks a __init

So adding __init to x86_late_time_init() fixes this mismatch.

Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
arch/x86/kernel/time.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
index fcece00..8c6d692 100644
--- a/arch/x86/kernel/time.c
+++ b/arch/x86/kernel/time.c
@@ -105,7 +105,7 @@ void __init hpet_time_init(void)
setup_default_timer_irq();
}

-static void x86_late_time_init(void)
+static void __init x86_late_time_init(void)
{
x86_init.timers.timer_init();
tsc_init();
--
1.6.0.6

2009-09-19 04:43:49

by Jaswinder Singh Rajput

Subject: Re: [PATCH] x86: fix section mismatch kernel/time.c

[RESENDING]

On Sat, 2009-09-05 at 15:59 +0530, Jaswinder Singh Rajput wrote:
> Commit dd0a70c8 move tsc_init to late_time_init which leads to :
>
> WARNING: arch/x86/built-in.o(.text+0x397f): Section mismatch in reference from the function x86_late_time_init() to the function .init.text:tsc_init()
> The function x86_late_time_init() references
> the function __init tsc_init().
> This is often because x86_late_time_init lacks a __init
>
> So adding __init to x86_late_time_init() fixes this mismatch.
>
> Signed-off-by: Jaswinder Singh Rajput <[email protected]>
> ---
> arch/x86/kernel/time.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
> index fcece00..8c6d692 100644
> --- a/arch/x86/kernel/time.c
> +++ b/arch/x86/kernel/time.c
> @@ -105,7 +105,7 @@ void __init hpet_time_init(void)
> setup_default_timer_irq();
> }
>
> -static void x86_late_time_init(void)
> +static void __init x86_late_time_init(void)
> {
> x86_init.timers.timer_init();
> tsc_init();