summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-22 08:07:54 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-22 08:07:54 -0700
commit991d79b0d1255f89267a350b0048eca59f100cbb (patch)
tree65ddf4160f959952d9f4955fda8844374768b83e /arch/x86
parenta87e84b5cdfacf11af4e8a85c4bca9793658536f (diff)
parent181f7c5dd3832763bdf2756b6d2d8a49bdf12791 (diff)
downloadblackbird-op-linux-991d79b0d1255f89267a350b0048eca59f100cbb.tar.gz
blackbird-op-linux-991d79b0d1255f89267a350b0048eca59f100cbb.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vegard/kmemcheck
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vegard/kmemcheck: kmemcheck: add missing braces to do-while in kmemcheck_annotate_bitfield kmemcheck: update documentation kmemcheck: depend on HAVE_ARCH_KMEMCHECK kmemcheck: remove useless check kmemcheck: remove duplicated #include
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/mm/kmemcheck/kmemcheck.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
index 528bf954eb74..8cc183344140 100644
--- a/arch/x86/mm/kmemcheck/kmemcheck.c
+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
@@ -225,9 +225,6 @@ void kmemcheck_hide(struct pt_regs *regs)
BUG_ON(!irqs_disabled());
- if (data->balance == 0)
- return;
-
if (unlikely(data->balance != 1)) {
kmemcheck_show_all();
kmemcheck_error_save_bug(regs);
OpenPOWER on IntegriCloud