Patchwork sparc32: fix build of pcic

login
register
mail settings
Submitter Sam Ravnborg
Date April 16, 2012, 7:57 p.m.
Message ID <20120416195702.GA19692@merkur.ravnborg.org>
Download mbox | patch
Permalink /patch/152977/
State Accepted
Delegated to: David Miller
Headers show

Comments

Sam Ravnborg - April 16, 2012, 7:57 p.m.
From 2f007277975e8bce2b9142b28b609d7a4e9a631e Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Mon, 16 Apr 2012 21:50:49 +0200
Subject: [PATCH] sparc32: fix build of pcic

Left-overs for an earlier iteration of the generic clock events patch removed.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Kirill Tkhai <tkhai@yandex.ru>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---

This is obviously my bad!
I failed to pay enough attention to pcic.c - and furthermore did not
build-test defconfig.

This patch is build-testet with defconfig.

I assume you will not fold the two patches as sparc-next is out in the public.
But at least I do not mind if you decide to do so as I can quickly
re-produce my sparc-next git tree.

	Sam

 arch/sparc/kernel/pcic.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
David Miller - April 16, 2012, 9:39 p.m.
From: Sam Ravnborg <sam@ravnborg.org>
Date: Mon, 16 Apr 2012 21:57:02 +0200

>>From 2f007277975e8bce2b9142b28b609d7a4e9a631e Mon Sep 17 00:00:00 2001
> From: Sam Ravnborg <sam@ravnborg.org>
> Date: Mon, 16 Apr 2012 21:50:49 +0200
> Subject: [PATCH] sparc32: fix build of pcic
> 
> Left-overs for an earlier iteration of the generic clock events patch removed.
> 
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Kirill Tkhai <tkhai@yandex.ru>
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Applied, thanks.

> I assume you will not fold the two patches as sparc-next is out in the public.

That's correct.
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index 118a3f5..f0ec939 100644
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -722,7 +722,7 @@  static unsigned int pcic_cycles_offset(void)
 	 */
 	count = ((count / HZ) * USECS_PER_JIFFY) / (TICK_TIMER_LIMIT / HZ);
 
-	/* Coordinate with the fact that timer_cs rate is 2MHz */
+	/* Coordinate with the sparc_config.clock_rate setting */
 	return count * 2;
 }
 
@@ -735,10 +735,10 @@  void __init pci_time_init(void)
 
 #ifndef CONFIG_SMP
 	/*
-	 * It's in SBUS dimension, because timer_cs is in this dimension.
+	 * The clock_rate is in SBUS dimension.
 	 * We take into account this in pcic_cycles_offset()
 	 */
-	timer_cs_period = SBUS_CLOCK_RATE / HZ;
+	sparc_config.clock_rate = SBUS_CLOCK_RATE / HZ;
 	sparc_config.features |= FEAT_L10_CLOCKEVENT;
 #endif
 	sparc_config.features |= FEAT_L10_CLOCKSOURCE;