Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e83a5fdc authored by Hiroshi Shimamoto's avatar Hiroshi Shimamoto Committed by Ingo Molnar
Browse files

x86: clean up apic_32/64.c 



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

Signed-off-by: default avatarHiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent c4aba4a8

arch/x86/kernel/apic_32.c

+2 −3
Original line number Diff line number Diff line
@@ -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

 *   interrupt as well. Thus we cannot inline the local irq ... ]

 */



void smp_apic_timer_interrupt(struct pt_regs *regs)

{

	struct pt_regs *old_regs = set_irq_regs(regs);

arch/x86/kernel/apic_64.c

+17 −6
Original line number Diff line number Diff line
@@ -23,33 +23,37 @@ 
#include <linux/mc146818rtc.h>

#include <linux/kernel_stat.h>

#include <linux/sysdev.h>

#include <linux/module.h>

#include <linux/ioport.h>

#include <linux/clockchips.h>

#include <linux/acpi_pmtmr.h>

#include <linux/module.h>



#include <asm/atomic.h>

#include <asm/smp.h>

#include <asm/mtrr.h>

#include <asm/mpspec.h>

#include <asm/hpet.h>

#include <asm/pgalloc.h>

#include <asm/mach_apic.h>

#include <asm/nmi.h>

#include <asm/idle.h>

#include <asm/proto.h>

#include <asm/timex.h>

#include <asm/hpet.h>

#include <asm/apic.h>



int apic_verbosity;

int disable_apic_timer __cpuinitdata;

static int apic_calibrate_pmtmr __initdata;

int disable_apic;



/* Local APIC timer works in C2? */

/* Local APIC timer works in C2 */

int 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 = {

	.name = "Local APIC",

	.flags = IORESOURCE_MEM | IORESOURCE_BUSY,
@@ -355,6 +359,11 @@ static void __init calibrate_APIC_clock(void) 
	calibration_result = result / HZ;

}



/*

 * Setup the boot APIC

 *

 * Calibrate and verify the result.

 */

void __init setup_boot_APIC_clock(void)

{

	/*
@@ -1121,9 +1130,11 @@ static void __cpuinit apic_pm_activate(void) 
static int __init init_lapic_sysfs(void)

{

	int error;



	if (!cpu_has_apic)

		return 0;

	/* XXX: remove suspend/resume procs if !apic_pm_state.active? */



	error = sysdev_class_register(&lapic_sysclass);

	if (!error)

		error = sysdev_register(&device_lapic);