From: Nathan_Lynch@mentor.com (Nathan Lynch)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v8 05/10] ARM: arch_timer: remove unused functions
Date: Mon, 4 Aug 2014 08:29:03 -0500 [thread overview]
Message-ID: <53DF8A9F.20203@mentor.com> (raw)
In-Reply-To: <20140804124924.GH15117@arm.com>
On 08/04/2014 07:49 AM, Will Deacon wrote:
> On Sat, Aug 02, 2014 at 07:16:42PM +0100, Nathan Lynch wrote:
>> The counter access and evtstream configuration are now done in common
>> code, so remove the now-unused arch_counter_set_user_access and
>> arch_timer_evtstrm_enable.
>>
>> Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
>> ---
>> arch/arm/include/asm/arch_timer.h | 25 -------------------------
>> 1 file changed, 25 deletions(-)
>>
>> diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h
>> index 0704e0cf5571..92793ba69c40 100644
>> --- a/arch/arm/include/asm/arch_timer.h
>> +++ b/arch/arm/include/asm/arch_timer.h
>> @@ -99,31 +99,6 @@ static inline void arch_timer_set_cntkctl(u32 cntkctl)
>> asm volatile("mcr p15, 0, %0, c14, c1, 0" : : "r" (cntkctl));
>> }
>>
>> -static inline void arch_counter_set_user_access(void)
>> -{
>> - u32 cntkctl = arch_timer_get_cntkctl();
>> -
>> - /* Disable user access to both physical/virtual counters/timers */
>> - /* Also disable virtual event stream */
>> - cntkctl &= ~(ARCH_TIMER_USR_PT_ACCESS_EN
>> - | ARCH_TIMER_USR_VT_ACCESS_EN
>> - | ARCH_TIMER_VIRT_EVT_EN
>> - | ARCH_TIMER_USR_VCT_ACCESS_EN
>> - | ARCH_TIMER_USR_PCT_ACCESS_EN);
>> - arch_timer_set_cntkctl(cntkctl);
>> -}
>> -
>> -static inline void arch_timer_evtstrm_enable(int divider)
>> -{
>> - u32 cntkctl = arch_timer_get_cntkctl();
>> - cntkctl &= ~ARCH_TIMER_EVT_TRIGGER_MASK;
>> - /* Set the divider and enable virtual event stream */
>> - cntkctl |= (divider << ARCH_TIMER_EVT_TRIGGER_SHIFT)
>> - | ARCH_TIMER_VIRT_EVT_EN;
>> - arch_timer_set_cntkctl(cntkctl);
>> - elf_hwcap |= HWCAP_EVTSTRM;
>> -}
>> -
>> #endif
>
> Does these play nicely with the previous patch wrt bisection?
It should. All call sites of these are fixed up in the previous patch.
Anything in particular you're concerned about?
The entire series is intended to be bisectable; let me know if I've
missed something.
next prev parent reply other threads:[~2014-08-04 13:29 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-02 18:16 [PATCH v8 00/10] ARM: VDSO Nathan Lynch
2014-08-02 18:16 ` [PATCH v8 01/10] ARM: use _install_special_mapping for sigpage Nathan Lynch
2014-08-04 12:46 ` Will Deacon
2014-08-04 13:12 ` Nathan Lynch
2014-08-04 14:11 ` Nathan Lynch
2014-08-04 16:06 ` Will Deacon
2014-08-02 18:16 ` [PATCH v8 02/10] ARM: place sigpage at a random offset above stack Nathan Lynch
2014-08-02 18:16 ` [PATCH v8 03/10] clocksource: arm_arch_timer: change clocksource name if CP15 unavailable Nathan Lynch
2014-08-05 0:01 ` Stephen Boyd
2014-08-05 0:10 ` Andy Lutomirski
2014-08-02 18:16 ` [PATCH v8 04/10] clocksource: arm_arch_timer: enable counter access for 32-bit ARM Nathan Lynch
2014-08-02 18:16 ` [PATCH v8 05/10] ARM: arch_timer: remove unused functions Nathan Lynch
2014-08-04 12:49 ` Will Deacon
2014-08-04 13:29 ` Nathan Lynch [this message]
2014-08-04 16:05 ` Will Deacon
2014-08-02 18:16 ` [PATCH v8 06/10] arm64: " Nathan Lynch
2014-08-02 18:16 ` [PATCH v8 07/10] ARM: miscellaneous vdso infrastructure, preparation Nathan Lynch
2014-08-02 18:16 ` [PATCH v8 08/10] ARM: add vdso user-space code Nathan Lynch
2014-08-02 18:16 ` [PATCH v8 09/10] ARM: vdso initialization, mapping, and synchronization Nathan Lynch
2014-08-02 18:16 ` [PATCH v8 10/10] ARM: add CONFIG_VDSO Kconfig and Makefile bits Nathan Lynch
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=53DF8A9F.20203@mentor.com \
--to=nathan_lynch@mentor.com \
--cc=linux-arm-kernel@lists.infradead.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.