Patchwork sparc: Fix minor SPARC32 compile error

login
register
mail settings
Submitter Julian Calaby
Date Jan. 5, 2009, 1:22 p.m.
Message ID <4962098A.4070508@gmail.com>
Download mbox | patch
Permalink /patch/16610/
State Accepted
Delegated to: David Miller
Headers show

Comments

Julian Calaby - Jan. 5, 2009, 1:22 p.m.
sparc: Fix minor SPARC32 compile error

When CONFIG_PROC_FS is unset, include/linux/interrupt.h defines
init_irq_proc() as an empty function.

arch/sparc/kernel/irq_32.c defines this function unconditionally.

Fix the latter so that it only defines this function when CONFIG_PROC_FS
is set.

This fixes the following error:
arch/sparc/kernel/irq_32.c:672: error: redefinition of 'init_irq_proc'
include/linux/interrupt.h:461: error: previous definition of
'init_irq_proc' was here

This was found using randconfig builds.

Signed-off-by: Julian Calaby <julian.calaby@gmail.com>

---

I understand that this is utterly insignificant, but I can't just let it
slide.

---

Sorry for the dupe, wrong account!

  arch/sparc/kernel/irq_32.c |    2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Jan. 6, 2009, 2:12 a.m.
From: Julian Calaby <julian.calaby@gmail.com>
Date: Tue, 06 Jan 2009 00:22:18 +1100

> sparc: Fix minor SPARC32 compile error
> 
> When CONFIG_PROC_FS is unset, include/linux/interrupt.h defines
> init_irq_proc() as an empty function.
> 
> arch/sparc/kernel/irq_32.c defines this function unconditionally.
> 
> Fix the latter so that it only defines this function when CONFIG_PROC_FS
> is set.
> 
> This fixes the following error:
> arch/sparc/kernel/irq_32.c:672: error: redefinition of 'init_irq_proc'
> include/linux/interrupt.h:461: error: previous definition of
> 'init_irq_proc' was here
> 
> This was found using randconfig builds.
> 
> Signed-off-by: Julian Calaby <julian.calaby@gmail.com>

Applied, thanks a lot Julian.
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/sparc/kernel/irq_32.c b/arch/sparc/kernel/irq_32.c
index f3488c4..1eff942 100644
--- a/arch/sparc/kernel/irq_32.c
+++ b/arch/sparc/kernel/irq_32.c
@@ -669,7 +669,9 @@  void __init init_IRQ(void)
  	btfixup();
  }

+#ifdef CONFIG_PROC_FS
  void init_irq_proc(void)
  {
  	/* For now, nothing... */
  }
+#endif /* CONFIG_PROC_FS */