[PATCH 0/7] [TRIVIAL] Cleanup spurious CONFIGs

[PATCH 0/7] [TRIVIAL] Cleanup spurious CONFIGs

[Phil Carmody]

Jiri,

I trust these are low-risk enough to be considered 'trivial'.
I noticed a recent typo correction patch to do with a CONFIG,
and immediately presumed that this could be a common type of
error, so went grepping. Many were found, but it wasn't obvious
what to do with all of them. These 7 seemed pretty easy to fix,
though.

Cheers,
Phil

[PATCH 1/7] mn10300: there is no CONFIG_CALIBRATE_DELAY

[Phil Carmody]

There is, however, CONFIG_GENERIC_CALIBRATE_DELAY.

Part of a shotgun patchset; found by greps, seds, and diffs
rather than actual understanding.

Signed-off-by: Phil Carmody <ext-phil.2.carmody@nokia.com>
---
 arch/mn10300/kernel/smp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/mn10300/kernel/smp.c b/arch/mn10300/kernel/smp.c
index 9242e9f..d159b87 100644
--- a/arch/mn10300/kernel/smp.c
+++ b/arch/mn10300/kernel/smp.c
@@ -855,7 +855,7 @@ static void __init smp_callin(void)
 		BUG();
 	}
 
-#ifdef CONFIG_CALIBRATE_DELAY
+#ifdef CONFIG_GENERIC_CALIBRATE_DELAY
 	calibrate_delay();		/* Get our bogomips */
 #endif
 
-- 
1.7.2.5

[PATCH 2/7] cris: there is no CONFIG_ETRAX_KGB_PORT2

[Phil Carmody]

There is, however, CONFIG_ETRAX_KGDB_PORT2

Part of a shotgun patchset; found by greps, seds, and diffs
rather than actual understanding.

Signed-off-by: Phil Carmody <ext-phil.2.carmody@nokia.com>
---
 arch/cris/arch-v32/kernel/irq.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/cris/arch-v32/kernel/irq.c b/arch/cris/arch-v32/kernel/irq.c
index 5ebe6e8..f51ddd4 100644
--- a/arch/cris/arch-v32/kernel/irq.c
+++ b/arch/cris/arch-v32/kernel/irq.c
@@ -35,7 +35,7 @@
 #define IGNOREMASK (1 << (SER0_INTR_VECT - FIRST_IRQ))
 #elif defined(CONFIG_ETRAX_KGDB_PORT1)
 #define IGNOREMASK (1 << (SER1_INTR_VECT - FIRST_IRQ))
-#elif defined(CONFIG_ETRAX_KGB_PORT2)
+#elif defined(CONFIG_ETRAX_KGDB_PORT2)
 #define IGNOREMASK (1 << (SER2_INTR_VECT - FIRST_IRQ))
 #elif defined(CONFIG_ETRAX_KGDB_PORT3)
 #define IGNOREMASK (1 << (SER3_INTR_VECT - FIRST_IRQ))
-- 
1.7.2.5

[PATCH 3/7] xfs: there is no CONFIG_KDB_MODULES

[Phil Carmody]

Seems like there was a decade ago, but no longer, so this block
is dead code. The list being returned disappeared back in commit
ff57ab21995a8636cfc72efeebb09cc6034d756f.

Part of a shotgun patchset; found by greps, seds, and diffs
rather than actual understanding.

Signed-off-by: Phil Carmody <ext-phil.2.carmody@nokia.com>
---
 fs/xfs/linux-2.6/xfs_buf.c |    8 --------
 fs/xfs/linux-2.6/xfs_buf.h |    4 ----
 2 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c
index 5e68099..5bccae0 100644
--- a/fs/xfs/linux-2.6/xfs_buf.c
+++ b/fs/xfs/linux-2.6/xfs_buf.c
@@ -1889,11 +1889,3 @@ xfs_buf_terminate(void)
 	destroy_workqueue(xfslogd_workqueue);
 	kmem_zone_destroy(xfs_buf_zone);
 }
-
-#ifdef CONFIG_KDB_MODULES
-struct list_head *
-xfs_get_buftarg_list(void)
-{
-	return &xfs_buftarg_list;
-}
-#endif
diff --git a/fs/xfs/linux-2.6/xfs_buf.h b/fs/xfs/linux-2.6/xfs_buf.h
index 50a7d5f..6881321 100644
--- a/fs/xfs/linux-2.6/xfs_buf.h
+++ b/fs/xfs/linux-2.6/xfs_buf.h
@@ -339,10 +339,6 @@ extern void xfs_wait_buftarg(xfs_buftarg_t *);
 extern int xfs_setsize_buftarg(xfs_buftarg_t *, unsigned int, unsigned int);
 extern int xfs_flush_buftarg(xfs_buftarg_t *, int);
 
