git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
debugreg.h
diff --git
a/arch/x86/include/asm/debugreg.h
b/arch/x86/include/asm/debugreg.h
index
b81002f
..
078ad0c
100644
(file)
--- a/
arch/x86/include/asm/debugreg.h
+++ b/
arch/x86/include/asm/debugreg.h
@@
-94,7
+94,7
@@
static inline void hw_breakpoint_disable(void)
static inline int hw_breakpoint_active(void)
{
- return __
get_cpu_var
(cpu_dr7) & DR_GLOBAL_ENABLE_MASK;
+ return __
this_cpu_read
(cpu_dr7) & DR_GLOBAL_ENABLE_MASK;
}
extern void aout_dump_debugregs(struct user *dump);