forked from Minki/linux
x86: cpuinit-annotate SMP boot trampolines properly
Add missing annotations, and make use of include/linux/init.h's macros. Signed-off-by: Jan Beulich <jbeulich@novell.com> LKML-Reference: <4AA0E8F60200007800013703@vpn.id2.novell.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
414128bd33
commit
5f68563996
arch/x86/kernel
@ -4,7 +4,7 @@
|
||||
#include <asm/e820.h>
|
||||
|
||||
/* ready for x86_64 and x86 */
|
||||
unsigned char *trampoline_base = __va(TRAMPOLINE_BASE);
|
||||
unsigned char *__cpuinitdata trampoline_base = __va(TRAMPOLINE_BASE);
|
||||
|
||||
void __init reserve_trampoline_memory(void)
|
||||
{
|
||||
@ -26,7 +26,7 @@ void __init reserve_trampoline_memory(void)
|
||||
* bootstrap into the page concerned. The caller
|
||||
* has made sure it's suitably aligned.
|
||||
*/
|
||||
unsigned long setup_trampoline(void)
|
||||
unsigned long __cpuinit setup_trampoline(void)
|
||||
{
|
||||
memcpy(trampoline_base, trampoline_data, TRAMPOLINE_SIZE);
|
||||
return virt_to_phys(trampoline_base);
|
||||
|
@ -28,16 +28,12 @@
|
||||
*/
|
||||
|
||||
#include <linux/linkage.h>
|
||||
#include <linux/init.h>
|
||||
#include <asm/segment.h>
|
||||
#include <asm/page_types.h>
|
||||
|
||||
/* We can free up trampoline after bootup if cpu hotplug is not supported. */
|
||||
#ifndef CONFIG_HOTPLUG_CPU
|
||||
.section ".cpuinit.data","aw",@progbits
|
||||
#else
|
||||
.section .rodata,"a",@progbits
|
||||
#endif
|
||||
|
||||
__CPUINITRODATA
|
||||
.code16
|
||||
|
||||
ENTRY(trampoline_data)
|
||||
|
@ -25,14 +25,15 @@
|
||||
*/
|
||||
|
||||
#include <linux/linkage.h>
|
||||
#include <linux/init.h>
|
||||
#include <asm/pgtable_types.h>
|
||||
#include <asm/page_types.h>
|
||||
#include <asm/msr.h>
|
||||
#include <asm/segment.h>
|
||||
#include <asm/processor-flags.h>
|
||||
|
||||
.section .rodata, "a", @progbits
|
||||
|
||||
/* We can free up the trampoline after bootup if cpu hotplug is not supported. */
|
||||
__CPUINITRODATA
|
||||
.code16
|
||||
|
||||
ENTRY(trampoline_data)
|
||||
|
Loading…
Reference in New Issue
Block a user