git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Staging: Merge staging-next into Linus's tree
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
include
/
asm
/
cputable.h
diff --git
a/arch/powerpc/include/asm/cputable.h
b/arch/powerpc/include/asm/cputable.h
index b0b21134f61a8f6fb30305b46d4f2cd07aae132f..5e2e2cfcc81b5014737947c566a1670bae3d9735 100644
(file)
--- a/
arch/powerpc/include/asm/cputable.h
+++ b/
arch/powerpc/include/asm/cputable.h
@@
-517,6
+517,10
@@
static inline int cpu_has_feature(unsigned long feature)
& feature);
}
& feature);
}
+#ifdef CONFIG_HAVE_HW_BREAKPOINT
+#define HBP_NUM 1
+#endif /* CONFIG_HAVE_HW_BREAKPOINT */
+
#endif /* !__ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif /* !__ASSEMBLY__ */
#endif /* __KERNEL__ */