-#ifdef CONFIG_KDB_MODULES
-extern struct list_head *xfs_get_buftarg_list(void);
-#endif
-
 #define xfs_getsize_buftarg(buftarg)	block_size((buftarg)->bt_bdev)
 #define xfs_readonly_buftarg(buftarg)	bdev_read_only((buftarg)->bt_bdev)
 
-- 
1.7.2.5

[PATCH 4/7] ppc: there is no CONFIG_PPC47x

[Phil Carmody]

There is, however, CONFIG_PPC_47x.

Part of a shotgun patchset; found by greps, seds, and diffs
rather than actual understanding.

Signed-off-by: Phil Carmody <ext-phil.2.carmody@nokia.com>
---
 arch/powerpc/mm/44x_mmu.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/mm/44x_mmu.c b/arch/powerpc/mm/44x_mmu.c
index 024acab..c95d6be 100644
--- a/arch/powerpc/mm/44x_mmu.c
+++ b/arch/powerpc/mm/44x_mmu.c
@@ -78,7 +78,7 @@ static void __init ppc44x_pin_tlb(unsigned int virt, unsigned int phys)
 		"tlbwe	%1,%3,%5\n"
 		"tlbwe	%0,%3,%6\n"
 	:
-#ifdef CONFIG_PPC47x
+#ifdef CONFIG_PPC_47x
 	: "r" (PPC47x_TLB2_S_RWX),
 #else
 	: "r" (PPC44x_TLB_SW | PPC44x_TLB_SR | PPC44x_TLB_SX | PPC44x_TLB_G),
-- 
1.7.2.5

[PATCH 5/7] ppc: there is no CONFIG_PPC_CPU

[Phil Carmody]

There is, however, CONFIG_PPC_FPU. Seems to be a typo introduced
in cd64d1697cf079bb8a67766e36e88ced38498933.

Part of a shotgun patchset; found by greps, seds, and diffs
rather than actual understanding.

Signed-off-by: Phil Carmody <ext-phil.2.carmody@nokia.com>
---
 arch/powerpc/lib/sstep.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c
index 9a52349..e3b28e3 100644
--- a/arch/powerpc/lib/sstep.c
+++ b/arch/powerpc/lib/sstep.c
@@ -1395,7 +1395,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
 				regs->gpr[rd] = byterev_4(val);
 			goto ldst_done;
 
-#ifdef CONFIG_PPC_CPU
+#ifdef CONFIG_PPC_FPU
 		case 535:	/* lfsx */
 		case 567:	/* lfsux */
 			if (!(regs->msr & MSR_FP))
-- 
1.7.2.5

[PATCH 6/7] nommu: there is no CONFIG_SMALL_TASKS

[Phil Carmody]

So this is dead code. That, and it appears KTHREAD_SIZE
isn't used anywhere else in the kernel, so purging the
whole if/else.

Part of a shotgun patchset; found by greps, seds, and diffs
rather than actual understanding.

Signed-off-by: Phil Carmody <ext-phil.2.carmody@nokia.com>
---
 arch/arm/include/asm/page-nommu.h |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/arch/arm/include/asm/page-nommu.h b/arch/arm/include/asm/page-nommu.h
index d1b162a..58da8b2 100644
--- a/arch/arm/include/asm/page-nommu.h
+++ b/arch/arm/include/asm/page-nommu.h
@@ -11,12 +11,6 @@
 #ifndef _ASMARM_PAGE_NOMMU_H
 #define _ASMARM_PAGE_NOMMU_H
 
-#if !defined(CONFIG_SMALL_TASKS) && PAGE_SHIFT < 13
-#define KTHREAD_SIZE (8192)
-#else
-#define KTHREAD_SIZE PAGE_SIZE
-#endif
- 
 #define get_user_page(vaddr)		__get_free_page(GFP_KERNEL)
 #define free_user_page(page, addr)	free_page(addr)
 
-- 
1.7.2.5

[PATCH 7/7] xtensa: there is no CONFIG_UNALIGNED_USER

[Phil Carmody]

There is, however, CONFIG_XTENSE_UNALIGNED_USER.

Part of a shotgun patchset; found by greps, seds, and diffs
rather than actual understanding.

Signed-off-by: Phil Carmody <ext-phil.2.carmody@nokia.com>
---
 arch/xtensa/kernel/traps.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c
