public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] kgdb: Fix warning with !CONFIG_DEBUG_RODATA
@ 2012-09-21 20:59 Andi Kleen
  2012-09-21 21:01 ` Jason Wessel
  0 siblings, 1 reply; 3+ messages in thread
From: Andi Kleen @ 2012-09-21 20:59 UTC (permalink / raw)
  To: jason.wessel; +Cc: linux-kernel, Andi Kleen

From: Andi Kleen <ak@linux.intel.com>

Fixes

arch/x86/kernel/kgdb.c: In function ‘kgdb_arch_set_breakpoint’:
arch/x86/kernel/kgdb.c:749:7: warning: unused variable ‘opc’ [-Wunused-variable]

when CONFIG_DEBUG_RODATA is not defined.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
 arch/x86/kernel/kgdb.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
index 3f61904..0e4badd 100644
--- a/arch/x86/kernel/kgdb.c
+++ b/arch/x86/kernel/kgdb.c
@@ -746,7 +746,9 @@ void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long ip)
 int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
 {
 	int err;
+#ifdef CONFIG_DEBUG_RODATA
 	char opc[BREAK_INSTR_SIZE];
+#endif
 
 	bpt->type = BP_BREAKPOINT;
 	err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
-- 
1.7.7.6


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] kgdb: Fix warning with !CONFIG_DEBUG_RODATA
  2012-09-21 20:59 [PATCH] kgdb: Fix warning with !CONFIG_DEBUG_RODATA Andi Kleen
@ 2012-09-21 21:01 ` Jason Wessel
  2012-09-21 21:06   ` Andi Kleen
  0 siblings, 1 reply; 3+ messages in thread
From: Jason Wessel @ 2012-09-21 21:01 UTC (permalink / raw)
  To: Andi Kleen; +Cc: linux-kernel, Andi Kleen

On 09/21/2012 03:59 PM, Andi Kleen wrote:
> From: Andi Kleen <ak@linux.intel.com>
> 
> Fixes
> 
> arch/x86/kernel/kgdb.c: In function ‘kgdb_arch_set_breakpoint’:
> arch/x86/kernel/kgdb.c:749:7: warning: unused variable ‘opc’ [-Wunused-variable]
> 
> when CONFIG_DEBUG_RODATA is not defined.
> 

This is already pending along with other fixes in kgdb-next / linux next for the 3.7 merge window.

Jason.

--
commit 9a15c35d16cf76482be076125f631f1193e29413
Author: Jason Wessel <jason.wessel@windriver.com>
Date:   Wed Aug 8 21:12:19 2012 -0500

    kgdb,x86: fix warning about unused variable
    
    When compiling without CONFIG_DEBUG_RODATA the following
    compiler warning is generated:
    
    arch/x86/kernel/kgdb.c: In function 'kgdb_arch_set_breakpoint':
    arch/x86/kernel/kgdb.c:749: warning: unused variable 'opc'
    
    The variable instantiation needs to be inside the #ifdef to
    make the warning go away.
    
    Reported-by: Thiago Rafael Becker <trbecker@trbecker.org>
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>

diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
index 3f61904..836f832 100644
--- a/arch/x86/kernel/kgdb.c
+++ b/arch/x86/kernel/kgdb.c
@@ -746,7 +746,9 @@ void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long ip
 int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
 {
        int err;
+#ifdef CONFIG_DEBUG_RODATA
        char opc[BREAK_INSTR_SIZE];
+#endif /* CONFIG_DEBUG_RODATA */
 
        bpt->type = BP_BREAKPOINT;
        err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] kgdb: Fix warning with !CONFIG_DEBUG_RODATA
  2012-09-21 21:01 ` Jason Wessel
@ 2012-09-21 21:06   ` Andi Kleen
  0 siblings, 0 replies; 3+ messages in thread
From: Andi Kleen @ 2012-09-21 21:06 UTC (permalink / raw)
  To: Jason Wessel; +Cc: Andi Kleen, linux-kernel

On Fri, Sep 21, 2012 at 04:01:55PM -0500, Jason Wessel wrote:
> On 09/21/2012 03:59 PM, Andi Kleen wrote:
> > From: Andi Kleen <ak@linux.intel.com>
> > 
> > Fixes
> > 
> > arch/x86/kernel/kgdb.c: In function ‘kgdb_arch_set_breakpoint’:
> > arch/x86/kernel/kgdb.c:749:7: warning: unused variable ‘opc’ [-Wunused-variable]
> > 
> > when CONFIG_DEBUG_RODATA is not defined.
> > 
> 
> This is already pending along with other fixes in kgdb-next / linux next for the 3.7 merge window.

Ok.  This was broken in 3.5 too. Next time please fast track warning fixes.

It's about the only warning in my standard builds.

-Andi

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-09-21 21:06 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-21 20:59 [PATCH] kgdb: Fix warning with !CONFIG_DEBUG_RODATA Andi Kleen
2012-09-21 21:01 ` Jason Wessel
2012-09-21 21:06   ` Andi Kleen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox