diff options
| author | Marcin Slusarz <marcin.slusarz@gmail.com> | 2008-08-17 11:50:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-18 03:10:56 -0400 |
| commit | d19fbfdfe6a7034c8b6a7062365780485ab5aeaa (patch) | |
| tree | 9b803c51ce55812be8934750d570f91f08ad5420 | |
| parent | c6a92a2501b35880d2e357dbd7f2cbc9a06f1058 (diff) | |
x86: silence section mismatch warning - get_local_pda
Take out part of get_local_pda referencing __init function (free_bootmem)
to new (static) function marked as __ref. It's safe to do because free_bootmem
is called before __init sections are dropped.
WARNING: vmlinux.o(.cpuinit.text+0x3cd7): Section mismatch in reference from the function get_local_pda() to the function .init.text:free_bootmem()
The function __cpuinit get_local_pda() references
a function __init free_bootmem().
If free_bootmem is only used by get_local_pda then
annotate free_bootmem with a matching annotation.
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Mike Travis <travis@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/kernel/smpboot.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index a8fb8a980fae..e139e617f422 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
| @@ -756,6 +756,14 @@ static void __cpuinit do_fork_idle(struct work_struct *work) | |||
| 756 | } | 756 | } |
| 757 | 757 | ||
| 758 | #ifdef CONFIG_X86_64 | 758 | #ifdef CONFIG_X86_64 |
| 759 | |||
| 760 | /* __ref because it's safe to call free_bootmem when after_bootmem == 0. */ | ||
| 761 | static void __ref free_bootmem_pda(struct x8664_pda *oldpda) | ||
| 762 | { | ||
| 763 | if (!after_bootmem) | ||
| 764 | free_bootmem((unsigned long)oldpda, sizeof(*oldpda)); | ||
| 765 | } | ||
| 766 | |||
| 759 | /* | 767 | /* |
| 760 | * Allocate node local memory for the AP pda. | 768 | * Allocate node local memory for the AP pda. |
| 761 | * | 769 | * |
| @@ -784,8 +792,7 @@ int __cpuinit get_local_pda(int cpu) | |||
| 784 | 792 | ||
| 785 | if (oldpda) { | 793 | if (oldpda) { |
| 786 | memcpy(newpda, oldpda, size); | 794 | memcpy(newpda, oldpda, size); |
| 787 | if (!after_bootmem) | 795 | free_bootmem_pda(oldpda); |
| 788 | free_bootmem((unsigned long)oldpda, size); | ||
| 789 | } | 796 | } |
| 790 | 797 | ||
| 791 | newpda->in_bootmem = 0; | 798 | newpda->in_bootmem = 0; |
