diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-03 14:37:23 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:40:57 -0400 |
commit | 77bf90ed66116a1fc0e2f0554ecac75a54290cc0 (patch) | |
tree | 7b71df7149473be877dfa4488e7e5e154c2cd508 /arch/x86/kernel/alternative.c | |
parent | 282bfe21cf0e2af9eac052c89bcc0a5ace80352f (diff) |
x86: replace remaining __FUNCTION__ occurances
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/alternative.c')
-rw-r--r-- | arch/x86/kernel/alternative.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 5fed98ca0e1f..e2d30b8e08a2 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c | |||
@@ -205,7 +205,7 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end) | |||
205 | struct alt_instr *a; | 205 | struct alt_instr *a; |
206 | char insnbuf[MAX_PATCH_LEN]; | 206 | char insnbuf[MAX_PATCH_LEN]; |
207 | 207 | ||
208 | DPRINTK("%s: alt table %p -> %p\n", __FUNCTION__, start, end); | 208 | DPRINTK("%s: alt table %p -> %p\n", __func__, start, end); |
209 | for (a = start; a < end; a++) { | 209 | for (a = start; a < end; a++) { |
210 | u8 *instr = a->instr; | 210 | u8 *instr = a->instr; |
211 | BUG_ON(a->replacementlen > a->instrlen); | 211 | BUG_ON(a->replacementlen > a->instrlen); |
@@ -217,7 +217,7 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end) | |||
217 | if (instr >= (u8 *)VSYSCALL_START && instr < (u8*)VSYSCALL_END) { | 217 | if (instr >= (u8 *)VSYSCALL_START && instr < (u8*)VSYSCALL_END) { |
218 | instr = __va(instr - (u8*)VSYSCALL_START + (u8*)__pa_symbol(&__vsyscall_0)); | 218 | instr = __va(instr - (u8*)VSYSCALL_START + (u8*)__pa_symbol(&__vsyscall_0)); |
219 | DPRINTK("%s: vsyscall fixup: %p => %p\n", | 219 | DPRINTK("%s: vsyscall fixup: %p => %p\n", |
220 | __FUNCTION__, a->instr, instr); | 220 | __func__, a->instr, instr); |
221 | } | 221 | } |
222 | #endif | 222 | #endif |
223 | memcpy(insnbuf, a->replacement, a->replacementlen); | 223 | memcpy(insnbuf, a->replacement, a->replacementlen); |
@@ -307,7 +307,7 @@ void alternatives_smp_module_add(struct module *mod, char *name, | |||
307 | smp->text = text; | 307 | smp->text = text; |
308 | smp->text_end = text_end; | 308 | smp->text_end = text_end; |
309 | DPRINTK("%s: locks %p -> %p, text %p -> %p, name %s\n", | 309 | DPRINTK("%s: locks %p -> %p, text %p -> %p, name %s\n", |
310 | __FUNCTION__, smp->locks, smp->locks_end, | 310 | __func__, smp->locks, smp->locks_end, |
311 | smp->text, smp->text_end, smp->name); | 311 | smp->text, smp->text_end, smp->name); |
312 | 312 | ||
313 | spin_lock_irqsave(&smp_alt, flags); | 313 | spin_lock_irqsave(&smp_alt, flags); |
@@ -332,7 +332,7 @@ void alternatives_smp_module_del(struct module *mod) | |||
332 | continue; | 332 | continue; |
333 | list_del(&item->next); | 333 | list_del(&item->next); |
334 | spin_unlock_irqrestore(&smp_alt, flags); | 334 | spin_unlock_irqrestore(&smp_alt, flags); |
335 | DPRINTK("%s: %s\n", __FUNCTION__, item->name); | 335 | DPRINTK("%s: %s\n", __func__, item->name); |
336 | kfree(item); | 336 | kfree(item); |
337 | return; | 337 | return; |
338 | } | 338 | } |