[PATCH] 2.4: introduce get_cpu() and put_cpu()

From: Robert Love (rml@tech9.net)
Date: Sun Oct 06 2002 - 14:45:47 EST

Master Marcelo,

In 2.5, it is unsafe to assume the current processor does not change out
from under you - thus you must be atomic when calling
smp_processor_id(). We introduced the get_cpu() and put_cpu() methods
to provide a safe way to access the current processor.

This patch back-ports those interfaces to 2.4. Note they do nothing
special: get_cpu() simply returns smp_processor_id() and put_cpu() is a
no-op. But this will allow easier back-porting from 2.5 and common
code-base for drivers, etc. It also does not hurt to be explicit that
you do not want the processor to change.

As an example, I converted one use of smp_processor_id() to the new
interface.

Patch is against 2.4.20-pre9, please apply.

        Robert Love

diff -urN linux-2.4.20-pre9/arch/i386/kernel/ioport.c linux/arch/i386/kernel/ioport.c
--- linux-2.4.20-pre9/arch/i386/kernel/ioport.c 2002-10-06 14:58:01.000000000 -0400
+++ linux/arch/i386/kernel/ioport.c 2002-10-06 15:21:04.000000000 -0400
@@ -55,12 +55,15 @@
 asmlinkage int sys_ioperm(unsigned long from, unsigned long num, int turn_on)
 {
         struct thread_struct * t = &current->thread;
- struct tss_struct * tss = init_tss + smp_processor_id();
+ struct tss_struct * tss;
 
         if ((from + num <= from) || (from + num > IO_BITMAP_SIZE*32))
                 return -EINVAL;
         if (turn_on && !capable(CAP_SYS_RAWIO))
                 return -EPERM;
+
+ tss = init_tss + get_cpu();
+
         /*
          * If it's the first ioperm() call in this thread's lifetime, set the
          * IO bitmap up. ioperm() is much less timing critical than clone(),
diff -urN linux-2.4.20-pre9/include/linux/smp.h linux/include/linux/smp.h
--- linux-2.4.20-pre9/include/linux/smp.h 2002-10-06 14:57:20.000000000 -0400
+++ linux/include/linux/smp.h 2002-10-06 15:11:00.000000000 -0400
@@ -87,5 +87,9 @@
 #define smp_call_function(func,info,retry,wait) ({ 0; })
 #define cpu_online_map 1
 
-#endif
-#endif
+#endif /* !CONFIG_SMP */
+
+#define get_cpu() smp_processor_id()
+#define put_cpu() do { } while(0)
+
+#endif /* __LINUX_SMP_H */

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Mon Oct 07 2002 - 22:00:55 EST