Skip to content

Commit

Permalink
hw-breakpoints, x86: Fix modular KVM build
Browse files Browse the repository at this point in the history
This build error:

arch/x86/kvm/x86.c:3655: error: implicit declaration of function 'hw_breakpoint_restore'

Happens because in the CONFIG_KVM=m case there's no 'CONFIG_KVM' define
in the kernel - it's CONFIG_KVM_MODULE in that case.

Make the prototype available unconditionally.

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Prasad <prasad@linux.vnet.ibm.com>
LKML-Reference: <1258114575-32655-1-git-send-email-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Ingo Molnar committed Nov 14, 2009
1 parent 688bcaf commit 68efa37
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 0 additions & 2 deletions arch/x86/include/asm/debugreg.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,7 @@ static inline int hw_breakpoint_active(void)

extern void aout_dump_debugregs(struct user *dump);

#ifdef CONFIG_KVM
extern void hw_breakpoint_restore(void);
#endif

#endif /* __KERNEL__ */

Expand Down
4 changes: 2 additions & 2 deletions arch/x86/kernel/hw_breakpoint.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@

/* Per cpu debug control register value */
DEFINE_PER_CPU(unsigned long, dr7);
EXPORT_PER_CPU_SYMBOL(dr7);

/* Per cpu debug address registers values */
static DEFINE_PER_CPU(unsigned long, cpu_debugreg[HBP_NUM]);
Expand Down Expand Up @@ -409,6 +410,7 @@ void aout_dump_debugregs(struct user *dump)

dump->u_debugreg[7] = dr7;
}
EXPORT_SYMBOL_GPL(aout_dump_debugregs);

/*
* Release the user breakpoints used by ptrace
Expand All @@ -424,7 +426,6 @@ void flush_ptrace_hw_breakpoint(struct task_struct *tsk)
}
}

#ifdef CONFIG_KVM
void hw_breakpoint_restore(void)
{
set_debugreg(__get_cpu_var(cpu_debugreg[0]), 0);
Expand All @@ -435,7 +436,6 @@ void hw_breakpoint_restore(void)
set_debugreg(__get_cpu_var(dr7), 7);
}
EXPORT_SYMBOL_GPL(hw_breakpoint_restore);
#endif

/*
* Handle debug exception notifications.
Expand Down

0 comments on commit 68efa37

Please sign in to comment.