index e64efac..993c0dd 100644
--- a/arch/xtensa/kernel/traps.c
+++ b/arch/xtensa/kernel/traps.c
@@ -97,7 +97,7 @@ static dispatch_init_table_t __initdata dispatch_init_table[] = {
 /* EXCCAUSE_INTEGER_DIVIDE_BY_ZERO unhandled */
 /* EXCCAUSE_PRIVILEGED unhandled */
 #if XCHAL_UNALIGNED_LOAD_EXCEPTION || XCHAL_UNALIGNED_STORE_EXCEPTION
-#ifdef CONFIG_UNALIGNED_USER
+#ifdef CONFIG_XTENSA_UNALIGNED_USER
 { EXCCAUSE_UNALIGNED,		USER,	   fast_unaligned },
 #else
 { EXCCAUSE_UNALIGNED,		0,	   do_unaligned_user },
@@ -239,12 +239,12 @@ do_illegal_instruction(struct pt_regs *regs)
 /*
  * Handle unaligned memory accesses from user space. Kill task.
  *
- * If CONFIG_UNALIGNED_USER is not set, we don't allow unaligned memory
+ * If CONFIG_XTENSA_UNALIGNED_USER is not set, we don't allow unaligned memory
  * accesses causes from user space.
  */
 
 #if XCHAL_UNALIGNED_LOAD_EXCEPTION || XCHAL_UNALIGNED_STORE_EXCEPTION
-#ifndef CONFIG_UNALIGNED_USER
+#ifndef CONFIG_XTENSA_UNALIGNED_USER
 void
 do_unaligned_user (struct pt_regs *regs)
 {
-- 
1.7.2.5

Re: [PATCH 3/7] xfs: there is no CONFIG_KDB_MODULES

[Dave Chinner]

On Sun, Jul 03, 2011 at 12:47:48AM +0300, Phil Carmody wrote:

Hi Phil,

You should probably cc the relevant lists with such patchsets so the
developers actually see the patches go by....

> Seems like there was a decade ago, but no longer, so this block
> is dead code. The list being returned disappeared back in commit
> ff57ab21995a8636cfc72efeebb09cc6034d756f.

When you quote a commit, short form followed by the name (i.e.
one-line form) is preferable because it gives context to the commit
without needing to go look it up in a git tree. Commit IDs are not
human readable, while commit log should be.

The commit in question - ff57ab2 ("xfs: convert xfsbud shrinker to a
per-buftarg shrinker.") - removed the list but the code being
removed was already long dead. FWIW, I know just by reading the
commit description when the list went away and who was responsible
for missing that. i.e. me. ;)

> Part of a shotgun patchset; found by greps, seds, and diffs
> rather than actual understanding.

Not necessary in a commit description - the zero patch of a series,
yes, to describe how the issues were found, but it doesn't need to
be recorded forever in the commit log. ;)

> Signed-off-by: Phil Carmody <ext-phil.2.carmody@nokia.com>
> ---
>  fs/xfs/linux-2.6/xfs_buf.c |    8 --------
>  fs/xfs/linux-2.6/xfs_buf.h |    4 ----
>  2 files changed, 0 insertions(+), 12 deletions(-)
> 
> diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c
> index 5e68099..5bccae0 100644
> --- a/fs/xfs/linux-2.6/xfs_buf.c
> +++ b/fs/xfs/linux-2.6/xfs_buf.c
> @@ -1889,11 +1889,3 @@ xfs_buf_terminate(void)
>  	destroy_workqueue(xfslogd_workqueue);
>  	kmem_zone_destroy(xfs_buf_zone);
>  }
> -
> -#ifdef CONFIG_KDB_MODULES
> -struct list_head *
> -xfs_get_buftarg_list(void)
> -{
> -	return &xfs_buftarg_list;
> -}
> -#endif
> diff --git a/fs/xfs/linux-2.6/xfs_buf.h b/fs/xfs/linux-2.6/xfs_buf.h
> index 50a7d5f..6881321 100644
> --- a/fs/xfs/linux-2.6/xfs_buf.h
> +++ b/fs/xfs/linux-2.6/xfs_buf.h
> @@ -339,10 +339,6 @@ extern void xfs_wait_buftarg(xfs_buftarg_t *);
>  extern int xfs_setsize_buftarg(xfs_buftarg_t *, unsigned int, unsigned int);
>  extern int xfs_flush_buftarg(xfs_buftarg_t *, int);
>  
> -#ifdef CONFIG_KDB_MODULES
> -extern struct list_head *xfs_get_buftarg_list(void);
> -#endif
> -
>  #define xfs_getsize_buftarg(buftarg)	block_size((buftarg)->bt_bdev)
>  #define xfs_readonly_buftarg(buftarg)	bdev_read_only((buftarg)->bt_bdev)

Code changes look good. Can you fix the commit description and
resend to xfs@oss.sgi.com?

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

Re: [PATCH 3/7] xfs: there is no CONFIG_KDB_MODULES

[Phil Carmody]

