Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68efa37d authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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: default avatarIngo Molnar <mingo@elte.hu>
parent 688bcaff

arch/x86/include/asm/debugreg.h

+0 −2
Original line number Diff line number Diff line
@@ -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__ */

arch/x86/kernel/hw_breakpoint.c

+2 −2
Original line number Diff line number Diff line
@@ -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]);
@@ -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
@@ -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);
@@ -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.