linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* 2.6.9-rc4-mm1 HPET compile problems on AMD64
@ 2004-10-11 15:42 Badari Pulavarty
  2004-10-11 19:54 ` Andrew Morton
  0 siblings, 1 reply; 7+ messages in thread
From: Badari Pulavarty @ 2004-10-11 15:42 UTC (permalink / raw)
  To: Andrew Morton, Andi Kleen; +Cc: Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 475 bytes --]

Hi Andrew,

I get following error while linking kernel on 2.6.9-rc4-mm1.
x86_64/kernel/time.c seems to have a dependency on char/hpet.c
driver. Its forcing me to use CONFIG_HPET. 

 LD      .tmp_vmlinux1
arch/x86_64/kernel/built-in.o(.init.text+0x2071): In function
`late_hpet_init':
arch/x86_64/kernel/entry.S:259: undefined reference to `hpet_alloc'
make: *** [.tmp_vmlinux1] Error 1

I used following fix to compile. I have no idea, if its right
or not.

Thanks,
Badari



[-- Attachment #2: hpet_alloc_fix.patch --]
[-- Type: text/plain, Size: 474 bytes --]

--- linux.org/arch/x86_64/kernel/time.c	2004-10-11 09:17:15.613107488 -0700
+++ linux/arch/x86_64/kernel/time.c	2004-10-11 09:14:05.983935504 -0700
@@ -727,6 +727,7 @@ static unsigned int __init pit_calibrate
 	return (end - start) / 50;
 }
 
+#ifdef	CONFIG_HPET
 static __init int late_hpet_init(void)
 {
 	struct hpet_data	hd;
@@ -773,6 +774,7 @@ static __init int late_hpet_init(void)
 	return 0;
 }
 fs_initcall(late_hpet_init);
+#endif
 
 static int hpet_init(void)
 {

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: 2.6.9-rc4-mm1 HPET compile problems on AMD64
  2004-10-11 15:42 2.6.9-rc4-mm1 HPET compile problems on AMD64 Badari Pulavarty
@ 2004-10-11 19:54 ` Andrew Morton
  2004-10-11 20:26   ` Badari Pulavarty
  0 siblings, 1 reply; 7+ messages in thread
From: Andrew Morton @ 2004-10-11 19:54 UTC (permalink / raw)
  To: Badari Pulavarty; +Cc: ak, linux-kernel

Badari Pulavarty <pbadari@us.ibm.com> wrote:
>
> I get following error while linking kernel on 2.6.9-rc4-mm1.
> x86_64/kernel/time.c seems to have a dependency on char/hpet.c
> driver. Its forcing me to use CONFIG_HPET. 
> 
>  LD      .tmp_vmlinux1
> arch/x86_64/kernel/built-in.o(.init.text+0x2071): In function
> `late_hpet_init':
> arch/x86_64/kernel/entry.S:259: undefined reference to `hpet_alloc'
> make: *** [.tmp_vmlinux1] Error 1
> 
> ...
> 
> [hpet_alloc_fix.patch  text/plain (638 bytes)]
> --- linux.org/arch/x86_64/kernel/time.c	2004-10-11 09:17:15.613107488 -0700
> +++ linux/arch/x86_64/kernel/time.c	2004-10-11 09:14:05.983935504 -0700
> @@ -727,6 +727,7 @@ static unsigned int __init pit_calibrate
>  	return (end - start) / 50;
>  }
>  
> +#ifdef	CONFIG_HPET
>  static __init int late_hpet_init(void)
>  {
>  	struct hpet_data	hd;
> @@ -773,6 +774,7 @@ static __init int late_hpet_init(void)
>  	return 0;
>  }
>  fs_initcall(late_hpet_init);
> +#endif

I assume you have CONFIG_HPET=n and CONFIG_HPET_TIMER=n?

Andi, what's going on here?  Should the hpet functions in
arch/x86_64/kernel/time.c be inside CONFIG_HPET_TIMER?


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: 2.6.9-rc4-mm1 HPET compile problems on AMD64
  2004-10-11 19:54 ` Andrew Morton
