* printk_clock() patch breaks sn2 arch
@ 2006-10-23 21:00 Christoph Lameter
2006-10-23 21:33 ` Martin Peschke
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Christoph Lameter @ 2006-10-23 21:00 UTC (permalink / raw)
To: linux-ia64
At the mininum we need to have a declaration of the ia64_timestamp
function otherwise ia64 sn2 does not even compile.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Index: linux-2.6.19-rc2-mm2/include/asm-ia64/timex.h
=================================--- linux-2.6.19-rc2-mm2.orig/include/asm-ia64/timex.h 2006-10-13 11:25:04.000000000 -0500
+++ linux-2.6.19-rc2-mm2/include/asm-ia64/timex.h 2006-10-23 15:48:05.565981377 -0500
@@ -39,4 +39,6 @@ get_cycles (void)
return ret;
}
+extern unsigned long long (*ia64_timestamp_clock)(void);
+
#endif /* _ASM_IA64_TIMEX_H */
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: printk_clock() patch breaks sn2 arch
2006-10-23 21:00 printk_clock() patch breaks sn2 arch Christoph Lameter
@ 2006-10-23 21:33 ` Martin Peschke
2006-10-23 21:48 ` Christoph Lameter
2006-10-23 22:04 ` Martin Peschke
2 siblings, 0 replies; 4+ messages in thread
From: Martin Peschke @ 2006-10-23 21:33 UTC (permalink / raw)
To: linux-ia64
Christoph Lameter wrote:
> At the mininum we need to have a declaration of the ia64_timestamp
> function otherwise ia64 sn2 does not even compile.
>
> Signed-off-by: Christoph Lameter <clameter@sgi.com>
>
> Index: linux-2.6.19-rc2-mm2/include/asm-ia64/timex.h
> =================================> --- linux-2.6.19-rc2-mm2.orig/include/asm-ia64/timex.h 2006-10-13 11:25:04.000000000 -0500
> +++ linux-2.6.19-rc2-mm2/include/asm-ia64/timex.h 2006-10-23 15:48:05.565981377 -0500
> @@ -39,4 +39,6 @@ get_cycles (void)
> return ret;
> }
>
> +extern unsigned long long (*ia64_timestamp_clock)(void);
> +
> #endif /* _ASM_IA64_TIMEX_H */
Fine with me.
I don't see how I could have broken it, as my patch just renames
ia64_printk_clock() to ia64_timetamp_clock():
diff -puN
arch/ia64/sn/kernel/setup.c~statistics-infrastructure-make-printk_clock-a-generic-kernel-wide-nsec-resolution
arch/ia64/sn/kernel/setup.c
---
a/arch/ia64/sn/kernel/setup.c~statistics-infrastructure-make-printk_clock-a-generic-kernel-wide-nsec-resolution
+++ a/arch/ia64/sn/kernel/setup.c
@@ -66,7 +66,7 @@ extern unsigned long last_time_offset;
extern void (*ia64_mark_idle) (int);
extern void snidle(int);
extern unsigned char acpi_kbd_controller_present;
-extern unsigned long long (*ia64_printk_clock)(void);
+extern unsigned long long (*ia64_timestamp_clock)(void);
unsigned long sn_rtc_cycles_per_second;
EXPORT_SYMBOL(sn_rtc_cycles_per_second);
But such extern declarations in c files instead of header files looks
wrong in the first place and probably contributed to the issue your
patch addresses.
Martin
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: printk_clock() patch breaks sn2 arch
2006-10-23 21:00 printk_clock() patch breaks sn2 arch Christoph Lameter
2006-10-23 21:33 ` Martin Peschke
@ 2006-10-23 21:48 ` Christoph Lameter
2006-10-23 22:04 ` Martin Peschke
2 siblings, 0 replies; 4+ messages in thread
From: Christoph Lameter @ 2006-10-23 21:48 UTC (permalink / raw)
To: linux-ia64
On Mon, 23 Oct 2006, Martin Peschke wrote:
> I don't see how I could have broken it, as my patch just renames
> ia64_printk_clock() to ia64_timetamp_clock():
> +++ a/arch/ia64/sn/kernel/setup.c
> @@ -66,7 +66,7 @@ extern unsigned long last_time_offset;
> extern void (*ia64_mark_idle) (int);
> extern void snidle(int);
> extern unsigned char acpi_kbd_controller_present;
> -extern unsigned long long (*ia64_printk_clock)(void);
> +extern unsigned long long (*ia64_timestamp_clock)(void);
Hmmm... This piece of the patch seems to have been dropped. I guess
the best solution is to make sure that Andrew has your complete patch in
his tree and forget about my patch:
2.6.19-rc2-mm2 has:
extern void (*ia64_mark_idle) (int);
extern void snidle(int);
extern unsigned long long (*ia64_printk_clock)(void);
unsigned long sn_rtc_cycles_per_second;
EXPORT_SYMBOL(sn_rtc_cycles_per_second);
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: printk_clock() patch breaks sn2 arch
2006-10-23 21:00 printk_clock() patch breaks sn2 arch Christoph Lameter
2006-10-23 21:33 ` Martin Peschke
2006-10-23 21:48 ` Christoph Lameter
@ 2006-10-23 22:04 ` Martin Peschke
2 siblings, 0 replies; 4+ messages in thread
From: Martin Peschke @ 2006-10-23 22:04 UTC (permalink / raw)
To: linux-ia64
Christoph Lameter wrote:
> On Mon, 23 Oct 2006, Martin Peschke wrote:
>
>> I don't see how I could have broken it, as my patch just renames
>> ia64_printk_clock() to ia64_timetamp_clock():
>> +++ a/arch/ia64/sn/kernel/setup.c
>> @@ -66,7 +66,7 @@ extern unsigned long last_time_offset;
>> extern void (*ia64_mark_idle) (int);
>> extern void snidle(int);
>> extern unsigned char acpi_kbd_controller_present;
>> -extern unsigned long long (*ia64_printk_clock)(void);
>> +extern unsigned long long (*ia64_timestamp_clock)(void);
>
> Hmmm... This piece of the patch seems to have been dropped. I guess
> the best solution is to make sure that Andrew has your complete patch in
> his tree and forget about my patch:
>
> 2.6.19-rc2-mm2 has:
>
> extern void (*ia64_mark_idle) (int);
> extern void snidle(int);
> extern unsigned long long (*ia64_printk_clock)(void);
>
> unsigned long sn_rtc_cycles_per_second;
> EXPORT_SYMBOL(sn_rtc_cycles_per_second);
>
Mmh, you are right the extern declaration was dropped from setup.c,
ia64 folks to introduce a proper extern declaration? Wondering why ;)
http://marc.theaimsgroup.com/?l=linux-kernel&m\x116137801232337&w=2
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2006-10-23 22:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-10-23 21:00 printk_clock() patch breaks sn2 arch Christoph Lameter
2006-10-23 21:33 ` Martin Peschke
2006-10-23 21:48 ` Christoph Lameter
2006-10-23 22:04 ` Martin Peschke
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox