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

Commit a99a7d14 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-cleanup-for-linus' of... 

Merge branch 'timers-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  mips: Fix i8253 clockevent fallout
  i8253: Cleanup outb/inb magic
  arm: Footbridge: Use common i8253 clockevent
  mips: Use common i8253 clockevent
  x86: Use common i8253 clockevent
  i8253: Create common clockevent implementation
  i8253: Export i8253_lock unconditionally
  pcpskr: MIPS: Make config dependencies finer grained
  pcspkr: Cleanup Kconfig dependencies
  i8253: Move remaining content and delete asm/i8253.h
  i8253: Consolidate definitions of PIT_LATCH
  x86: i8253: Consolidate definitions of global_clock_event
  i8253: Alpha, PowerPC: Remove unused asm/8253pit.h
  alpha: i8253: Cleanup remaining users of i8253pit.h
  i8253: Remove I8253_LOCK config
  i8253: Make pcsp sound driver use the shared i8253_lock
  i8253: Make pcspkr input driver use the shared i8253_lock
  i8253: Consolidate all kernel definitions of i8253_lock
  i8253: Unify all kernel declarations of i8253_lock
  i8253: Create linux/i8253.h and use it in all 8253 related files
parents bdc7ccfc ded7c1ee

arch/alpha/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ config ALPHA 
	select HAVE_OPROFILE

	select HAVE_SYSCALL_WRAPPERS

	select HAVE_IRQ_WORK

	select HAVE_PCSPKR_PLATFORM

	select HAVE_PERF_EVENTS

	select HAVE_DMA_ATTRS

	select HAVE_GENERIC_HARDIRQS

arch/alpha/include/asm/8253pit.h

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
/*

 * 8253/8254 Programmable Interval Timer

 */

arch/alpha/kernel/sys_ruffian.c

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

#include <asm/core_cia.h>

#include <asm/tlbflush.h>

#include <asm/8253pit.h>



#include "proto.h"

#include "irq_impl.h"

arch/alpha/kernel/time.c

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

#include <asm/io.h>

#include <asm/hwrpb.h>

#include <asm/8253pit.h>

#include <asm/rtc.h>



#include <linux/mc146818rtc.h>

arch/arm/include/asm/i8253.h

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
#ifndef __ASMARM_I8253_H

#define __ASMARM_I8253_H



/* i8253A PIT registers */

#define PIT_MODE	0x43

#define PIT_CH0		0x40



#define PIT_LATCH	((PIT_TICK_RATE + HZ / 2) / HZ)



extern raw_spinlock_t i8253_lock;



#define outb_pit	outb_p

#define inb_pit		inb_p



#endif