From c2034d8205674daa954ee314f93270f39b90148f Mon Sep 17 00:00:00 2001
From: Bjoern Brandenburg <bbb@mpi-sws.org>
Date: Tue, 26 Jun 2012 10:02:52 +0200
Subject: P-FP: fix build bug if !CONFIG_RELEASE_MASTER

Move declaration of 'cpu' out of #ifdef block, it's also needed for
CONFIG_LITMUS_LOCKING.
---
 litmus/sched_pfp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/litmus/sched_pfp.c b/litmus/sched_pfp.c
index 42d17b0c08fd..3f1fb03f0c35 100644
--- a/litmus/sched_pfp.c
+++ b/litmus/sched_pfp.c
@@ -1621,9 +1621,11 @@ static long pfp_admit_task(struct task_struct* tsk)
 
 static long pfp_activate_plugin(void)
 {
-#ifdef CONFIG_RELEASE_MASTER
+#if defined(CONFIG_RELEASE_MASTER) || defined(CONFIG_LITMUS_LOCKING)
 	int cpu;
+#endif
 
+#ifdef CONFIG_RELEASE_MASTER
 	for_each_online_cpu(cpu) {
 		remote_dom(cpu)->release_master = atomic_read(&release_master_cpu);
 	}
-- 
cgit v1.2.2