diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-10-16 01:01:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 14:21:30 -0400 |
commit | 80a914dc05683ecfc98f9e1887fd6564846ffbec (patch) | |
tree | 2120b4007bc9488eebd98a4d40b00221d17ecb2b /arch | |
parent | d5c003b4d1690e666dbab02bc8e705947baa848c (diff) |
misc: replace __FUNCTION__ with __func__
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/m32r/kernel/process.c | 2 | ||||
-rw-r--r-- | arch/x86/kvm/x86.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/m32r/kernel/process.c b/arch/m32r/kernel/process.c index 5be4faaf5b1c..7103d91e1a2f 100644 --- a/arch/m32r/kernel/process.c +++ b/arch/m32r/kernel/process.c | |||
@@ -11,7 +11,7 @@ | |||
11 | #undef DEBUG_PROCESS | 11 | #undef DEBUG_PROCESS |
12 | #ifdef DEBUG_PROCESS | 12 | #ifdef DEBUG_PROCESS |
13 | #define DPRINTK(fmt, args...) printk("%s:%d:%s: " fmt, __FILE__, __LINE__, \ | 13 | #define DPRINTK(fmt, args...) printk("%s:%d:%s: " fmt, __FILE__, __LINE__, \ |
14 | __FUNCTION__, ##args) | 14 | __func__, ##args) |
15 | #else | 15 | #else |
16 | #define DPRINTK(fmt, args...) | 16 | #define DPRINTK(fmt, args...) |
17 | #endif | 17 | #endif |
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 0d682fc6aeb3..19afbb644c7f 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
@@ -564,7 +564,7 @@ static void kvm_set_time_scale(uint32_t tsc_khz, struct pvclock_vcpu_time_info * | |||
564 | hv_clock->tsc_to_system_mul = div_frac(nsecs, tps32); | 564 | hv_clock->tsc_to_system_mul = div_frac(nsecs, tps32); |
565 | 565 | ||
566 | pr_debug("%s: tsc_khz %u, tsc_shift %d, tsc_mul %u\n", | 566 | pr_debug("%s: tsc_khz %u, tsc_shift %d, tsc_mul %u\n", |
567 | __FUNCTION__, tsc_khz, hv_clock->tsc_shift, | 567 | __func__, tsc_khz, hv_clock->tsc_shift, |
568 | hv_clock->tsc_to_system_mul); | 568 | hv_clock->tsc_to_system_mul); |
569 | } | 569 | } |
570 | 570 | ||