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

Commit 306e440d authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[PATCH] x86: i8253/i8259A lock cleanup 



Introduce proper declarations for i8253_lock and i8259A_lock.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent bcbda35c

arch/i386/kernel/apic.c

+1 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <asm/desc.h>

#include <asm/arch_hooks.h>

#include <asm/hpet.h>

#include <asm/i8253.h>



#include <mach_apic.h>
@@ -879,7 +880,6 @@ void __init init_apic_mappings(void) 
 */

static unsigned int __devinit get_8254_timer_count(void)

{

	extern spinlock_t i8253_lock;

	unsigned long flags;



	unsigned int count;

arch/i386/kernel/apm.c

+2 −3
Original line number Diff line number Diff line
@@ -228,10 +228,10 @@ 
#include <asm/system.h>

#include <asm/uaccess.h>

#include <asm/desc.h>

#include <asm/i8253.h>



#include "io_ports.h"



extern spinlock_t i8253_lock;

extern unsigned long get_cmos_time(void);

extern void machine_real_restart(unsigned char *, int);
@@ -1169,7 +1169,6 @@ static void reinit_timer(void) 
{

#ifdef INIT_TIMER_AFTER_SUSPEND

	unsigned long flags;

	extern spinlock_t i8253_lock;



	spin_lock_irqsave(&i8253_lock, flags);

	/* set the clock to 100 Hz */

arch/i386/kernel/io_apic.c

+1 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <asm/smp.h>

#include <asm/desc.h>

#include <asm/timer.h>

#include <asm/i8259.h>



#include <mach_apic.h>
@@ -1566,7 +1567,6 @@ void print_all_local_APICs (void) 


void /*__init*/ print_PIC(void)

{

	extern spinlock_t i8259A_lock;

	unsigned int v;

	unsigned long flags;

arch/i386/kernel/time.c

+4 −1
Original line number Diff line number Diff line
@@ -68,7 +68,8 @@ 


#include "io_ports.h"



extern spinlock_t i8259A_lock;

#include <asm/i8259.h>



int pit_latch_buggy;              /* extern */



#include "do_timer.h"
@@ -85,6 +86,8 @@ extern unsigned long wall_jiffies; 
DEFINE_SPINLOCK(rtc_lock);

EXPORT_SYMBOL(rtc_lock);



#include <asm/i8253.h>



DEFINE_SPINLOCK(i8253_lock);

EXPORT_SYMBOL(i8253_lock);

arch/i386/kernel/timers/timer_cyclone.c

+2 −2
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ 
#include <asm/io.h>

#include <asm/pgtable.h>

#include <asm/fixmap.h>

#include "io_ports.h"

#include <asm/i8253.h>



extern spinlock_t i8253_lock;

#include "io_ports.h"



/* Number of usecs that the last interrupt was delayed */

static int delay_at_last_interrupt;