Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

i8253: Create linux/i8253.h and use it in all 8253 related files

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Link: http://lkml.kernel.org/r/20110601180610.054254048@duck.linux-mips.net
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

arch/arm/mach-footbridge/isa-timer.c | 2 +-
arch/mips/cobalt/time.c | 2 +-
arch/mips/jazz/irq.c | 2 +-
arch/mips/kernel/i8253.c | 2 +-
arch/mips/mti-malta/malta-time.c | 2 +-
arch/mips/sgi-ip22/ip22-time.c | 2 +-
arch/mips/sni/time.c | 2 +-
arch/x86/kernel/apic/apic.c | 2 +-
arch/x86/kernel/apm_32.c | 2 +-
arch/x86/kernel/hpet.c | 2 +-
arch/x86/kernel/i8253.c | 2 +-
arch/x86/kernel/time.c | 2 +-
drivers/block/hd.c | 2 +-
drivers/clocksource/i8253.c | 2 +-
drivers/input/gameport/gameport.c | 2 +-
drivers/input/joystick/analog.c | 2 +-
drivers/input/misc/pcspkr.c | 2 +-
include/linux/i8253.h | 11 +++++++++++
sound/drivers/pcsp/pcsp.h | 2 +-
19 files changed, 29 insertions(+), 18 deletions(-)

authored by

Ralf Baechle and committed by
Thomas Gleixner
334955ef 06e86849

