change cpu_is_online() to cpu_online()

Martin Hicks mort at wildopensource.com
Mon Apr 21 07:35:28 PDT 2003


Hello,

Here is a patch to change all kdb-related instances of cpu_is_online()
to cpu_online().  The 2.5 kernel uses cpu_online() so this is really
just a patch to remain consistent between the two kernel versions.

mh

-- 
Wild Open Source Inc.                  mort at wildopensource.com


diff -X /home/mort/diffex -uNr linux-2.4.20.pristine/arch/ia64/kdb/kdbasupport.c linux-2.4.20/arch/ia64/kdb/kdbasupport.c
--- linux-2.4.20.pristine/arch/ia64/kdb/kdbasupport.c	2003-04-21 09:17:04.000000000 -0400
+++ linux-2.4.20/arch/ia64/kdb/kdbasupport.c	2003-04-21 10:12:58.000000000 -0400
@@ -1137,7 +1137,7 @@
 	if (diag)
 		return diag;
 
-	if ((cpunum > NR_CPUS) || !cpu_is_online(cpunum))
+	if ((cpunum > NR_CPUS) || !cpu_online(cpunum))
 		return KDB_BADCPUNUM;
 
 	platform_send_ipi(cpunum, 0, IA64_IPI_DM_INIT, 0);
diff -X /home/mort/diffex -uNr linux-2.4.20.pristine/include/linux/kdbprivate.h linux-2.4.20/include/linux/kdbprivate.h
--- linux-2.4.20.pristine/include/linux/kdbprivate.h	2003-04-21 09:16:48.000000000 -0400
+++ linux-2.4.20/include/linux/kdbprivate.h	2003-04-21 10:12:34.000000000 -0400
@@ -349,14 +349,14 @@
  */
 extern int kdb_seqno;
 
-/* Compatibility code until cpu_is_online() is in the standard kernel */
-#ifndef cpu_is_online
+/* Compatibility code until cpu_online() is in the standard kernel */
+#ifndef cpu_online
 #ifdef CONFIG_SMP
-#define cpu_is_online(cpu) test_bit(cpu, &cpu_online_map)
+#define cpu_online(cpu) test_bit(cpu, &cpu_online_map)
 #else  /* !SMP */
-#define cpu_is_online(cpu) ({ BUG_ON((cpu) != 0); 1; })
+#define cpu_online(cpu) ({ BUG_ON((cpu) != 0); 1; })
 #endif /* SMP */
-#endif /* cpu_is_online */
+#endif /* cpu_online */
 
 /* kdb needs to know if a task owns the cpu.  Due to bugs in the scheduling code
  * the initial tasks on each cpu do not decode correctly, uni-processor also has
diff -X /home/mort/diffex -uNr linux-2.4.20.pristine/kdb/kdbmain.c linux-2.4.20/kdb/kdbmain.c
--- linux-2.4.20.pristine/kdb/kdbmain.c	2003-04-21 09:16:48.000000000 -0400
+++ linux-2.4.20/kdb/kdbmain.c	2003-04-21 10:13:36.000000000 -0400
@@ -1595,7 +1595,7 @@
 		if (smp_num_cpus > 1 && !KDB_FLAG(CATASTROPHIC)) {
 			int i;
 			for (i = 0; i < NR_CPUS; ++i) {
-				if (!cpu_is_online(i))
+				if (!cpu_online(i))
 					continue;
 				if (i != kdb_initial_cpu) {
 					KDB_STATE_SET_CPU(HOLD_CPU, i);
@@ -2651,7 +2651,7 @@
 
 	/* ask the other cpus if they are still active */
 	for (i=0; i<NR_CPUS; i++) {
-		if (cpu_is_online(i))
+		if (cpu_online(i))
 			KDB_STATE_CLEAR_CPU(KDB, i);
 	}
 	KDB_STATE_SET(KDB);
@@ -2667,7 +2667,7 @@
 		kdb_printf("Currently on cpu %d\n", smp_processor_id());
 		kdb_printf("Available cpus: ");
 		for (i=0; i<NR_CPUS; i++) {
-			if (cpu_is_online(i)) {
+			if (cpu_online(i)) {
 				if (!first)
 					kdb_printf(", ");
 				first = 0;
@@ -2691,7 +2691,7 @@
 	 * Validate cpunum
 	 */
 	if ((cpunum > NR_CPUS)
-	 || !cpu_is_online(cpunum)
+	 || !cpu_online(cpunum)
 	 || !KDB_STATE_CPU(KDB, cpunum))
 		return KDB_BADCPUNUM;
 



More information about the kdb mailing list