Skip to contentSkip to conversation

RT: remove duplicate time/Kconfig

PATCH Applied Frank Rowand 2 participants 5 messages Jan 15, 2008 – Jan 17, 2008 MIPS

lore
Share & tools
lore
#0 lore raw

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:

---
arch/mips/Kconfig | 2 0 + 2 - 0 !

 1 files changed, 2 deletions(-)
arch/mips/Kconfig +0 -2
Index: 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
 #
#1 lore raw

arch/mips/Kconfig config NR_CPUS · line 1779

Quoted 11 lines · Frank Rowand

Index: linux-2.6.24-rc7/arch/mips/Kconfig
===================================================================

arch/mips/Kconfig +0 -2
@@ -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

Quoted 2 lines
arch/mips/Kconfig +0 -0
 #
 # Timer Interrupt Frequency Configuration
#2 lore raw
Quoted 10 lines · Steven Rostedt
Quoted 9 lines · Frank Rowand

Index: linux-2.6.24-rc7/arch/mips/Kconfig
===================================================================

arch/mips/Kconfig +0 -0
@@ -1775,8 +1775,6 @@ config NR_CPUS
 	  performance should round up your number of processors to the next
 	  power of two.
 
Quoted 6 lines

arch/mips/Kconfig config NR_CPUS · line 1779

Quoted 2 lines
arch/mips/Kconfig +0 -2
-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

Quoted 4 lines

arch/mips/Kconfig config NR_CPUS · line 1779

Quoted 3 lines
arch/mips/Kconfig +0 -0
 #
 # Timer Interrupt Frequency Configuration

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

---
arch/mips/Kconfig | 2 0 + 2 - 0 !

 1 files changed, 2 deletions(-)
arch/mips/Kconfig +0 -2
Index: 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
#3 lore raw
Quoted 14 lines · Frank Rowand

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

---
arch/mips/Kconfig | 2 0 + 2 - 0 !

 1 files changed, 2 deletions(-)

Index: linux-2.6.24-rc7/arch/mips/Kconfig
===================================================================

arch/mips/Kconfig config BOOT_ELF64 · line 1006

Quoted 8 lines
arch/mips/Kconfig +0 -2
@@ -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

#4 lore raw
Quoted 19 lines · Steven Rostedt
Quoted 17 lines · Frank Rowand

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

---
arch/mips/Kconfig | 2 0 + 2 - 0 !

 1 files changed, 2 deletions(-)

Index: linux-2.6.24-rc7/arch/mips/Kconfig
===================================================================

arch/mips/Kconfig +0 -0
@@ -1001,8 +1001,6 @@ config BOOT_ELF64
 
 menu "CPU selection"
 
Quoted 8 lines

arch/mips/Kconfig config BOOT_ELF64 · line 1006

Quoted 5 lines
arch/mips/Kconfig +0 -2
-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!!

Quoted 29 lines

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

Quoted 5 lines

...

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.

Quoted 4 lines

-- Steve