From 44f6eb85bdd26cf05c920ac263c16be4ed576481 Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Tue, 15 Sep 2009 20:00:57 +0000 Subject: [PATCH] removed the 'smp' part from apic_smp_init_timer(), since it's used also without smp (I guess this was a leftover) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33148 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/kernel/arch/x86/arch_smp.c | 2 +- src/system/kernel/arch/x86/timers/apic.h | 2 +- src/system/kernel/arch/x86/timers/x86_apic.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/system/kernel/arch/x86/arch_smp.c b/src/system/kernel/arch/x86/arch_smp.c index 48e1d24ff8..67267fab09 100644 --- a/src/system/kernel/arch/x86/arch_smp.c +++ b/src/system/kernel/arch/x86/arch_smp.c @@ -101,7 +101,7 @@ setup_apic(kernel_args *args, int32 cpu) } #endif - apic_smp_init_timer(args, cpu); + apic_init_timer(args, cpu); /* setup error vector to 0xfe */ config = (apic_read(APIC_LVT_ERROR) & 0xffffff00) | 0xfe; diff --git a/src/system/kernel/arch/x86/timers/apic.h b/src/system/kernel/arch/x86/timers/apic.h index a9a2393379..b44832b557 100644 --- a/src/system/kernel/arch/x86/timers/apic.h +++ b/src/system/kernel/arch/x86/timers/apic.h @@ -7,6 +7,6 @@ #include -status_t apic_smp_init_timer(struct kernel_args *args, int32 cpu); +status_t apic_init_timer(struct kernel_args *args, int32 cpu); #endif /* _KERNEL_ARCH_x86_TIMERS_APIC_H */ diff --git a/src/system/kernel/arch/x86/timers/x86_apic.c b/src/system/kernel/arch/x86/timers/x86_apic.c index 1e991cb330..840cadaabb 100644 --- a/src/system/kernel/arch/x86/timers/x86_apic.c +++ b/src/system/kernel/arch/x86/timers/x86_apic.c @@ -145,7 +145,7 @@ apic_init(struct kernel_args *args) status_t -apic_smp_init_timer(struct kernel_args *args, int32 cpu) +apic_init_timer(struct kernel_args *args, int32 cpu) { uint32 config;