From: Arnd Bergmann <arnd@arndb.de>
To: linux-arm-kernel@lists.infradead.org
Cc: Stephen Boyd <sboyd@codeaurora.org>,
John Stultz <john.stultz@linaro.org>,
Russell King <linux@arm.linux.org.uk>,
linux-arm-msm@vger.kernel.org, Will Deacon <will.deacon@arm.com>,
linux-kernel@vger.kernel.org, arm@kernel.org,
Catalin Marinas <catalin.marinas@arm.com>,
Thomas Gleixner <tglx@linutronix.de>
Subject: Re: [PATCHv2 3/6] sched_clock: Make ARM's sched_clock generic for all architectures
Date: Fri, 21 Jun 2013 17:45:57 +0200 [thread overview]
Message-ID: <201306211745.57528.arnd@arndb.de> (raw)
In-Reply-To: <1370155183-31421-4-git-send-email-sboyd@codeaurora.org>
On Sunday 02 June 2013, Stephen Boyd wrote:
> Nothing about the sched_clock implementation in the ARM port is
> specific to the architecture. Generalize the code so that other
> architectures can use it by selecting GENERIC_SCHED_CLOCK.
>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> ---
> arch/arm/Kconfig | 1 +
> arch/arm/common/timer-sp.c | 2 +-
> arch/arm/kernel/Makefile | 2 +-
> arch/arm/kernel/arch_timer.c | 2 +-
> arch/arm/kernel/time.c | 4 +---
> arch/arm/mach-davinci/time.c | 2 +-
> arch/arm/mach-imx/time.c | 2 +-
> arch/arm/mach-integrator/integrator_ap.c | 2 +-
> arch/arm/mach-ixp4xx/common.c | 2 +-
> arch/arm/mach-mmp/time.c | 2 +-
> arch/arm/mach-msm/timer.c | 2 +-
> arch/arm/mach-omap1/time.c | 2 +-
> arch/arm/mach-omap2/timer.c | 2 +-
> arch/arm/mach-pxa/time.c | 2 +-
> arch/arm/mach-sa1100/time.c | 2 +-
> arch/arm/mach-u300/timer.c | 2 +-
> arch/arm/plat-iop/time.c | 2 +-
> arch/arm/plat-omap/counter_32k.c | 2 +-
> arch/arm/plat-orion/time.c | 2 +-
> arch/arm/plat-samsung/samsung-time.c | 2 +-
> arch/arm/plat-versatile/sched-clock.c | 2 +-
> drivers/clocksource/bcm2835_timer.c | 2 +-
> drivers/clocksource/clksrc-dbx500-prcmu.c | 3 +--
> drivers/clocksource/dw_apb_timer_of.c | 2 +-
> drivers/clocksource/mxs_timer.c | 2 +-
> drivers/clocksource/nomadik-mtu.c | 2 +-
> drivers/clocksource/samsung_pwm_timer.c | 2 +-
> drivers/clocksource/tegra20_timer.c | 2 +-
> drivers/clocksource/time-armada-370-xp.c | 2 +-
> drivers/clocksource/timer-marco.c | 2 +-
> drivers/clocksource/timer-prima2.c | 2 +-
> {arch/arm/include/asm => include/linux}/sched_clock.h | 9 +++++++--
> init/Kconfig | 3 +++
> init/main.c | 2 ++
> kernel/time/Makefile | 1 +
> {arch/arm/kernel => kernel/time}/sched_clock.c | 3 +--
This causes build failures when doing a simple merge with the arm-soc
tree:
==> build/clps711x_defconfig/faillog <==
/git/arm-soc/arch/arm/mach-clps711x/common.c:37:29: fatal error: asm/sched_clock.h: No such file or directory
#include <asm/sched_clock.h>
^
==> build/imx_v6_v7_defconfig/faillog <==
/git/arm-soc/drivers/clocksource/vf_pit_timer.c:15:29: fatal error: asm/sched_clock.h: No such file or directory
#include <asm/sched_clock.h>
How about adding back a temporary arch/arm/include/asm/sched_clock.h
that only contains "#include <linux/sched_clock.h>" so we can change
those two files after the merge and still get a bisectible history?
Arnd
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCHv2 3/6] sched_clock: Make ARM's sched_clock generic for all architectures
Date: Fri, 21 Jun 2013 17:45:57 +0200 [thread overview]
Message-ID: <201306211745.57528.arnd@arndb.de> (raw)
In-Reply-To: <1370155183-31421-4-git-send-email-sboyd@codeaurora.org>
On Sunday 02 June 2013, Stephen Boyd wrote:
> Nothing about the sched_clock implementation in the ARM port is
> specific to the architecture. Generalize the code so that other
> architectures can use it by selecting GENERIC_SCHED_CLOCK.
>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> ---
> arch/arm/Kconfig | 1 +
> arch/arm/common/timer-sp.c | 2 +-
> arch/arm/kernel/Makefile | 2 +-
> arch/arm/kernel/arch_timer.c | 2 +-
> arch/arm/kernel/time.c | 4 +---
> arch/arm/mach-davinci/time.c | 2 +-
> arch/arm/mach-imx/time.c | 2 +-
> arch/arm/mach-integrator/integrator_ap.c | 2 +-
> arch/arm/mach-ixp4xx/common.c | 2 +-
> arch/arm/mach-mmp/time.c | 2 +-
> arch/arm/mach-msm/timer.c | 2 +-
> arch/arm/mach-omap1/time.c | 2 +-
> arch/arm/mach-omap2/timer.c | 2 +-
> arch/arm/mach-pxa/time.c | 2 +-
> arch/arm/mach-sa1100/time.c | 2 +-
> arch/arm/mach-u300/timer.c | 2 +-
> arch/arm/plat-iop/time.c | 2 +-
> arch/arm/plat-omap/counter_32k.c | 2 +-
> arch/arm/plat-orion/time.c | 2 +-
> arch/arm/plat-samsung/samsung-time.c | 2 +-
> arch/arm/plat-versatile/sched-clock.c | 2 +-
> drivers/clocksource/bcm2835_timer.c | 2 +-
> drivers/clocksource/clksrc-dbx500-prcmu.c | 3 +--
> drivers/clocksource/dw_apb_timer_of.c | 2 +-
> drivers/clocksource/mxs_timer.c | 2 +-
> drivers/clocksource/nomadik-mtu.c | 2 +-
> drivers/clocksource/samsung_pwm_timer.c | 2 +-
> drivers/clocksource/tegra20_timer.c | 2 +-
> drivers/clocksource/time-armada-370-xp.c | 2 +-
> drivers/clocksource/timer-marco.c | 2 +-
> drivers/clocksource/timer-prima2.c | 2 +-
> {arch/arm/include/asm => include/linux}/sched_clock.h | 9 +++++++--
> init/Kconfig | 3 +++
> init/main.c | 2 ++
> kernel/time/Makefile | 1 +
> {arch/arm/kernel => kernel/time}/sched_clock.c | 3 +--
This causes build failures when doing a simple merge with the arm-soc
tree:
==> build/clps711x_defconfig/faillog <==
/git/arm-soc/arch/arm/mach-clps711x/common.c:37:29: fatal error: asm/sched_clock.h: No such file or directory
#include <asm/sched_clock.h>
^
==> build/imx_v6_v7_defconfig/faillog <==
/git/arm-soc/drivers/clocksource/vf_pit_timer.c:15:29: fatal error: asm/sched_clock.h: No such file or directory
#include <asm/sched_clock.h>
How about adding back a temporary arch/arm/include/asm/sched_clock.h
that only contains "#include <linux/sched_clock.h>" so we can change
those two files after the merge and still get a bisectible history?
Arnd
next prev parent reply other threads:[~2013-06-21 15:46 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-02 6:39 [PATCHv2 0/6] Make ARM's sched_clock generic + 64 bit friendly Stephen Boyd
2013-06-02 6:39 ` Stephen Boyd
2013-06-02 6:39 ` [PATCHv2 1/6] ARM: sched_clock: Remove unused needs_suspend member Stephen Boyd
2013-06-02 6:39 ` Stephen Boyd
2013-06-02 6:39 ` [PATCHv2 2/6] ARM: sched_clock: Return suspended count earlier Stephen Boyd
2013-06-02 6:39 ` Stephen Boyd
2013-06-02 6:39 ` [PATCHv2 3/6] sched_clock: Make ARM's sched_clock generic for all architectures Stephen Boyd
2013-06-02 6:39 ` Stephen Boyd
2013-06-03 7:12 ` Baruch Siach
2013-06-03 7:12 ` Baruch Siach
2013-06-03 19:50 ` Stephen Boyd
2013-06-03 19:50 ` Stephen Boyd
2013-06-04 17:56 ` John Stultz
2013-06-04 17:56 ` John Stultz
2013-06-04 18:16 ` Russell King - ARM Linux
2013-06-04 18:16 ` Russell King - ARM Linux
2013-06-21 15:45 ` Arnd Bergmann [this message]
2013-06-21 15:45 ` Arnd Bergmann
2013-06-21 17:05 ` Stephen Boyd
2013-06-21 17:05 ` Stephen Boyd
2013-06-21 17:42 ` John Stultz
2013-06-21 17:42 ` John Stultz
2013-06-24 22:45 ` Stephen Boyd
2013-06-24 22:45 ` Stephen Boyd
2013-06-24 22:54 ` John Stultz
2013-06-24 22:54 ` John Stultz
2013-06-02 6:39 ` [PATCHv2 4/6] sched_clock: Add support for >32 bit sched_clock Stephen Boyd
2013-06-02 6:39 ` Stephen Boyd
2013-06-03 9:39 ` Russell King - ARM Linux
2013-06-03 9:39 ` Russell King - ARM Linux
2013-06-03 21:11 ` Stephen Boyd
2013-06-03 21:11 ` Stephen Boyd
2013-06-03 22:12 ` Russell King - ARM Linux
2013-06-03 22:12 ` Russell King - ARM Linux
2013-06-04 1:51 ` Stephen Boyd
2013-06-04 1:51 ` Stephen Boyd
2013-06-04 10:21 ` Russell King - ARM Linux
2013-06-04 10:21 ` Russell King - ARM Linux
2013-06-10 4:12 ` Rob Herring
2013-06-10 4:12 ` Rob Herring
2013-06-14 17:17 ` Catalin Marinas
2013-06-14 17:17 ` Catalin Marinas
2013-06-14 17:17 ` Catalin Marinas
2013-06-10 15:16 ` anish singh
2013-06-10 15:16 ` anish singh
2013-06-10 15:38 ` Russell King - ARM Linux
2013-06-10 15:38 ` Russell King - ARM Linux
2013-06-10 16:01 ` anish singh
2013-06-10 16:01 ` anish singh
2013-06-10 16:08 ` Russell King - ARM Linux
2013-06-10 16:08 ` Russell King - ARM Linux
2013-06-02 6:39 ` [PATCHv2 5/6] ARM: arch_timer: Move to setup_sched_clock_64() Stephen Boyd
2013-06-02 6:39 ` Stephen Boyd
2013-06-02 6:39 ` [PATCHv2 6/6] arm64: Move to generic sched_clock infrastructure Stephen Boyd
2013-06-02 6:39 ` Stephen Boyd
2013-06-03 8:52 ` [PATCHv2 0/6] Make ARM's sched_clock generic + 64 bit friendly Baruch Siach
2013-06-03 8:52 ` Baruch Siach
2013-06-04 0:19 ` John Stultz
2013-06-04 0:19 ` John Stultz
2013-06-04 16:09 ` Will Deacon
2013-06-04 16:09 ` Will Deacon
2013-06-04 16:09 ` Will Deacon
2013-06-04 17:53 ` John Stultz
2013-06-04 17:53 ` John Stultz
2013-06-16 9:45 ` Baruch Siach
2013-06-16 9:45 ` Baruch Siach
2013-06-17 16:23 ` John Stultz
2013-06-17 16:23 ` John Stultz
2013-06-17 18:02 ` Baruch Siach
2013-06-17 18:02 ` Baruch Siach
2013-06-17 18:14 ` John Stultz
2013-06-17 18:14 ` John Stultz
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=201306211745.57528.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=arm@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=john.stultz@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=sboyd@codeaurora.org \
--cc=tglx@linutronix.de \
--cc=will.deacon@arm.com \
/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.