---

yaml --- r: 252216 b: refs/heads/master c: b07c901 h: refs/heads/master v: v3
git-mirror · May 26, 2011 · 9bb0a04 · 9bb0a04
1 parent 810d62e
commit 9bb0a04
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7683f7444875c822f48f03a9f9c8b1b1e98b2ef0
+refs/heads/master: b07c9015efcde71ed929ce5ded0268630bb1c95e
diff --git a/trunk/arch/s390/oprofile/hwsampler.c b/trunk/arch/s390/oprofile/hwsampler.c
@@ -580,7 +580,7 @@ static int hws_cpu_callback(struct notifier_block *nfb,
 {
 	/* We do not have sampler space available for all possible CPUs.
 	   All CPUs should be online when hw sampling is activated. */
-	return NOTIFY_BAD;
+	return (hws_state <= HWS_DEALLOCATED) ? NOTIFY_OK : NOTIFY_BAD;
 }
 
 static struct notifier_block hws_cpu_notifier = {