+29 -18
+1 -1
arch/arm/mach-footbridge/isa-timer.c
··· 6 6 */ 7 7 #include <linux/clockchips.h> 8 8 #include <linux/clocksource.h> 9 + #include <linux/i8253.h> 9 10 #include <linux/init.h> 10 11 #include <linux/interrupt.h> 11 12 #include <linux/irq.h> ··· 15 14 #include <linux/timex.h> 16 15 17 16 #include <asm/irq.h> 18 - #include <asm/i8253.h> 19 17 #include <asm/mach/time.h> 20 18 21 19 #include "common.h"
+1 -1
arch/mips/cobalt/time.c
··· 17 17 * along with this program; if not, write to the Free Software 18 18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19 19 */ 20 + #include <linux/i8253.h> 20 21 #include <linux/init.h> 21 22 22 23 #include <asm/gt64120.h> 23 - #include <asm/i8253.h> 24 24 #include <asm/time.h> 25 25 26 26 #define GT641XX_BASE_CLOCK 50000000 /* 50MHz */
+1 -1
arch/mips/jazz/irq.c
··· 7 7 * Copyright (C) 1994 - 2001, 2003, 07 Ralf Baechle 8 8 */ 9 9 #include <linux/clockchips.h> 10 + #include <linux/i8253.h> 10 11 #include <linux/init.h> 11 12 #include <linux/interrupt.h> 12 13 #include <linux/kernel.h> ··· 16 15 #include <linux/irq.h> 17 16 18 17 #include <asm/irq_cpu.h> 19 - #include <asm/i8253.h> 20 18 #include <asm/i8259.h> 21 19 #include <asm/io.h> 22 20 #include <asm/jazz.h>
+1 -1
arch/mips/kernel/i8253.c
··· 3 3 * 4 4 */ 5 5 #include <linux/clockchips.h> 6 + #include <linux/i8253.h> 6 7 #include <linux/init.h> 7 8 #include <linux/interrupt.h> 8 9 #include <linux/jiffies.h> ··· 13 12 #include <linux/irq.h> 14 13 15 14 #include <asm/delay.h> 16 - #include <asm/i8253.h> 17 15 #include <asm/io.h> 18 16 #include <asm/time.h> 19 17
+1 -1
arch/mips/mti-malta/malta-time.c
··· 19 19 */ 20 20 21 21 #include <linux/types.h> 22 + #include <linux/i8253.h> 22 23 #include <linux/init.h> 23 24 #include <linux/kernel_stat.h> 24 25 #include <linux/sched.h> ··· 32 31 #include <asm/mipsregs.h> 33 32 #include <asm/mipsmtregs.h> 34 33 #include <asm/hardirq.h> 35 - #include <asm/i8253.h> 36 34 #include <asm/irq.h> 37 35 #include <asm/div64.h> 38 36 #include <asm/cpu.h>
+1 -1
arch/mips/sgi-ip22/ip22-time.c
··· 10 10 * Copyright (C) 2003, 06 Ralf Baechle (ralf@linux-mips.org) 11 11 */ 12 12 #include <linux/bcd.h> 13 + #include <linux/i8253.h> 13 14 #include <linux/init.h> 14 15 #include <linux/irq.h> 15 16 #include <linux/kernel.h> ··· 21 20 22 21 #include <asm/cpu.h> 23 22 #include <asm/mipsregs.h> 24 - #include <asm/i8253.h> 25 23 #include <asm/io.h> 26 24 #include <asm/irq.h> 27 25 #include <asm/time.h>
+1 -1
arch/mips/sni/time.c
··· 1 1 #include <linux/types.h> 2 + #include <linux/i8253.h> 2 3 #include <linux/interrupt.h> 3 4 #include <linux/irq.h> 4 5 #include <linux/smp.h> 5 6 #include <linux/time.h> 6 7 #include <linux/clockchips.h> 7 8 8 - #include <asm/i8253.h> 9 9 #include <asm/sni.h> 10 10 #include <asm/time.h> 11 11 #include <asm-generic/rtc.h>
+1 -1
arch/x86/kernel/apic/apic.c
··· 27 27 #include <linux/syscore_ops.h> 28 28 #include <linux/delay.h> 29 29 #include <linux/timex.h> 30 + #include <linux/i8253.h> 30 31 #include <linux/dmar.h> 31 32 #include <linux/init.h> 32 33 #include <linux/cpu.h> ··· 40 39 #include <asm/pgalloc.h> 41 40 #include <asm/atomic.h> 42 41 #include <asm/mpspec.h> 43 - #include <asm/i8253.h> 44 42 #include <asm/i8259.h> 45 43 #include <asm/proto.h> 46 44 #include <asm/apic.h>
+1 -1
arch/x86/kernel/apm_32.c
··· 229 229 #include <linux/jiffies.h> 230 230 #include <linux/acpi.h> 231 231 #include <linux/syscore_ops.h> 232 + #include <linux/i8253.h> 232 233 233 234 #include <asm/system.h> 234 235 #include <asm/uaccess.h> 235 236 #include <asm/desc.h> 236 - #include <asm/i8253.h> 237 237 #include <asm/olpc.h> 238 238 #include <asm/paravirt.h> 239 239 #include <asm/reboot.h>
+1 -1
arch/x86/kernel/hpet.c
··· 4 4 #include <linux/sysdev.h> 5 5 #include <linux/delay.h> 6 6 #include <linux/errno.h> 7 + #include <linux/i8253.h> 7 8 #include <linux/slab.h> 8 9 #include <linux/hpet.h> 9 10 #include <linux/init.h> ··· 13 12 #include <linux/io.h> 14 13 15 14 #include <asm/fixmap.h> 16 - #include <asm/i8253.h> 17 15 #include <asm/hpet.h> 18 16 19 17 #define HPET_MASK CLOCKSOURCE_MASK(32)
+1 -1
arch/x86/kernel/i8253.c
··· 9 9 #include <linux/module.h> 10 10 #include <linux/timex.h> 11 11 #include <linux/delay.h> 12 + #include <linux/i8253.h> 12 13 #include <linux/init.h> 13 14 #include <linux/io.h> 14 15 15 - #include <asm/i8253.h> 16 16 #include <asm/hpet.h> 17 17 #include <asm/smp.h> 18 18
+1 -1
arch/x86/kernel/time.c
··· 11 11 12 12 #include <linux/clockchips.h> 13 13 #include <linux/interrupt.h> 14 + #include <linux/i8253.h> 14 15 #include <linux/time.h> 15 16 #include <linux/mca.h> 16 17 17 18 #include <asm/vsyscall.h> 18 19 #include <asm/x86_init.h> 19 20 #include <asm/i8259.h> 20 - #include <asm/i8253.h> 21 21 #include <asm/timer.h> 22 22 #include <asm/hpet.h> 23 23 #include <asm/time.h>
+1 -1
drivers/block/hd.c
··· 155 155 156 156 #if (HD_DELAY > 0) 157 157 158 - #include <asm/i8253.h> 158 + #include <linux/i8253.h> 159 159 160 160 unsigned long last_req; 161 161
+1 -1
drivers/clocksource/i8253.c
··· 7 7 #include <linux/spinlock.h> 8 8 #include <linux/timex.h> 9 9 10 - #include <asm/i8253.h> 10 + #include <linux/i8253.h> 11 11 12 12 /* 13 13 * Since the PIT overflows every tick, its not very useful
+1 -1
drivers/input/gameport/gameport.c
··· 47 47 48 48 #if defined(__i386__) 49 49 50 - #include <asm/i8253.h> 50 + #include <linux/i8253.h> 51 51 52 52 #define DELTA(x,y) ((y)-(x)+((y)<(x)?1193182/HZ:0)) 53 53 #define GET_TIME(x) do { x = get_time_pit(); } while (0)
+1 -1
drivers/input/joystick/analog.c
··· 136 136 137 137 #ifdef __i386__ 138 138 139 - #include <asm/i8253.h> 139 + #include <linux/i8253.h> 140 140 141 141 #define GET_TIME(x) do { if (cpu_has_tsc) rdtscl(x); else x = get_time_pit(); } while (0) 142 142 #define DELTA(x,y) (cpu_has_tsc ? ((y) - (x)) : ((x) - (y) + ((x) < (y) ? CLOCK_TICK_RATE / HZ : 0)))
+1 -1
drivers/input/misc/pcspkr.c
··· 27 27 28 28 #if defined(CONFIG_MIPS) || defined(CONFIG_X86) 29 29 /* Use the global PIT lock ! */ 30 - #include <asm/i8253.h> 30 + #include <linux/i8253.h> 31 31 #else 32 32 #include <asm/8253pit.h> 33 33 static DEFINE_RAW_SPINLOCK(i8253_lock);
+11
include/linux/i8253.h
··· 1 + /* 2 + * This file is subject to the terms and conditions of the GNU General Public 3 + * License. See the file "COPYING" in the main directory of this archive 4 + * for more details. 5 + */ 6 + #ifndef __LINUX_I8253_H 7 + #define __LINUX_I8253_H 8 + 9 + #include <asm/i8253.h> 10 + 11 + #endif /* __LINUX_I8253_H */
+1 -1
sound/drivers/pcsp/pcsp.h
··· 13 13 #include <linux/timex.h> 14 14 #if defined(CONFIG_MIPS) || defined(CONFIG_X86) 15 15 /* Use the global PIT lock ! */ 16 - #include <asm/i8253.h> 16 + #include <linux/i8253.h> 17 17 #else 18 18 #include <asm/8253pit.h> 19 19 static DEFINE_RAW_SPINLOCK(i8253_lock);