From 1bdbda8c33e76c91d2f19e7c8c11f4df1b28d9cc Mon Sep 17 00:00:00 2001
From: Steven Cole <elenstev@mesatop.com>
Date: Mon, 12 May 2003 05:56:54 -0700
Subject: [PATCH] Use '#ifdef' to test for CONFIG_xxx variables

Don't depend on undefined preprocessor symbols evaluating to zero.
---
 kernel/exit.c   |  2 +-
 kernel/ksyms.c  |  6 +++---
 kernel/sched.c  | 10 +++++-----
 kernel/signal.c |  4 ++--
 kernel/timer.c  |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'kernel')

diff --git a/kernel/exit.c b/kernel/exit.c
index b393a46247c4..c4130eb03ca1 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -756,7 +756,7 @@ task_t *next_thread(task_t *p)
 	struct pid_link *link = p->pids + PIDTYPE_TGID;
 	struct list_head *tmp, *head = &link->pidptr->task_list;
 
-#if CONFIG_SMP
+#ifdef CONFIG_SMP
 	if (!p->sighand)
 		BUG();
 	if (!spin_is_locked(&p->sighand->siglock) &&
diff --git a/kernel/ksyms.c b/kernel/ksyms.c
index 07ff11d7b6d2..cd8f9810ddc9 100644
--- a/kernel/ksyms.c
+++ b/kernel/ksyms.c
@@ -447,7 +447,7 @@ EXPORT_SYMBOL(iomem_resource);
 EXPORT_SYMBOL(complete_and_exit);
 EXPORT_SYMBOL(default_wake_function);
 EXPORT_SYMBOL(__wake_up);
-#if CONFIG_SMP
+#ifdef CONFIG_SMP
 EXPORT_SYMBOL_GPL(__wake_up_sync); /* internal use only */
 #endif
 EXPORT_SYMBOL(wake_up_process);
@@ -465,10 +465,10 @@ EXPORT_SYMBOL(__cond_resched);
 EXPORT_SYMBOL(set_user_nice);
 EXPORT_SYMBOL(task_nice);
 EXPORT_SYMBOL_GPL(idle_cpu);
-#if CONFIG_SMP
+#ifdef CONFIG_SMP
 EXPORT_SYMBOL_GPL(set_cpus_allowed);
 #endif
-#if CONFIG_SMP || CONFIG_PREEMPT
+#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
 EXPORT_SYMBOL(kernel_flag);
 #endif
 EXPORT_SYMBOL(jiffies);
diff --git a/kernel/sched.c b/kernel/sched.c
index 97bbf5eddd5b..1b43c81a49ed 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -863,7 +863,7 @@ static int find_busiest_node(int this_node)
 
 #endif /* CONFIG_NUMA */
 
-#if CONFIG_SMP
+#ifdef CONFIG_SMP
 
 /*
  * double_lock_balance - lock the busiest runqueue
@@ -1309,7 +1309,7 @@ need_resched:
 	}
 pick_next_task:
 	if (unlikely(!rq->nr_running)) {
-#if CONFIG_SMP
+#ifdef CONFIG_SMP
 		load_balance(rq, 1, cpu_to_node_mask(smp_processor_id()));
 		if (rq->nr_running)
 			goto pick_next_task;
@@ -1440,7 +1440,7 @@ void __wake_up_locked(wait_queue_head_t *q, unsigned int mode)
 	__wake_up_common(q, mode, 1, 0);
 }
 
-#if CONFIG_SMP
+#ifdef CONFIG_SMP
 
 /**
  * __wake_up - sync- wake up threads blocked on a waitqueue.
@@ -2261,7 +2261,7 @@ void __init init_idle(task_t *idle, int cpu)
 #endif
 }
 
-#if CONFIG_SMP
+#ifdef CONFIG_SMP
 /*
  * This is how migration works:
  *
@@ -2443,7 +2443,7 @@ __init int migration_init(void)
 
 #endif
 
-#if CONFIG_SMP || CONFIG_PREEMPT
+#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
 /*
  * The 'big kernel lock'
  *
diff --git a/kernel/signal.c b/kernel/signal.c
index dae415f8785a..0baa17479014 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -761,7 +761,7 @@ specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
 
 	if (!irqs_disabled())
 		BUG();
-#if CONFIG_SMP
+#ifdef CONFIG_SMP
 	if (!spin_is_locked(&t->sighand->siglock))
 		BUG();
 #endif
@@ -846,7 +846,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
 	unsigned int mask;
 	int ret = 0;
 
-#if CONFIG_SMP
+#ifdef CONFIG_SMP
 	if (!spin_is_locked(&p->sighand->siglock))
 		BUG();
 #endif
diff --git a/kernel/timer.c b/kernel/timer.c
index caa37716f860..7461b8897e70 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -905,7 +905,7 @@ asmlinkage long sys_getppid(void)
 	parent = me->group_leader->real_parent;
 	for (;;) {
 		pid = parent->tgid;
-#if CONFIG_SMP
+#ifdef CONFIG_SMP
 {
 		struct task_struct *old = parent;
 
-- 
cgit v1.2.3