openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86: clean up apic_32/64.c 

White space and coding style clean up.
Make apic_32/64.c similar.

Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Hiroshi Shimamoto 2008-01-30 13:32:35 +01:00 committed by Ingo Molnar
parent c4aba4a8ec
commit e83a5fdca8
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/kernel/apic_32.c
View File

@ -577,7 +577,6 @@ static void local_apic_timer_interrupt(void)
* [ if a single-CPU system runs an SMP kernel then we call the local * [ if a single-CPU system runs an SMP kernel then we call the local
* interrupt as well. Thus we cannot inline the local irq ... ] * interrupt as well. Thus we cannot inline the local irq ... ]
*/ */
void smp_apic_timer_interrupt(struct pt_regs *regs) void smp_apic_timer_interrupt(struct pt_regs *regs)
{ {
struct pt_regs *old_regs = set_irq_regs(regs); struct pt_regs *old_regs = set_irq_regs(regs);
@ -1021,7 +1020,7 @@ void __cpuinit setup_local_APIC(void)
/* /*
* Detect and initialize APIC * Detect and initialize APIC
*/ */
static int __init detect_init_APIC (void) static int __init detect_init_APIC(void)
{ {
u32 h, l, features; u32 h, l, features;
@ -1165,7 +1164,7 @@ void __init init_apic_mappings(void)
* This initializes the IO-APIC and APIC hardware if this is * This initializes the IO-APIC and APIC hardware if this is
* a UP kernel. * a UP kernel.
*/ */
int __init APIC_init_uniprocessor (void) int __init APIC_init_uniprocessor(void)
{ {
if (enable_local_apic < 0) if (enable_local_apic < 0)
clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC); clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);

23
arch/x86/kernel/apic_64.c
View File

@ -23,33 +23,37 @@
#include <linux/mc146818rtc.h> #include <linux/mc146818rtc.h>
#include <linux/kernel_stat.h> #include <linux/kernel_stat.h>
#include <linux/sysdev.h> #include <linux/sysdev.h>
#include <linux/module.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/clockchips.h> #include <linux/clockchips.h>
#include <linux/acpi_pmtmr.h> #include <linux/acpi_pmtmr.h>
#include <linux/module.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/mtrr.h> #include <asm/mtrr.h>
#include <asm/mpspec.h> #include <asm/mpspec.h>
#include <asm/hpet.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <asm/mach_apic.h> #include <asm/mach_apic.h>
#include <asm/nmi.h> #include <asm/nmi.h>
#include <asm/idle.h> #include <asm/idle.h>
#include <asm/proto.h> #include <asm/proto.h>
#include <asm/timex.h> #include <asm/timex.h>
#include <asm/hpet.h>
#include <asm/apic.h> #include <asm/apic.h>
int apic_verbosity;
int disable_apic_timer __cpuinitdata; int disable_apic_timer __cpuinitdata;
static int apic_calibrate_pmtmr __initdata; static int apic_calibrate_pmtmr __initdata;
int disable_apic; int disable_apic;
/* Local APIC timer works in C2? */ /* Local APIC timer works in C2 */
int local_apic_timer_c2_ok; int local_apic_timer_c2_ok;
EXPORT_SYMBOL_GPL(local_apic_timer_c2_ok); EXPORT_SYMBOL_GPL(local_apic_timer_c2_ok);
/*
* Debug level, exported for io_apic.c
*/
int apic_verbosity;
static struct resource lapic_resource = { static struct resource lapic_resource = {
.name = "Local APIC", .name = "Local APIC",
.flags = IORESOURCE_MEM | IORESOURCE_BUSY, .flags = IORESOURCE_MEM | IORESOURCE_BUSY,
@ -355,6 +359,11 @@ static void __init calibrate_APIC_clock(void)
calibration_result = result / HZ; calibration_result = result / HZ;
} }
/*
* Setup the boot APIC
*
* Calibrate and verify the result.
*/
void __init setup_boot_APIC_clock(void) void __init setup_boot_APIC_clock(void)
{ {
/* /*
@ -1109,8 +1118,8 @@ static struct sysdev_class lapic_sysclass = {
}; };
static struct sys_device device_lapic = { static struct sys_device device_lapic = {
.id = 0, .id = 0,
.cls = &lapic_sysclass, .cls = &lapic_sysclass,
}; };
static void __cpuinit apic_pm_activate(void) static void __cpuinit apic_pm_activate(void)
@ -1121,9 +1130,11 @@ static void __cpuinit apic_pm_activate(void)
static int __init init_lapic_sysfs(void) static int __init init_lapic_sysfs(void)
{ {
int error; int error;
if (!cpu_has_apic) if (!cpu_has_apic)
return 0; return 0;
/* XXX: remove suspend/resume procs if !apic_pm_state.active? */ /* XXX: remove suspend/resume procs if !apic_pm_state.active? */
error = sysdev_class_register(&lapic_sysclass); error = sysdev_class_register(&lapic_sysclass);
if (!error) if (!error)
error = sysdev_register(&device_lapic); error = sysdev_register(&device_lapic);