2012-05-18 17:16:26

by Anna-Maria Gleixner

Subject: [patch 20/24] sparc: Use: generic time config

Signed-off-by: Anna-Maria Gleixner <[email protected]>
Cc: "David S. Miller" <[email protected]>
---
arch/sparc/Kconfig | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)

Index: linux/arch/sparc/Kconfig
===================================================================
--- linux.orig/arch/sparc/Kconfig
+++ linux/arch/sparc/Kconfig
@@ -30,11 +30,13 @@ config SPARC
select USE_GENERIC_SMP_HELPERS if SMP
select GENERIC_PCI_IOMAP
select HAVE_NMI_WATCHDOG if SPARC64
+ select GENERIC_CMOS_UPDATE

config SPARC32
def_bool !64BIT
select GENERIC_ATOMIC64
select CLZ_TAB
+ select ARCH_USES_GETTIMEOFFSET

config SPARC64
def_bool 64BIT
@@ -61,6 +63,7 @@ config SPARC64
select IRQ_PREFLOW_FASTEOI
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select HAVE_C_RECORDMCOUNT
+ select GENERIC_CLOCKEVENTS

config ARCH_DEFCONFIG
string
@@ -73,18 +76,6 @@ config BITS
default 32 if SPARC32
default 64 if SPARC64

-config ARCH_USES_GETTIMEOFFSET
- bool
- default y if SPARC32
-
-config GENERIC_CMOS_UPDATE
- bool
- default y
-
-config GENERIC_CLOCKEVENTS
- bool
- default y if SPARC64
-
config IOMMU_HELPER
bool
default y if SPARC64

2012-05-18 17:50:45

by Sam Ravnborg

Subject: Re: [patch 20/24] sparc: Use: generic time config

Hi Anna-Maria.

I really like the cleanup provided by this patch-set, but..

On Fri, May 18, 2012 at 04:45:54PM -0000, Anna-Maria Gleixner wrote:
> Signed-off-by: Anna-Maria Gleixner <[email protected]>
> Cc: "David S. Miller" <[email protected]>
> ---
> arch/sparc/Kconfig | 15 +++------------
> 1 file changed, 3 insertions(+), 12 deletions(-)
>
> Index: linux/arch/sparc/Kconfig
> ===================================================================
> --- linux.orig/arch/sparc/Kconfig
> +++ linux/arch/sparc/Kconfig
> @@ -30,11 +30,13 @@ config SPARC
> select USE_GENERIC_SMP_HELPERS if SMP
> select GENERIC_PCI_IOMAP
> select HAVE_NMI_WATCHDOG if SPARC64
> + select GENERIC_CMOS_UPDATE

I do not see where we define the GENERIC_CMOS_UPDATE symbol,
so this looks wrong.

I looked only in upstream - and I did not look
in -tip.

Sam

2012-05-18 17:55:48

by David Miller

Subject: Re: [patch 20/24] sparc: Use: generic time config

From: Sam Ravnborg <[email protected]>
Date: Fri, 18 May 2012 19:50:41 +0200

> On Fri, May 18, 2012 at 04:45:54PM -0000, Anna-Maria Gleixner wrote:
>> Index: linux/arch/sparc/Kconfig
>> ===================================================================
>> --- linux.orig/arch/sparc/Kconfig
>> +++ linux/arch/sparc/Kconfig
>> @@ -30,11 +30,13 @@ config SPARC
>> select USE_GENERIC_SMP_HELPERS if SMP
>> select GENERIC_PCI_IOMAP
>> select HAVE_NMI_WATCHDOG if SPARC64
>> + select GENERIC_CMOS_UPDATE
>
> I do not see where we define the GENERIC_CMOS_UPDATE symbol,
> so this looks wrong.
>
> I looked only in upstream - and I did not look
> in -tip.

On top of that, I get the impression that this patch series is not
bisectable at all.

2012-05-18 18:52:34

by Sam Ravnborg

Subject: Re: [patch 20/24] sparc: Use: generic time config

