* linux-next: build failure after merge of the final tree (sparc-next tree related)
@ 2012-04-16 5:59 Stephen Rothwell
2012-04-16 6:16 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2012-04-16 5:59 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, linux-kernel, Tkhai Kirill
[-- Attachment #1: Type: text/plain, Size: 450 bytes --]
Hi all,
After merging the final tree, today's linux-next build (sparc32 defconfig)
failed like this:
arch/sparc/kernel/pcic.c: In function 'pci_time_init':
arch/sparc/kernel/pcic.c:741:2: error: 'timer_cs_period' undeclared (first use in this function)
Caused by commit 62f082830d63 ("sparc32: generic clockevent support").
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: build failure after merge of the final tree (sparc-next tree related)
2012-04-16 5:59 linux-next: build failure after merge of the final tree (sparc-next tree related) Stephen Rothwell
@ 2012-04-16 6:16 ` David Miller
2012-04-16 7:45 ` Kirill Tkhai
0 siblings, 1 reply; 3+ messages in thread
From: David Miller @ 2012-04-16 6:16 UTC (permalink / raw)
To: sfr; +Cc: linux-next, linux-kernel, tkhai, sam
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 16 Apr 2012 15:59:07 +1000
> After merging the final tree, today's linux-next build (sparc32 defconfig)
> failed like this:
>
> arch/sparc/kernel/pcic.c: In function 'pci_time_init':
> arch/sparc/kernel/pcic.c:741:2: error: 'timer_cs_period' undeclared (first use in this function)
>
> Caused by commit 62f082830d63 ("sparc32: generic clockevent support").
>
> I have reverted that commit for today.
Sam, Tkhai, please fix this.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: build failure after merge of the final tree (sparc-next tree related)
2012-04-16 6:16 ` David Miller
@ 2012-04-16 7:45 ` Kirill Tkhai
0 siblings, 0 replies; 3+ messages in thread
From: Kirill Tkhai @ 2012-04-16 7:45 UTC (permalink / raw)
To: David Miller
Cc: sfr@canb•auug.org.au, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org, sam@ravnborg•org, Tkhai Kirill
16.04.2012, 10:16, "David Miller" <davem@davemloft•net>:
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Mon, 16 Apr 2012 15:59:07 +1000
>
>> After merging the final tree, today's linux-next build (sparc32 defconfig)
>> failed like this:
>>
>> arch/sparc/kernel/pcic.c: In function 'pci_time_init':
>> arch/sparc/kernel/pcic.c:741:2: error: 'timer_cs_period' undeclared (first use in this function)
>>
>> Caused by commit 62f082830d63 ("sparc32: generic clockevent support").
>>
>> I have reverted that commit for today.
>
> Sam, Tkhai, please fix this.
Hi! This place is a mix from two last patches. The fix is below.
Regards,
KT
P.S. I'm sending the message from a web mail client to answer faster. I hope, it won't be problems.
---
arch/sparc/kernel/pcic.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index 118a3f5..866aa34 100644
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -738,7 +738,7 @@ void __init pci_time_init(void)
* It's in SBUS dimension, because timer_cs is in this dimension.
* We take into account this in pcic_cycles_offset()
*/
- timer_cs_period = SBUS_CLOCK_RATE / HZ;
+ sparc_config.cs_period = SBUS_CLOCK_RATE / HZ;
sparc_config.features |= FEAT_L10_CLOCKEVENT;
#endif
sparc_config.features |= FEAT_L10_CLOCKSOURCE;
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-04-16 7:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-16 5:59 linux-next: build failure after merge of the final tree (sparc-next tree related) Stephen Rothwell
2012-04-16 6:16 ` David Miller
2012-04-16 7:45 ` Kirill Tkhai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox