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

Commit e423e33e authored by Jaswinder Singh Rajput's avatar Jaswinder Singh Rajput Committed by Ingo Molnar
Browse files

x86: apic.c fix style problems 



Impact: cleanup

Fix:

 WARNING: Use #include <linux/smp.h> instead of <asm/smp.h>
 WARNING: Use #include <linux/nmi.h> instead of <asm/nmi.h>
 WARNING: Use #include <linux/timex.h> instead of <asm/timex.h>
 WARNING: line over 80 characters
 ERROR: else should follow close brace '}'

 total: 2 errors, 4 warnings

Signed-off-by: default avatarJaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b0e239ff

arch/x86/kernel/apic.c

+6 −8
Original line number Diff line number Diff line
@@ -31,9 +31,11 @@ 
#include <linux/dmi.h>

#include <linux/dmar.h>

#include <linux/ftrace.h>

#include <linux/smp.h>

#include <linux/nmi.h>

#include <linux/timex.h>



#include <asm/atomic.h>

#include <asm/smp.h>

#include <asm/mtrr.h>

#include <asm/mpspec.h>

#include <asm/desc.h>
@@ -41,10 +43,8 @@ 
#include <asm/hpet.h>

#include <asm/pgalloc.h>

#include <asm/i8253.h>

#include <asm/nmi.h>

#include <asm/idle.h>

#include <asm/proto.h>

#include <asm/timex.h>

#include <asm/apic.h>

#include <asm/i8259.h>
@@ -687,7 +687,7 @@ static int __init calibrate_APIC_clock(void) 
		local_irq_enable();



	if (levt->features & CLOCK_EVT_FEAT_DUMMY) {

		pr_warning("APIC timer disabled due to verification failure.\n");

		pr_warning("APIC timer disabled due to verification failure\n");

			return -1;

	}
@@ -2087,14 +2087,12 @@ __cpuinit int apic_is_clustered_box(void) 
		/* are we being called early in kernel startup? */

		if (bios_cpu_apicid) {

			id = bios_cpu_apicid[i];

		}

		else if (i < nr_cpu_ids) {

		} else if (i < nr_cpu_ids) {

			if (cpu_present(i))

				id = per_cpu(x86_bios_cpu_apicid, i);

			else

				continue;

		}

		else

		} else

			break;



		if (id != BAD_APICID)