mbox series

[GIT,PULL] arch_timer updates for v4.15

Message ID 20171016152839.14964-1-mark.rutland@arm.com
State New
Headers show
Series [GIT,PULL] arch_timer updates for v4.15 | expand

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux.git tags/arch-timer-4.15

Message

Mark Rutland Oct. 16, 2017, 3:28 p.m. UTC
Hi Daniel,

Please could you pull these arch timer updates for v4.15?

The first patch is a fix from Ard that fixes probling the MMIO timers on some
platforms. The other patch is a minor cleanup that prevents a warning when
building tags.

Thanks,
Mark.

The following changes since commit 9e66317d3c92ddaab330c125dfe9d06eee268aff:

  Linux 4.14-rc3 (2017-10-01 14:54:54 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux.git tags/arch-timer-4.15

for you to fetch changes up to cb3a23a029f6af0c73498b6a9773d6ec19541bf1:

  clocksource: arm_arch_timer: fix DEFINE_PER_CPU expansion (2017-10-16 15:37:16 +0100)

----------------------------------------------------------------
arch_timer updates for v4.15

- enable the MMIO CNTFRQ before reading it
- avoid a warning when building tags

----------------------------------------------------------------
Ard Biesheuvel (1):
      clocksource: arm_arch_timer: validate CNTFRQ after enabling frame

Mark Rutland (1):
      clocksource: arm_arch_timer: fix DEFINE_PER_CPU expansion

 drivers/clocksource/arm_arch_timer.c | 41 +++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 19 deletions(-)

Comments

Mark Rutland Oct. 16, 2017, 4:32 p.m. UTC | #1
On Mon, Oct 16, 2017 at 09:12:00AM -0700, Joe Perches wrote:
> Some of the definitions are very long and can't be split
> into multiple lines because ctags is limited.
> 
> Exempt these lines from the line length checks.
> 
> Signed-off-by: Joe Perches <joe@perches.com>

It might make sense to point at commit:

  25528213fe9f75f4 ("tags: Fix DEFINE_PER_CPU expansions")

... for the gory details, but either way:

Acked-by: Mark Rutland <mark.rutland@arm.com>

Thanks,
Mark.

> ---
>  scripts/checkpatch.pl | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index 2a8c6c3c1bdb..5fa0f5467d99 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -2900,8 +2900,9 @@ sub process {
>  				 $line =~ /^\+\s*#\s*define\s+\w+\s+$String$/) {
>  				$msg_type = "";
>  
> -			# EFI_GUID is another special case
> -			} elsif ($line =~ /^\+.*\bEFI_GUID\s*\(/) {
> +			# More special cases
> +			} elsif ($line =~ /^\+.*\bEFI_GUID\s*\(/ ||
> +				 $line =~ /^\+\s*(?:\w+)?\s*DEFINE_PER_CPU/) {
>  				$msg_type = "";
>  
>  			# Otherwise set the alternate message types
Daniel Lezcano Oct. 17, 2017, 6:16 p.m. UTC | #2
On 16/10/2017 17:28, Mark Rutland wrote:
> Hi Daniel,
> 
> Please could you pull these arch timer updates for v4.15?
> 
> The first patch is a fix from Ard that fixes probling the MMIO timers on some
> platforms. The other patch is a minor cleanup that prevents a warning when
> building tags.

Hi Mark,

I applied the patches for 4.15.

Thanks!

  -- Daniel