hw-breakpoints, x86: Fix modular KVM build
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>
This commit is contained in:
parent
688bcaff29
commit
68efa37df7
|
@ -96,9 +96,7 @@ static inline int hw_breakpoint_active(void)
|
||||||
|
|
||||||
extern void aout_dump_debugregs(struct user *dump);
|
extern void aout_dump_debugregs(struct user *dump);
|
||||||
|
|
||||||
#ifdef CONFIG_KVM
|
|
||||||
extern void hw_breakpoint_restore(void);
|
extern void hw_breakpoint_restore(void);
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* __KERNEL__ */
|
#endif /* __KERNEL__ */
|
||||||
|
|
||||||
|
|
|
@ -43,6 +43,7 @@
|
||||||
|
|
||||||
/* Per cpu debug control register value */
|
/* Per cpu debug control register value */
|
||||||
DEFINE_PER_CPU(unsigned long, dr7);
|
DEFINE_PER_CPU(unsigned long, dr7);
|
||||||
|
EXPORT_PER_CPU_SYMBOL(dr7);
|
||||||
|
|
||||||
/* Per cpu debug address registers values */
|
/* Per cpu debug address registers values */
|
||||||
static DEFINE_PER_CPU(unsigned long, cpu_debugreg[HBP_NUM]);
|
static DEFINE_PER_CPU(unsigned long, cpu_debugreg[HBP_NUM]);
|
||||||
|
@ -409,6 +410,7 @@ void aout_dump_debugregs(struct user *dump)
|
||||||
|
|
||||||
dump->u_debugreg[7] = dr7;
|
dump->u_debugreg[7] = dr7;
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(aout_dump_debugregs);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Release the user breakpoints used by ptrace
|
* Release the user breakpoints used by ptrace
|
||||||
|
@ -424,7 +426,6 @@ void flush_ptrace_hw_breakpoint(struct task_struct *tsk)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_KVM
|
|
||||||
void hw_breakpoint_restore(void)
|
void hw_breakpoint_restore(void)
|
||||||
{
|
{
|
||||||
set_debugreg(__get_cpu_var(cpu_debugreg[0]), 0);
|
set_debugreg(__get_cpu_var(cpu_debugreg[0]), 0);
|
||||||
|
@ -435,7 +436,6 @@ void hw_breakpoint_restore(void)
|
||||||
set_debugreg(__get_cpu_var(dr7), 7);
|
set_debugreg(__get_cpu_var(dr7), 7);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(hw_breakpoint_restore);
|
EXPORT_SYMBOL_GPL(hw_breakpoint_restore);
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Handle debug exception notifications.
|
* Handle debug exception notifications.
|
||||||
|
|
Loading…
Reference in New Issue