On 04/07/11 14:58 +1000, ext Dave Chinner wrote:
> On Sun, Jul 03, 2011 at 12:47:48AM +0300, Phil Carmody wrote:
> 
> Hi Phil,
> 
> You should probably cc the relevant lists with such patchsets so the
> developers actually see the patches go by....

Yeah, I was wondering how to do that. The idea of cc:ing about 30
people for the whole set seemed a bit too spammy, and wasn't sure if
individually-selected cc:lists for eack of the patches made sense.
The alternative was to make it 7 (or more...) independent patchsets, 
but that turned the task into too much of a game of chess. I chickened 
out of thinking more, and cowardly went for the 'trivial' route.

I realised after sending that a truly trivial patch still hadn't 
been done - there are a whole bunch of comments or printk strings
that refer to the wrong options that I forgot to fix. So there
will be a v2.

> > Seems like there was a decade ago, but no longer, so this block
> > is dead code. The list being returned disappeared back in commit
> > ff57ab21995a8636cfc72efeebb09cc6034d756f.
> 
> When you quote a commit, short form followed by the name (i.e.
> one-line form) is preferable because it gives context to the commit
> without needing to go look it up in a git tree. Commit IDs are not
> human readable, while commit log should be.

Yup, good point, I can clean that up.
 
> The commit in question - ff57ab2 ("xfs: convert xfsbud shrinker to a
> per-buftarg shrinker.") - removed the list but the code being
> removed was already long dead. FWIW, I know just by reading the
> commit description when the list went away and who was responsible
> for missing that. i.e. me. ;)
> 
> > Part of a shotgun patchset; found by greps, seds, and diffs
> > rather than actual understanding.
> 
> Not necessary in a commit description - the zero patch of a series,
> yes, to describe how the issues were found, but it doesn't need to
> be recorded forever in the commit log. ;)

Sure. Thanks for the feedback, and look forward to v2!

Phil

> > Signed-off-by: Phil Carmody <ext-phil.2.carmody@nokia.com>
> > ---
> >  fs/xfs/linux-2.6/xfs_buf.c |    8 --------
> >  fs/xfs/linux-2.6/xfs_buf.h |    4 ----
> >  2 files changed, 0 insertions(+), 12 deletions(-)
> > 
> > diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c
> > index 5e68099..5bccae0 100644
> > --- a/fs/xfs/linux-2.6/xfs_buf.c
> > +++ b/fs/xfs/linux-2.6/xfs_buf.c
> > @@ -1889,11 +1889,3 @@ xfs_buf_terminate(void)
> >  	destroy_workqueue(xfslogd_workqueue);
> >  	kmem_zone_destroy(xfs_buf_zone);
> >  }
> > -
> > -#ifdef CONFIG_KDB_MODULES
> > -struct list_head *
> > -xfs_get_buftarg_list(void)
> > -{
> > -	return &xfs_buftarg_list;
> > -}
> > -#endif
> > diff --git a/fs/xfs/linux-2.6/xfs_buf.h b/fs/xfs/linux-2.6/xfs_buf.h
> > index 50a7d5f..6881321 100644
> > --- a/fs/xfs/linux-2.6/xfs_buf.h
> > +++ b/fs/xfs/linux-2.6/xfs_buf.h
> > @@ -339,10 +339,6 @@ extern void xfs_wait_buftarg(xfs_buftarg_t *);
> >  extern int xfs_setsize_buftarg(xfs_buftarg_t *, unsigned int, unsigned int);
> >  extern int xfs_flush_buftarg(xfs_buftarg_t *, int);
> >  
> > -#ifdef CONFIG_KDB_MODULES
> > -extern struct list_head *xfs_get_buftarg_list(void);
> > -#endif
> > -
> >  #define xfs_getsize_buftarg(buftarg)	block_size((buftarg)->bt_bdev)
> >  #define xfs_readonly_buftarg(buftarg)	bdev_read_only((buftarg)->bt_bdev)
> 
> Code changes look good. Can you fix the commit description and
> resend to xfs@oss.sgi.com?
> 
> Cheers,
> 
> Dave.
> -- 
> Dave Chinner
> david@fromorbit.com

Re: [PATCH 3/7] xfs: there is no CONFIG_KDB_MODULES

[Lukasz]

Phil Carmody <ext-phil.2.carmody <at> nokia.com> writes:

 
> Yeah, I was wondering how to do that. The idea of cc:ing about 30
> people for the whole set seemed a bit too spammy, and wasn't sure if
> individually-selected cc:lists for eack of the patches made sense.
> The alternative was to make it 7 (or more...) independent patchsets, 
> but that turned the task into too much of a game of chess. I chickened 
> out of thinking more, and cowardly went for the 'trivial' route.
> 

There is a script that parses MAINTAINERS (and AFAIR not only that) that
gives you a list of people responsible (and their emails) :)
( linux/scripts/get_maintainer.pl )

L.