luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] x86: PARAVIRT: Jeremy Fitzhardinge <jeremy@goop.org>

Browse Source 
The other symbols used to delineate the alt-instructions sections have the
form __foo/__foo_end.  Rename parainstructions to match.

Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Jeremy Fitzhardinge 2007-05-02 19:27:16 +02:00 committed by Andi Kleen
parent e0bb864397
commit 441d40dca0
5 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/i386/kernel/alternative.c
View File

@ -399,6 +399,6 @@ void __init alternative_instructions(void)
alternatives_smp_switch(0);
}
#endif
apply_paravirt(__start_parainstructions, __stop_parainstructions);
apply_paravirt(__parainstructions, __parainstructions_end);
local_irq_restore(flags);
}

10
arch/i386/kernel/vmi.c
View File

@ -73,10 +73,6 @@ static struct {
void (*set_lazy_mode)(int mode);
} vmi_ops;
/* XXX move this to alternative.h */
extern struct paravirt_patch __start_parainstructions[],
__stop_parainstructions[];
/* Cached VMI operations */
struct vmi_timer_ops vmi_timer_ops;
@ -548,9 +544,9 @@ vmi_startup_ipi_hook(int phys_apicid, unsigned long start_eip,
}
#endif
static void vmi_set_lazy_mode(int mode)
static void vmi_set_lazy_mode(enum paravirt_lazy_mode mode)
{
static DEFINE_PER_CPU(int, lazy_mode);
static DEFINE_PER_CPU(enum paravirt_lazy_mode, lazy_mode);
if (!vmi_ops.set_lazy_mode)
return;
@ -912,7 +908,7 @@ static inline int __init activate_vmi(void)
* to do this before IRQs get reenabled. Fortunately, it is
* idempotent.
*/
apply_paravirt(__start_parainstructions, __stop_parainstructions);
apply_paravirt(__parainstructions, __parainstructions_end);
vmi_bringup();

4
arch/i386/kernel/vmlinux.lds.S
View File

@ -166,9 +166,9 @@ SECTIONS
}
. = ALIGN(4);
.parainstructions : AT(ADDR(.parainstructions) - LOAD_OFFSET) {
__start_parainstructions = .;
__parainstructions = .;
*(.parainstructions)
__stop_parainstructions = .;
__parainstructions_end = .;
}
/* .exit.text is discard at runtime, not link time, to deal with references
from .altinstructions and .eh_frame */

4
include/asm-i386/alternative.h
View File

@ -124,8 +124,8 @@ static inline void
apply_paravirt(struct paravirt_patch_site *start,
struct paravirt_patch_site *end)
{}
#define __start_parainstructions NULL
#define __stop_parainstructions NULL
#define __parainstructions NULL
#define __parainstructions_end NULL
#endif
#endif /* _I386_ALTERNATIVE_H */

4
include/asm-x86_64/alternative.h
View File

@ -142,8 +142,8 @@ void apply_paravirt(struct paravirt_patch *start, struct paravirt_patch *end);
static inline void
apply_paravirt(struct paravirt_patch *start, struct paravirt_patch *end)
{}
#define __start_parainstructions NULL
#define __stop_parainstructions NULL
#define __parainstructions NULL
#define __parainstructions_end NULL
#endif
#endif /* _X86_64_ALTERNATIVE_H */