diff options
author | Glauber de Oliveira Costa <gcosta@redhat.com> | 2008-01-30 07:32:10 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:32:10 -0500 |
commit | 2f485ef568372af4680c4e2f8490efb9f2523b05 (patch) | |
tree | d1a244d31333524d2636affe4a862b8058ae4f92 /arch/x86/kernel/paravirt.c | |
parent | 21438f7c138f0b893a32df3cc77434e39a2145f8 (diff) |
x86: move patching code to arch-specific file.
The core patching code for paravirt is sufficiently different
among i386 and x86_64, and we move them to specific files.
Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/paravirt.c')
-rw-r--r-- | arch/x86/kernel/paravirt.c | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index e7c17cc4a99e..864be0498a32 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c | |||
@@ -58,59 +58,9 @@ char *memory_setup(void) | |||
58 | extern const char start_##ops##_##name[], end_##ops##_##name[]; \ | 58 | extern const char start_##ops##_##name[], end_##ops##_##name[]; \ |
59 | asm("start_" #ops "_" #name ": " code "; end_" #ops "_" #name ":") | 59 | asm("start_" #ops "_" #name ": " code "; end_" #ops "_" #name ":") |
60 | 60 | ||
61 | DEF_NATIVE(pv_irq_ops, irq_disable, "cli"); | ||
62 | DEF_NATIVE(pv_irq_ops, irq_enable, "sti"); | ||
63 | DEF_NATIVE(pv_irq_ops, restore_fl, "push %eax; popf"); | ||
64 | DEF_NATIVE(pv_irq_ops, save_fl, "pushf; pop %eax"); | ||
65 | DEF_NATIVE(pv_cpu_ops, iret, "iret"); | ||
66 | DEF_NATIVE(pv_cpu_ops, irq_enable_syscall_ret, "sti; sysexit"); | ||
67 | DEF_NATIVE(pv_mmu_ops, read_cr2, "mov %cr2, %eax"); | ||
68 | DEF_NATIVE(pv_mmu_ops, write_cr3, "mov %eax, %cr3"); | ||
69 | DEF_NATIVE(pv_mmu_ops, read_cr3, "mov %cr3, %eax"); | ||
70 | DEF_NATIVE(pv_cpu_ops, clts, "clts"); | ||
71 | DEF_NATIVE(pv_cpu_ops, read_tsc, "rdtsc"); | ||
72 | |||
73 | /* Undefined instruction for dealing with missing ops pointers. */ | 61 | /* Undefined instruction for dealing with missing ops pointers. */ |
74 | static const unsigned char ud2a[] = { 0x0f, 0x0b }; | 62 | static const unsigned char ud2a[] = { 0x0f, 0x0b }; |
75 | 63 | ||
76 | static unsigned native_patch(u8 type, u16 clobbers, void *ibuf, | ||
77 | unsigned long addr, unsigned len) | ||
78 | { | ||
79 | const unsigned char *start, *end; | ||
80 | unsigned ret; | ||
81 | |||
82 | switch(type) { | ||
83 | #define SITE(ops, x) \ | ||
84 | case PARAVIRT_PATCH(ops.x): \ | ||
85 | start = start_##ops##_##x; \ | ||
86 | end = end_##ops##_##x; \ | ||
87 | goto patch_site | ||
88 | |||
89 | SITE(pv_irq_ops, irq_disable); | ||
90 | SITE(pv_irq_ops, irq_enable); | ||
91 | SITE(pv_irq_ops, restore_fl); | ||
92 | SITE(pv_irq_ops, save_fl); | ||
93 | SITE(pv_cpu_ops, iret); | ||
94 | SITE(pv_cpu_ops, irq_enable_syscall_ret); | ||
95 | SITE(pv_mmu_ops, read_cr2); | ||
96 | SITE(pv_mmu_ops, read_cr3); | ||
97 | SITE(pv_mmu_ops, write_cr3); | ||
98 | SITE(pv_cpu_ops, clts); | ||
99 | SITE(pv_cpu_ops, read_tsc); | ||
100 | #undef SITE | ||
101 | |||
102 | patch_site: | ||
103 | ret = paravirt_patch_insns(ibuf, len, start, end); | ||
104 | break; | ||
105 | |||
106 | default: | ||
107 | ret = paravirt_patch_default(type, clobbers, ibuf, addr, len); | ||
108 | break; | ||
109 | } | ||
110 | |||
111 | return ret; | ||
112 | } | ||
113 | |||
114 | unsigned paravirt_patch_nop(void) | 64 | unsigned paravirt_patch_nop(void) |
115 | { | 65 | { |
116 | return 0; | 66 | return 0; |