@ 2004-10-11 20:26   ` Badari Pulavarty
  2004-10-11 21:06     ` Andrew Morton
  2004-10-11 21:25     ` Andi Kleen
  0 siblings, 2 replies; 7+ messages in thread
From: Badari Pulavarty @ 2004-10-11 20:26 UTC (permalink / raw)
  To: Andrew Morton; +Cc: ak, linux-kernel

On Mon, 2004-10-11 at 12:54, Andrew Morton wrote:

> 
> I assume you have CONFIG_HPET=n and CONFIG_HPET_TIMER=n?
> 
> Andi, what's going on here?  Should the hpet functions in
> arch/x86_64/kernel/time.c be inside CONFIG_HPET_TIMER?

I haven't enable HPET, but autoconf.h gets 

# grep HPET autoconf.h
#define CONFIG_HPET_TIMER 1
#define CONFIG_HPET_EMULATE_RTC 1

# grep HPET .config
# CONFIG_HPET is not set

Thanks,
Badari


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: 2.6.9-rc4-mm1 HPET compile problems on AMD64
  2004-10-11 20:26   ` Badari Pulavarty
@ 2004-10-11 21:06     ` Andrew Morton
  2004-10-11 21:25     ` Andi Kleen
  1 sibling, 0 replies; 7+ messages in thread
From: Andrew Morton @ 2004-10-11 21:06 UTC (permalink / raw)
  To: Badari Pulavarty; +Cc: ak, linux-kernel

Badari Pulavarty <pbadari@us.ibm.com> wrote:
>
> I haven't enable HPET, but autoconf.h gets 
> 
> # grep HPET autoconf.h
> #define CONFIG_HPET_TIMER 1
> #define CONFIG_HPET_EMULATE_RTC 1
> 
> # grep HPET .config
> # CONFIG_HPET is not set

Something screwed up then.  Do a `make oldconfig', try a `make clean'.  I
can't find a way to make the above happen.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: 2.6.9-rc4-mm1 HPET compile problems on AMD64
  2004-10-11 20:26   ` Badari Pulavarty
  2004-10-11 21:06     ` Andrew Morton
@ 2004-10-11 21:25     ` Andi Kleen
  2004-10-11 21:42       ` Badari Pulavarty
  1 sibling, 1 reply; 7+ messages in thread
From: Andi Kleen @ 2004-10-11 21:25 UTC (permalink / raw)
  To: Badari Pulavarty; +Cc: Andrew Morton, ak, linux-kernel

On Mon, Oct 11, 2004 at 01:26:53PM -0700, Badari Pulavarty wrote:
> On Mon, 2004-10-11 at 12:54, Andrew Morton wrote:
> 
> > 
> > I assume you have CONFIG_HPET=n and CONFIG_HPET_TIMER=n?
> > 
> > Andi, what's going on here?  Should the hpet functions in
> > arch/x86_64/kernel/time.c be inside CONFIG_HPET_TIMER?
> 
> I haven't enable HPET, but autoconf.h gets 
> 
> # grep HPET autoconf.h
> #define CONFIG_HPET_TIMER 1
> #define CONFIG_HPET_EMULATE_RTC 1
> 
> # grep HPET .config
> # CONFIG_HPET is not set

It should be inside CONFIG_HPET. Badari's patch was correct.

-Andi

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: 2.6.9-rc4-mm1 HPET compile problems on AMD64
  2004-10-11 21:25     ` Andi Kleen
@ 2004-10-11 21:42       ` Badari Pulavarty
  2004-10-11 22:05         ` Andi Kleen
  0 siblings, 1 reply; 7+ messages in thread
From: Badari Pulavarty @ 2004-10-11 21:42 UTC (permalink / raw)
  To: Andi Kleen; +Cc: Andrew Morton, linux-kernel

On Mon, 2004-10-11 at 14:25, Andi Kleen wrote:
> On Mon, Oct 11, 2004 at 01:26:53PM -0700, Badari Pulavarty wrote:
> > On Mon, 2004-10-11 at 12:54, Andrew Morton wrote:
> > 
> > > 
> > > I assume you have CONFIG_HPET=n and CONFIG_HPET_TIMER=n?
> > > 
> > > Andi, what's going on here?  Should the hpet functions in
> > > arch/x86_64/kernel/time.c be inside CONFIG_HPET_TIMER?
> > 
> > I haven't enable HPET, but autoconf.h gets 
> > 
> > # grep HPET autoconf.h
> > #define CONFIG_HPET_TIMER 1
> > #define CONFIG_HPET_EMULATE_RTC 1
> > 
> > # grep HPET .config
> > # CONFIG_HPET is not set
> 
> It should be inside CONFIG_HPET. Badari's patch was correct.

make clean and oldconfig cleaned up little, but I still get
following linking error (without my patch).

# grep HPET .config
# CONFIG_HPET is not set

# grep HPET autoconf.h
#undef CONFIG_HPET

  LD      .tmp_vmlinux1
arch/x86_64/kernel/built-in.o(.init.text+0x2071): In function
`late_hpet_init':
arch/x86_64/kernel/entry.S:259: undefined reference to `hpet_alloc'

Andi, one thing I am not sure is - do you want entire routine
late_hpet_init() under CONFIG_HPET or only parts of it ?

Thanks,
Badari


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: 2.6.9-rc4-mm1 HPET compile problems on AMD64
  2004-10-11 21:42       ` Badari Pulavarty
@ 2004-10-11 22:05         ` Andi Kleen
  0 siblings, 0 replies; 7+ messages in thread
From: Andi Kleen @ 2004-10-11 22:05 UTC (permalink / raw)
  To: Badari Pulavarty; +Cc: Andi Kleen, Andrew Morton, linux-kernel

On Mon, Oct 11, 2004 at 02:42:05PM -0700, Badari Pulavarty wrote:
> On Mon, 2004-10-11 at 14:25, Andi Kleen wrote:
> > On Mon, Oct 11, 2004 at 01:26:53PM -0700, Badari Pulavarty wrote:
> > > On Mon, 2004-10-11 at 12:54, Andrew Morton wrote:
> > > 
> > > > 
> > > > I assume you have CONFIG_HPET=n and CONFIG_HPET_TIMER=n?
> > > > 
> > > > Andi, what's going on here?  Should the hpet functions in
> > > > arch/x86_64/kernel/time.c be inside CONFIG_HPET_TIMER?
> > > 
> > > I haven't enable HPET, but autoconf.h gets 
> > > 
> > > # grep HPET autoconf.h
> > > #define CONFIG_HPET_TIMER 1
> > > #define CONFIG_HPET_EMULATE_RTC 1
> > > 
> > > # grep HPET .config
> > > # CONFIG_HPET is not set
> > 
> > It should be inside CONFIG_HPET. Badari's patch was correct.
> 
> make clean and oldconfig cleaned up little, but I still get
> following linking error (without my patch).
> 
> # grep HPET .config
> # CONFIG_HPET is not set
> 
> # grep HPET autoconf.h
> #undef CONFIG_HPET
> 
>   LD      .tmp_vmlinux1
> arch/x86_64/kernel/built-in.o(.init.text+0x2071): In function
> `late_hpet_init':
> arch/x86_64/kernel/entry.S:259: undefined reference to `hpet_alloc'
> 
> Andi, one thing I am not sure is - do you want entire routine
> late_hpet_init() under CONFIG_HPET or only parts of it ?

The entire function. As in this patch.

------------------------------------------------------------

Fix linking with CONFIG_HPET off

Index: linux/arch/x86_64/kernel/time.c
===================================================================
--- linux.orig/arch/x86_64/kernel/time.c	2004-10-06 02:00:23.%N +0200
+++ linux/arch/x86_64/kernel/time.c	2004-10-11 23:25:14.%N +0200
@@ -724,6 +724,7 @@
 	return (end - start) / 50;
 }
 
+#ifdef CONFIG_HPET
 static __init int late_hpet_init(void)
 {
 	struct hpet_data	hd;
@@ -770,6 +771,7 @@
 	return 0;
 }
 fs_initcall(late_hpet_init);
+#endif
 
 static int hpet_init(void)
 {



^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2004-10-11 22:05 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-10-11 15:42 2.6.9-rc4-mm1 HPET compile problems on AMD64 Badari Pulavarty
2004-10-11 19:54 ` Andrew Morton
2004-10-11 20:26   ` Badari Pulavarty
2004-10-11 21:06     ` Andrew Morton
2004-10-11 21:25     ` Andi Kleen
2004-10-11 21:42       ` Badari Pulavarty
2004-10-11 22:05         ` Andi Kleen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).