2008-01-15 22:20:10

by Frank Rowand

[permalink] [raw]
Subject: [PATCH 1/4] RT: remove duplicate time/Kconfig

From: Frank Rowand <[email protected]>

time/Kconfig added by preempt-realtime-mips.patch duplicates other entry,
resulting in kernel make error:

Signed-off-by: Frank Rowand <[email protected]>
---
arch/mips/Kconfig | 2 0 + 2 - 0 !
1 files changed, 2 deletions(-)

Index: linux-2.6.24-rc7/arch/mips/Kconfig
===================================================================
--- linux-2.6.24-rc7.orig/arch/mips/Kconfig
+++ linux-2.6.24-rc7/arch/mips/Kconfig
@@ -1775,8 +1775,6 @@ config NR_CPUS
performance should round up your number of processors to the next
power of two.

-source "kernel/time/Kconfig"
-
#
# Timer Interrupt Frequency Configuration
#



2008-01-16 00:41:40

by Steven Rostedt

[permalink] [raw]
Subject: Re: [PATCH 1/4] RT: remove duplicate time/Kconfig

On Tue, Jan 15, 2008 at 02:18:45PM -0800, Frank Rowand wrote:
>
> Index: linux-2.6.24-rc7/arch/mips/Kconfig
> ===================================================================
> --- linux-2.6.24-rc7.orig/arch/mips/Kconfig
> +++ linux-2.6.24-rc7/arch/mips/Kconfig
> @@ -1775,8 +1775,6 @@ config NR_CPUS
> performance should round up your number of processors to the next
> power of two.
>
> -source "kernel/time/Kconfig"
> -

This doesn't apply with -rt2. Are you sure you have the right tree?

-- Steve

> #
> # Timer Interrupt Frequency Configuration

2008-01-17 00:50:26

by Frank Rowand

[permalink] [raw]
Subject: Re: [PATCH 1/4] RT: remove duplicate time/Kconfig


On Tue, 2008-01-15 at 19:40 -0500, Steven Rostedt wrote:
> On Tue, Jan 15, 2008 at 02:18:45PM -0800, Frank Rowand wrote:
> >
> > Index: linux-2.6.24-rc7/arch/mips/Kconfig
> > ===================================================================
> > --- linux-2.6.24-rc7.orig/arch/mips/Kconfig
> > +++ linux-2.6.24-rc7/arch/mips/Kconfig
> > @@ -1775,8 +1775,6 @@ config NR_CPUS
> > performance should round up your number of processors to the next
> > power of two.
> >
> > -source "kernel/time/Kconfig"
> > -
>
> This doesn't apply with -rt2. Are you sure you have the right tree?
>
> -- Steve

As you suspected, I pulled this one from the wrong tree. The correct
patch is below.

-Frank

>
> > #
> > # Timer Interrupt Frequency Configuration
>

time/Kconfig added by preempt-realtime-mips.patch duplicates other entry,
resulting in kernel make error:

Signed-off-by: Frank Rowand <[email protected]>
---
arch/mips/Kconfig | 2 0 + 2 - 0 !
1 files changed, 2 deletions(-)

Index: linux-2.6.24-rc7/arch/mips/Kconfig
===================================================================
--- linux-2.6.24-rc7.orig/arch/mips/Kconfig
+++ linux-2.6.24-rc7/arch/mips/Kconfig
@@ -1001,8 +1001,6 @@ config BOOT_ELF64

menu "CPU selection"

-source "kernel/time/Kconfig"
-
choice
prompt "CPU type"
default CPU_R4X00


2008-01-17 01:30:31

by Steven Rostedt

[permalink] [raw]
Subject: Re: [PATCH 1/4] RT: remove duplicate time/Kconfig


On Wed, 16 Jan 2008, Frank Rowand wrote:

>
> time/Kconfig added by preempt-realtime-mips.patch duplicates other entry,
> resulting in kernel make error:
>
> Signed-off-by: Frank Rowand <[email protected]>
> ---
> arch/mips/Kconfig | 2 0 + 2 - 0 !
> 1 files changed, 2 deletions(-)
>
> Index: linux-2.6.24-rc7/arch/mips/Kconfig
> ===================================================================
> --- linux-2.6.24-rc7.orig/arch/mips/Kconfig
> +++ linux-2.6.24-rc7/arch/mips/Kconfig
> @@ -1001,8 +1001,6 @@ config BOOT_ELF64
>
> menu "CPU selection"
>
> -source "kernel/time/Kconfig"
> -
> choice
> prompt "CPU type"
> default CPU_R4X00

heh, This doesn't apply either. Or is this to be done before the patches
are added?

Anyway, I did find the two konfig references:

...

This is purely to save memory - each supported CPU adds
approximately eight kilobytes to the kernel image. For best
performance should round up your number of processors to the next
power of two.

source "kernel/time/Kconfig"

#
# Timer Interrupt Frequency Configuration
#

...

config GENERIC_TIME
bool
default y

source "kernel/time/Kconfig"

config CPU_SPEED
int "CPU speed used for clocksource/clockevent calculations"
default 600
endmenu

...


I'll apply your patch in quilt and then make the proper change. Which
Kconfig do you want gone?

-- Steve

2008-01-17 02:12:42

by Frank Rowand

[permalink] [raw]
Subject: Re: [PATCH 1/4] RT: remove duplicate time/Kconfig


On Wed, 2008-01-16 at 20:29 -0500, Steven Rostedt wrote:
> On Wed, 16 Jan 2008, Frank Rowand wrote:
>
> >
> > time/Kconfig added by preempt-realtime-mips.patch duplicates other entry,
> > resulting in kernel make error:
> >
> > Signed-off-by: Frank Rowand <[email protected]>
> > ---
> > arch/mips/Kconfig | 2 0 + 2 - 0 !
> > 1 files changed, 2 deletions(-)
> >
> > Index: linux-2.6.24-rc7/arch/mips/Kconfig
> > ===================================================================
> > --- linux-2.6.24-rc7.orig/arch/mips/Kconfig
> > +++ linux-2.6.24-rc7/arch/mips/Kconfig
> > @@ -1001,8 +1001,6 @@ config BOOT_ELF64
> >
> > menu "CPU selection"
> >
> > -source "kernel/time/Kconfig"
> > -
> > choice
> > prompt "CPU type"
> > default CPU_R4X00
>
> heh, This doesn't apply either. Or is this to be done before the patches
> are added?

Hmmm, I don't seem to be doing to well here. It was created after the
-rt3 patch was applied. Thanks for you patience with me here!!

>
> Anyway, I did find the two konfig references:
>
> ...
>
> This is purely to save memory - each supported CPU adds
> approximately eight kilobytes to the kernel image. For best
> performance should round up your number of processors to the next
> power of two.
>
> source "kernel/time/Kconfig"
>
> #
> # Timer Interrupt Frequency Configuration
> #
>
> ...
>
> config GENERIC_TIME
> bool
> default y
>
> source "kernel/time/Kconfig"
>
> config CPU_SPEED
> int "CPU speed used for clocksource/clockevent calculations"
> default 600
> endmenu
>
> ...
>
>
> I'll apply your patch in quilt and then make the proper change. Which
> Kconfig do you want gone?

It would be good to get rid of the first one, but I'm especially picky.


>
> -- Steve
>
>