[PATCH]_stp_free_percpu function definition responding to _stp_alloc_percpu

bibo,mao bibo.mao@intel.com
Mon Oct 16 11:08:00 GMT 2006


Hi,
   On the newest 2.6.19-rc2 smp machines, stap fails to run. It
is because _stp_free_percpu is defined as free_percpu macro and
one function at the same time. This patch modifies this, and
replaces for_each_cpu with for_each_possible_cpu macro.

thanks
bibo,mao

--- src.org/runtime/alloc.c	2006-01-25 18:08:47.000000000 +0800
+++ src/runtime/alloc.c	2006-10-16 18:17:40.000000000 +0800
@@ -18,14 +18,9 @@
  #define kmalloc_node(size,flags,node) kmalloc(size,flags)
  #endif /* LINUX_VERSION_CODE */

-#ifdef CONFIG_SMP
-#define _stp_free_percpu(ptr) free_percpu(ptr)
-#else
-#define _stp_free_percpu(ptr) kfree(ptr)
-#endif
-
  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
  #define _stp_alloc_percpu(size) __alloc_percpu(size, 8)
+#define _stp_free_percpu(ptr) free_percpu(ptr)
  #else
  #ifdef CONFIG_SMP
  /* This is like alloc_percpu() except it simply takes a size, instead 
of a type. */
@@ -37,7 +32,7 @@ void *_stp_alloc_percpu(size_t size)
  	if (!pdata)
  		return NULL;

-	for_each_cpu(i) {
+	for_each_possible_cpu(i) {
  		int node = cpu_to_node(i);

  		if (node_online(node))
@@ -68,7 +63,7 @@ void _stp_free_percpu(const void *objp)
  	int i;
  	struct percpu_data *p = (struct percpu_data *) (~(unsigned long) objp);

-	for_each_cpu(i)
+	for_each_possible_cpu(i)
  		kfree(p->ptrs[i]);
  	kfree(p);
  }
@@ -80,6 +75,7 @@ void *_stp_alloc_percpu(size_t size)
                  memset(ret, 0, size);
          return ret;
  }
+#define _stp_free_percpu(ptr) kfree(ptr)
  #endif /* CONFIG_SMP */
  #endif /* LINUX_VERSION_CODE */
  #endif /* _ALLOC_C_ */



More information about the Systemtap mailing list