From 918acd1ff4a9a5a2ee351dec7383261e2fad0fc6 Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Wed, 8 Aug 2012 21:12:19 -0500 Subject: [PATCH] --- yaml --- r: 334163 b: refs/heads/master c: 42c12213141d7c88e8f649b4bacd19ba14577658 h: refs/heads/master i: 334161: 1e1106d87276cdb811d4b7825f5c7789f941160e 334159: 338a82c27d1acc5f128c7a99930947187e40a17c v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/kgdb.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2d0436543103..fdda55c35103 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0a996eeeda214f4293e234df33b29bec003b536 +refs/heads/master: 42c12213141d7c88e8f649b4bacd19ba14577658 diff --git a/trunk/arch/x86/kernel/kgdb.c b/trunk/arch/x86/kernel/kgdb.c index 3f61904365cf..836f8322960e 100644 --- a/trunk/arch/x86/kernel/kgdb.c +++ b/trunk/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,