From: ralf@linux-mips.org
To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, "Venkatesh Pallipadi (Venki)" <venki@google.com>
Subject: [patch 10/14] i8253: x86: Consolidate definitions of global_clock_event
Date: Wed, 01 Jun 2011 19:05:06 +0100 [thread overview]
Message-ID: <20110601180610.762763451@duck.linux-mips.net> (raw)
In-Reply-To: 20110601180456.801265664@duck.linux-mips.net
[-- Attachment #1: i8253-cleanup-x86-global_clock_event.patch --]
[-- Type: text/plain, Size: 3677 bytes --]
There are multiple declarations of global_clock_event in header files
specific to particular clock event implementatiosn. Consolidate them
in <asm/time.h> and make sure all users include that header.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
To: linux-kernel@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: "Venkatesh Pallipadi (Venki)" <venki@google.com>
arch/x86/include/asm/apb_timer.h | 1 -
arch/x86/include/asm/i8253.h | 2 --
arch/x86/include/asm/time.h | 6 ++++--
arch/x86/kernel/apb_timer.c | 1 +
arch/x86/kernel/apic/apic.c | 1 +
arch/x86/kernel/hpet.c | 1 +
arch/x86/kernel/i8253.c | 1 +
7 files changed, 8 insertions(+), 5 deletions(-)
Index: linux-mips/arch/x86/include/asm/apb_timer.h
===================================================================
--- linux-mips.orig/arch/x86/include/asm/apb_timer.h
+++ linux-mips/arch/x86/include/asm/apb_timer.h
@@ -50,7 +50,6 @@
#define APBT_DEV_USED 1
extern void apbt_time_init(void);
-extern struct clock_event_device *global_clock_event;
extern unsigned long apbt_quick_calibrate(void);
extern int arch_setup_apbt_irqs(int irq, int trigger, int mask, int cpu);
extern void apbt_setup_secondary_clock(void);
Index: linux-mips/arch/x86/include/asm/i8253.h
===================================================================
--- linux-mips.orig/arch/x86/include/asm/i8253.h
+++ linux-mips/arch/x86/include/asm/i8253.h
@@ -3,8 +3,6 @@
#define PIT_LATCH LATCH
-extern struct clock_event_device *global_clock_event;
-
extern void setup_pit_timer(void);
#endif /* _ASM_X86_I8253_H */
Index: linux-mips/arch/x86/include/asm/time.h
===================================================================
--- linux-mips.orig/arch/x86/include/asm/time.h
+++ linux-mips/arch/x86/include/asm/time.h
@@ -1,10 +1,12 @@
#ifndef _ASM_X86_TIME_H
#define _ASM_X86_TIME_H
-extern void hpet_time_init(void);
-
+#include <linux/clocksource.h>
#include <asm/mc146818rtc.h>
+extern void hpet_time_init(void);
extern void time_init(void);
+extern struct clock_event_device *global_clock_event;
+
#endif /* _ASM_X86_TIME_H */
Index: linux-mips/arch/x86/kernel/apb_timer.c
===================================================================
--- linux-mips.orig/arch/x86/kernel/apb_timer.c
+++ linux-mips/arch/x86/kernel/apb_timer.c
@@ -44,6 +44,7 @@
#include <asm/fixmap.h>
#include <asm/apb_timer.h>
#include <asm/mrst.h>
+#include <asm/time.h>
#define APBT_MASK CLOCKSOURCE_MASK(32)
#define APBT_SHIFT 22
Index: linux-mips/arch/x86/kernel/apic/apic.c
===================================================================
--- linux-mips.orig/arch/x86/kernel/apic/apic.c
+++ linux-mips/arch/x86/kernel/apic/apic.c
@@ -48,6 +48,7 @@
#include <asm/hpet.h>
#include <asm/idle.h>
#include <asm/mtrr.h>
+#include <asm/time.h>
#include <asm/smp.h>
#include <asm/mce.h>
#include <asm/tsc.h>
Index: linux-mips/arch/x86/kernel/hpet.c
===================================================================
--- linux-mips.orig/arch/x86/kernel/hpet.c
+++ linux-mips/arch/x86/kernel/hpet.c
@@ -14,6 +14,7 @@
#include <asm/fixmap.h>
#include <asm/hpet.h>
+#include <asm/time.h>
#define HPET_MASK CLOCKSOURCE_MASK(32)
Index: linux-mips/arch/x86/kernel/i8253.c
===================================================================
--- linux-mips.orig/arch/x86/kernel/i8253.c
+++ linux-mips/arch/x86/kernel/i8253.c
@@ -14,6 +14,7 @@
#include <linux/io.h>
#include <asm/hpet.h>
+#include <asm/time.h>
#include <asm/smp.h>
/*
next prev parent reply other threads:[~2011-06-01 19:49 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-01 18:04 [patch 00/14] Sort out i8253 and PC speaker locking and headers ralf
2011-06-01 18:04 ` [patch 01/14] i8253: Create <linux/i8253.h> and make all in kernel users to use it ralf
2011-06-09 11:16 ` [tip:timers/cleanup] i8253: Create linux/i8253.h and use it in all 8253 related files tip-bot for Ralf Baechle
2011-06-09 13:04 ` tip-bot for Ralf Baechle
2011-06-01 18:04 ` [patch 02/14] i8253: Unify all kernel declarations of i8253_lock in <linux/i8253.h> ralf
2011-06-01 18:04 ` ralf at linux-mips.org
2011-06-09 11:16 ` [tip:timers/cleanup] i8253: Unify all kernel declarations of i8253_lock tip-bot for Ralf Baechle
2011-06-09 13:04 ` tip-bot for Ralf Baechle
2011-06-01 18:04 ` [patch 03/14] i8253: Consolidate all kernel definitions of i8253_lock in lib/i8253-lock.c ralf
2011-06-09 11:17 ` [tip:timers/cleanup] i8253: Consolidate all kernel definitions of i8253_lock tip-bot for Ralf Baechle
2011-06-09 13:04 ` tip-bot for Ralf Baechle
2011-06-01 18:05 ` [patch 04/14] i8253: Make MIPS use the shared i8253_lock ralf
2011-06-01 18:05 ` [patch 05/14] i8253: Make x86 " ralf
2011-06-01 18:05 ` [patch 06/14] i8253: Make pcspkr input driver " ralf
2011-06-09 11:17 ` [tip:timers/cleanup] " tip-bot for Ralf Baechle
2011-06-09 13:05 ` tip-bot for Ralf Baechle
2011-06-01 18:05 ` [patch 07/14] i8253: Make pcsp sound " ralf
2011-06-01 18:05 ` ralf
2011-06-03 9:53 ` [alsa-devel] " Takashi Iwai
2011-06-03 9:53 ` Takashi Iwai
2011-06-09 11:18 ` [tip:timers/cleanup] " tip-bot for Ralf Baechle
2011-06-09 13:05 ` tip-bot for Ralf Baechle
2011-06-01 18:05 ` [patch 08/14] i8253: Alpha: Cleanup remaining users of i8253pit.h ralf
2011-06-09 11:19 ` [tip:timers/cleanup] alpha: i8253: " tip-bot for Ralf Baechle
2011-06-09 13:06 ` tip-bot for Ralf Baechle
2011-06-01 18:05 ` [patch 09/14] i8253: Alpha, PowerPC: Remove unused <asm/8253pit.h> header ralf
2011-06-01 18:05 ` ralf
2011-06-09 5:07 ` Benjamin Herrenschmidt
2011-06-09 5:07 ` Benjamin Herrenschmidt
2011-06-09 11:19 ` [tip:timers/cleanup] i8253: Alpha, PowerPC: Remove unused asm/8253pit.h tip-bot for Ralf Baechle
2011-06-09 13:07 ` tip-bot for Ralf Baechle
2011-06-01 18:05 ` ralf [this message]
2011-06-09 11:19 ` [tip:timers/cleanup] x86: i8253: Consolidate definitions of global_clock_event tip-bot for Ralf Baechle
2011-06-09 13:07 ` tip-bot for Ralf Baechle
2011-06-01 18:05 ` [patch 11/14] i8253: Consolidate definitions of PIT_LATCH ralf
2011-06-01 18:05 ` ralf at linux-mips.org
2011-06-01 18:05 ` ralf
2011-06-09 11:20 ` [tip:timers/cleanup] " tip-bot for Ralf Baechle
2011-06-09 13:07 ` tip-bot for Ralf Baechle
2011-06-01 18:05 ` [patch 12/14] i8253: Move remaining content and delete <asm/i8253.h> ralf
2011-06-01 18:05 ` ralf at linux-mips.org
2011-06-01 18:05 ` ralf
2011-06-02 11:29 ` Sergei Shtylyov
2011-06-02 11:29 ` Sergei Shtylyov
2011-06-09 11:20 ` [tip:timers/cleanup] i8253: Move remaining content and delete asm/i8253.h tip-bot for Ralf Baechle
2011-06-09 13:08 ` tip-bot for Ralf Baechle
2011-06-01 18:05 ` [patch 13/14] PCSPKR: Cleanup Kconfig dependencies ralf
2011-06-01 18:05 ` ralf
2011-06-09 5:09 ` Benjamin Herrenschmidt
2011-06-09 5:09 ` Benjamin Herrenschmidt
2011-06-09 11:21 ` [tip:timers/cleanup] pcspkr: " tip-bot for Ralf Baechle
2011-06-09 13:08 ` tip-bot for Ralf Baechle
2011-06-01 18:05 ` [patch 14/14] PCSPKR: MIPS: Make config dependencies finer grained ralf
2011-06-09 11:21 ` [tip:timers/cleanup] pcpskr: " tip-bot for Ralf Baechle
2011-06-09 13:09 ` tip-bot for Ralf Baechle
2011-06-02 19:11 ` [patch 00/14] Sort out i8253 and PC speaker locking and headers Gerhard Pircher
2011-06-03 18:00 ` Ralf Baechle
2011-06-03 18:00 ` Ralf Baechle
2011-06-03 19:22 ` Gerhard Pircher
2011-06-03 19:22 ` Gerhard Pircher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110601180610.762763451@duck.linux-mips.net \
--to=ralf@linux-mips.org \
--cc=hpa@zytor.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=venki@google.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.