On Fri, May 18, 2012 at 01:53:35PM -0400, David Miller wrote:
> From: Sam Ravnborg <[email protected]>
> Date: Fri, 18 May 2012 19:50:41 +0200
>
> > On Fri, May 18, 2012 at 04:45:54PM -0000, Anna-Maria Gleixner wrote:
> >> Index: linux/arch/sparc/Kconfig
> >> ===================================================================
> >> --- linux.orig/arch/sparc/Kconfig
> >> +++ linux/arch/sparc/Kconfig
> >> @@ -30,11 +30,13 @@ config SPARC
> >> select USE_GENERIC_SMP_HELPERS if SMP
> >> select GENERIC_PCI_IOMAP
> >> select HAVE_NMI_WATCHDOG if SPARC64
> >> + select GENERIC_CMOS_UPDATE
> >
> > I do not see where we define the GENERIC_CMOS_UPDATE symbol,
> > so this looks wrong.
> >
> > I looked only in upstream - and I did not look
> > in -tip.
>
> On top of that, I get the impression that this patch series is not
> bisectable at all.

I should be bisectable.

The first patch introduce the symbols with the default value n.
But kconfig will use the "highest" value is see, independent on
the order.

So the following fragment:

config FOO
def_bool y

config FOO
bool

config BAR
bool "BAR"

produces a CONFIG_FOO == y.

And for good measure I also tried with the two
"config FOO" symbols reversed and this produced identical output.

So unless I overlooked something it should be bisectable.

Sam

2012-05-20 16:52:48

by Sam Ravnborg

Subject: Re: [patch 20/24] sparc: Use: generic time config

On Fri, May 18, 2012 at 07:50:41PM +0200, Sam Ravnborg wrote:
> Hi Anna-Maria.
>
> I really like the cleanup provided by this patch-set, but..
>
> On Fri, May 18, 2012 at 04:45:54PM -0000, Anna-Maria Gleixner wrote:
> > Signed-off-by: Anna-Maria Gleixner <[email protected]>
> > Cc: "David S. Miller" <[email protected]>
> > ---
> > arch/sparc/Kconfig | 15 +++------------
> > 1 file changed, 3 insertions(+), 12 deletions(-)
> >
> > Index: linux/arch/sparc/Kconfig
> > ===================================================================
> > --- linux.orig/arch/sparc/Kconfig
> > +++ linux/arch/sparc/Kconfig
> > @@ -30,11 +30,13 @@ config SPARC
> > select USE_GENERIC_SMP_HELPERS if SMP
> > select GENERIC_PCI_IOMAP
> > select HAVE_NMI_WATCHDOG if SPARC64
> > + select GENERIC_CMOS_UPDATE
>
> I do not see where we define the GENERIC_CMOS_UPDATE symbol,
> so this looks wrong.

Whit the updated 01/24 patch you can add my:

Acked-by: Sam Ravnborg <[email protected]>

Sam

2012-05-21 09:24:13

by Anna-Maria Gleixner

Subject: [tip:timers/core] sparc: Use: generic time config

Commit-ID: ded1cc5cfc3b4bc007fe3bb8fbfd9e66d8d667d7
Gitweb: http://git.kernel.org/tip/ded1cc5cfc3b4bc007fe3bb8fbfd9e66d8d667d7
Author: Anna-Maria Gleixner <[email protected]>
AuthorDate: Fri, 18 May 2012 16:45:54 +0000
Committer: Thomas Gleixner <[email protected]>
CommitDate: Mon, 21 May 2012 11:01:44 +0200

sparc: Use: generic time config

Signed-off-by: Anna-Maria Gleixner <[email protected]>
Cc: David S. Miller <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Acked-by: Sam Ravnborg <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
---
arch/sparc/Kconfig | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 6c0683d..33399d3 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -30,11 +30,13 @@ config SPARC
select USE_GENERIC_SMP_HELPERS if SMP
select GENERIC_PCI_IOMAP
select HAVE_NMI_WATCHDOG if SPARC64
+ select GENERIC_CMOS_UPDATE

config SPARC32
def_bool !64BIT
select GENERIC_ATOMIC64
select CLZ_TAB
+ select ARCH_USES_GETTIMEOFFSET

config SPARC64
def_bool 64BIT
@@ -61,6 +63,7 @@ config SPARC64
select IRQ_PREFLOW_FASTEOI
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select HAVE_C_RECORDMCOUNT
+ select GENERIC_CLOCKEVENTS

config ARCH_DEFCONFIG
string
@@ -73,18 +76,6 @@ config BITS
default 32 if SPARC32
default 64 if SPARC64

-config ARCH_USES_GETTIMEOFFSET
- bool
- default y if SPARC32
-
-config GENERIC_CMOS_UPDATE
- bool
- default y
-
-config GENERIC_CLOCKEVENTS
- bool
- default y if SPARC64
-
config IOMMU_HELPER
bool
default y if SPARC64