-diff -Nurb --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' linux-2.6.22-580/arch/i386/Kconfig linux-2.6.22-590/arch/i386/Kconfig
---- linux-2.6.22-580/arch/i386/Kconfig 2009-02-18 09:56:02.000000000 -0500
-+++ linux-2.6.22-590/arch/i386/Kconfig 2009-02-18 09:57:23.000000000 -0500
+diff -Nurb --exclude='*.orig' --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' --exclude='*.svn*' linux-2.6.22.19/arch/i386/Kconfig linux-chopstix/arch/i386/Kconfig
+--- linux-2.6.22.19/arch/i386/Kconfig 2008-02-25 18:59:40.000000000 -0500
++++ linux-chopstix/arch/i386/Kconfig 2009-03-05 08:46:46.000000000 -0500
@@ -1217,6 +1217,14 @@
source "arch/i386/oprofile/Kconfig"
config KPROBES
bool "Kprobes (EXPERIMENTAL)"
depends on KALLSYMS && EXPERIMENTAL && MODULES
-diff -Nurb --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' linux-2.6.22-580/arch/i386/kernel/asm-offsets.c linux-2.6.22-590/arch/i386/kernel/asm-offsets.c
---- linux-2.6.22-580/arch/i386/kernel/asm-offsets.c 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-590/arch/i386/kernel/asm-offsets.c 2009-02-18 09:57:23.000000000 -0500
+diff -Nurb --exclude='*.orig' --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' --exclude='*.svn*' linux-2.6.22.19/arch/i386/kernel/asm-offsets.c linux-chopstix/arch/i386/kernel/asm-offsets.c
+--- linux-2.6.22.19/arch/i386/kernel/asm-offsets.c 2008-02-25 18:59:40.000000000 -0500
++++ linux-chopstix/arch/i386/kernel/asm-offsets.c 2009-03-06 10:24:11.000000000 -0500
@@ -9,6 +9,7 @@
#include <linux/signal.h>
#include <linux/personality.h>
+ STACKOFFSET(THREAD_esp, thread_struct, esp);
+ STACKOFFSET(EVENT_event_data, event, event_data);
+ STACKOFFSET(EVENT_task, event, task);
-+ STACKOFFSET(EVENT_event_type, event, event_data);
++ STACKOFFSET(EVENT_event_type, event, event_type);
+ STACKOFFSET(SPEC_number, event_spec, number);
+ DEFINE(EVENT_SIZE, sizeof(struct event));
+ DEFINE(SPEC_SIZE, sizeof(struct event_spec));
OFFSET(TI_exec_domain, thread_info, exec_domain);
OFFSET(TI_flags, thread_info, flags);
OFFSET(TI_status, thread_info, status);
-diff -Nurb --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' linux-2.6.22-580/arch/i386/mm/fault.c linux-2.6.22-590/arch/i386/mm/fault.c
---- linux-2.6.22-580/arch/i386/mm/fault.c 2009-02-18 09:56:02.000000000 -0500
-+++ linux-2.6.22-590/arch/i386/mm/fault.c 2009-02-18 09:57:23.000000000 -0500
+diff -Nurb --exclude='*.orig' --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' --exclude='*.svn*' linux-2.6.22.19/arch/i386/kernel/entry.S linux-chopstix/arch/i386/kernel/entry.S
+--- linux-2.6.22.19/arch/i386/kernel/entry.S 2008-02-25 18:59:40.000000000 -0500
++++ linux-chopstix/arch/i386/kernel/entry.S 2009-03-06 13:31:40.000000000 -0500
+@@ -374,6 +374,33 @@
+ cmpl $(nr_syscalls), %eax
+ jae syscall_badsys
+ syscall_call:
++ /* Move Chopstix syscall probe here */
++ /* Save and clobber: eax, ecx, ebp */
++ pushl %eax
++ pushl %ecx
++ pushl %ebp
++ movl %esp, %ebp
++ subl $SPEC_EVENT_SIZE, %esp
++ movl rec_event, %ecx
++ testl %ecx, %ecx
++ jz carry_on
++ # struct event is first, just below %ebp
++ movl %eax, (SPEC_number-EVENT_SIZE)(%ebp)
++ leal -SPEC_EVENT_SIZE(%ebp), %eax
++ movl %eax, EVENT_event_data(%ebp)
++ movl $6, EVENT_event_type(%ebp)
++ movl rec_event, %edx
++ movl $1, 4(%esp)
++ leal -EVENT_SIZE(%ebp), %eax
++ movl %eax, (%esp)
++ call rec_event_asm
++carry_on:
++ addl $SPEC_EVENT_SIZE, %esp
++ popl %ebp
++ popl %ecx
++ popl %eax
++ /* End chopstix */
++
+ call *sys_call_table(,%eax,4)
+ movl %eax,PT_EAX(%esp) # store the return value
+ syscall_exit:
+diff -Nurb --exclude='*.orig' --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' --exclude='*.svn*' linux-2.6.22.19/arch/i386/mm/fault.c linux-chopstix/arch/i386/mm/fault.c
+--- linux-2.6.22.19/arch/i386/mm/fault.c 2008-02-25 18:59:40.000000000 -0500
++++ linux-chopstix/arch/i386/mm/fault.c 2009-03-05 08:46:46.000000000 -0500
@@ -60,6 +60,15 @@
DIE_PAGE_FAULT, &args);
}
fastcall void __kprobes do_page_fault(struct pt_regs *regs,
unsigned long error_code)
{
-diff -Nurb --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' linux-2.6.22-580/block/ll_rw_blk.c linux-2.6.22-590/block/ll_rw_blk.c
---- linux-2.6.22-580/block/ll_rw_blk.c 2009-02-18 09:55:48.000000000 -0500
-+++ linux-2.6.22-590/block/ll_rw_blk.c 2009-02-18 09:57:23.000000000 -0500
+diff -Nurb --exclude='*.orig' --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' --exclude='*.svn*' linux-2.6.22.19/block/ll_rw_blk.c linux-chopstix/block/ll_rw_blk.c
+--- linux-2.6.22.19/block/ll_rw_blk.c 2008-02-25 18:59:40.000000000 -0500
++++ linux-chopstix/block/ll_rw_blk.c 2009-03-05 08:45:54.000000000 -0500
@@ -30,6 +30,7 @@
#include <linux/cpu.h>
#include <linux/blktrace_api.h>
ret = q->make_request_fn(q, bio);
} while (ret);
}
-diff -Nurb --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' linux-2.6.22-580/drivers/oprofile/cpu_buffer.c linux-2.6.22-590/drivers/oprofile/cpu_buffer.c
---- linux-2.6.22-580/drivers/oprofile/cpu_buffer.c 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-590/drivers/oprofile/cpu_buffer.c 2009-02-18 09:57:23.000000000 -0500
+diff -Nurb --exclude='*.orig' --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' --exclude='*.svn*' linux-2.6.22.19/drivers/char/Makefile linux-chopstix/drivers/char/Makefile
+--- linux-2.6.22.19/drivers/char/Makefile 2008-02-25 18:59:40.000000000 -0500
++++ linux-chopstix/drivers/char/Makefile 2009-03-09 14:47:24.000000000 -0400
+@@ -9,6 +9,9 @@
+
+ obj-y += mem.o random.o tty_io.o n_tty.o tty_ioctl.o
+
++#obj-y += chopstix/
++#obj-m += chardevice.o
++#obj-m += inject.o
+ obj-$(CONFIG_LEGACY_PTYS) += pty.o
+ obj-$(CONFIG_UNIX98_PTYS) += pty.o
+ obj-y += misc.o
+diff -Nurb --exclude='*.orig' --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' --exclude='*.svn*' linux-2.6.22.19/drivers/oprofile/cpu_buffer.c linux-chopstix/drivers/oprofile/cpu_buffer.c
+--- linux-2.6.22.19/drivers/oprofile/cpu_buffer.c 2008-02-25 18:59:40.000000000 -0500
++++ linux-chopstix/drivers/oprofile/cpu_buffer.c 2009-03-05 08:47:28.000000000 -0500
@@ -21,6 +21,7 @@
#include <linux/oprofile.h>
#include <linux/vmalloc.h>
}
void oprofile_add_pc(unsigned long pc, int is_kernel, unsigned long event)
-diff -Nurb --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' linux-2.6.22-580/fs/bio.c linux-2.6.22-590/fs/bio.c
---- linux-2.6.22-580/fs/bio.c 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-590/fs/bio.c 2009-02-18 09:57:23.000000000 -0500
+diff -Nurb --exclude='*.orig' --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' --exclude='*.svn*' linux-2.6.22.19/fs/bio.c linux-chopstix/fs/bio.c
+--- linux-2.6.22.19/fs/bio.c 2008-02-25 18:59:40.000000000 -0500
++++ linux-chopstix/fs/bio.c 2009-03-05 08:46:09.000000000 -0500
@@ -27,6 +27,7 @@
#include <linux/workqueue.h>
#include <linux/blktrace_api.h>
if (bio->bi_end_io)
bio->bi_end_io(bio, bytes_done, error);
}
-diff -Nurb --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' linux-2.6.22-580/fs/exec.c linux-2.6.22-590/fs/exec.c
---- linux-2.6.22-580/fs/exec.c 2009-02-18 09:56:02.000000000 -0500
-+++ linux-2.6.22-590/fs/exec.c 2009-02-18 09:57:23.000000000 -0500
+diff -Nurb --exclude='*.orig' --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' --exclude='*.svn*' linux-2.6.22.19/fs/exec.c linux-chopstix/fs/exec.c
+--- linux-2.6.22.19/fs/exec.c 2008-02-25 18:59:40.000000000 -0500
++++ linux-chopstix/fs/exec.c 2009-03-05 08:46:09.000000000 -0500
@@ -27,6 +27,7 @@
#include <linux/mman.h>
#include <linux/a.out.h>
#include <linux/module.h>
#include <linux/namei.h>
#include <linux/proc_fs.h>
-@@ -488,6 +489,12 @@
+@@ -486,6 +487,12 @@
if (!err) {
struct inode *inode = nd.dentry->d_inode;
file = ERR_PTR(-EACCES);
if (!(nd.mnt->mnt_flags & MNT_NOEXEC) &&
S_ISREG(inode->i_mode)) {
-@@ -627,8 +634,10 @@
+@@ -625,8 +632,10 @@
* Reparenting needs write_lock on tasklist_lock,
* so it is safe to do it under read_lock.
*/
zap_other_threads(tsk);
read_unlock(&tasklist_lock);
-diff -Nurb --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' linux-2.6.22-580/include/linux/arrays.h linux-2.6.22-590/include/linux/arrays.h
---- linux-2.6.22-580/include/linux/arrays.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.22-590/include/linux/arrays.h 2009-02-18 09:57:23.000000000 -0500
+diff -Nurb --exclude='*.orig' --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' --exclude='*.svn*' linux-2.6.22.19/include/linux/arrays.h linux-chopstix/include/linux/arrays.h
+--- linux-2.6.22.19/include/linux/arrays.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-chopstix/include/linux/arrays.h 2009-03-05 08:45:29.000000000 -0500
@@ -0,0 +1,36 @@
+#ifndef __ARRAYS_H__
+#define __ARRAYS_H__
+ struct task_struct *task;
+};
+#endif
-diff -Nurb --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' linux-2.6.22-580/include/linux/mutex.h linux-2.6.22-590/include/linux/mutex.h
---- linux-2.6.22-580/include/linux/mutex.h 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-590/include/linux/mutex.h 2009-02-18 09:57:23.000000000 -0500
+diff -Nurb --exclude='*.orig' --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' --exclude='*.svn*' linux-2.6.22.19/include/linux/mutex.h linux-chopstix/include/linux/mutex.h
+--- linux-2.6.22.19/include/linux/mutex.h 2008-02-25 18:59:40.000000000 -0500
++++ linux-chopstix/include/linux/mutex.h 2009-03-05 08:45:29.000000000 -0500
@@ -53,6 +53,10 @@
struct thread_info *owner;
const char *name;
#endif
#ifdef CONFIG_DEBUG_LOCK_ALLOC
struct lockdep_map dep_map;
-diff -Nurb --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' linux-2.6.22-580/include/linux/sched.h linux-2.6.22-590/include/linux/sched.h
---- linux-2.6.22-580/include/linux/sched.h 2009-02-18 09:56:02.000000000 -0500
-+++ linux-2.6.22-590/include/linux/sched.h 2009-02-18 09:57:23.000000000 -0500
-@@ -850,6 +850,10 @@
+diff -Nurb --exclude='*.orig' --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' --exclude='*.svn*' linux-2.6.22.19/include/linux/sched.h linux-chopstix/include/linux/sched.h
+--- linux-2.6.22.19/include/linux/sched.h 2008-02-25 18:59:40.000000000 -0500
++++ linux-chopstix/include/linux/sched.h 2009-03-05 08:45:29.000000000 -0500
+@@ -843,6 +843,10 @@
#endif
unsigned long sleep_avg;
unsigned long long timestamp, last_ran;
unsigned long long sched_time; /* sched_clock time spent running */
enum sleep_type sleep_type;
-diff -Nurb --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' linux-2.6.22-580/kernel/mutex.c linux-2.6.22-590/kernel/mutex.c
---- linux-2.6.22-580/kernel/mutex.c 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-590/kernel/mutex.c 2009-02-18 09:57:23.000000000 -0500
+diff -Nurb --exclude='*.orig' --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' --exclude='*.svn*' linux-2.6.22.19/kernel/mutex.c linux-chopstix/kernel/mutex.c
+--- linux-2.6.22.19/kernel/mutex.c 2008-02-25 18:59:40.000000000 -0500
++++ linux-chopstix/kernel/mutex.c 2009-03-05 08:44:37.000000000 -0500
@@ -18,6 +18,17 @@
#include <linux/spinlock.h>
#include <linux/interrupt.h>
wake_up_process(waiter->task);
}
-diff -Nurb --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' linux-2.6.22-580/kernel/sched.c linux-2.6.22-590/kernel/sched.c
---- linux-2.6.22-580/kernel/sched.c 2009-02-18 09:56:02.000000000 -0500
-+++ linux-2.6.22-590/kernel/sched.c 2009-02-18 09:57:23.000000000 -0500
+diff -Nurb --exclude='*.orig' --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' --exclude='*.svn*' linux-2.6.22.19/kernel/sched.c linux-chopstix/kernel/sched.c
+--- linux-2.6.22.19/kernel/sched.c 2008-02-25 18:59:40.000000000 -0500
++++ linux-chopstix/kernel/sched.c 2009-03-06 13:02:31.000000000 -0500
@@ -10,7 +10,7 @@
* 1998-11-19 Implemented schedule_timeout() and related stuff
* by Andrea Arcangeli
#include <linux/highmem.h>
#include <linux/smp_lock.h>
#include <asm/mmu_context.h>
-@@ -59,6 +60,9 @@
- #include <linux/vs_sched.h>
- #include <linux/vs_cvirt.h>
+@@ -57,6 +58,9 @@
+ #include <asm/tlb.h>
+ #include <asm/unistd.h>
+#define INTERRUPTIBLE -1
+#define RUNNING 0
/*
* Scheduler clock - returns current time in nanosec units.
* This is default implementation.
-@@ -431,6 +435,7 @@
+@@ -419,6 +423,7 @@
repeat_lock_task:
rq = task_rq(p);
spin_lock(&rq->lock);
if (unlikely(rq != task_rq(p))) {
spin_unlock(&rq->lock);
-@@ -1741,6 +1746,21 @@
+@@ -1697,6 +1702,21 @@
* event cannot wake it up and insert it on the runqueue either.
*/
p->state = TASK_RUNNING;
/*
* Make sure we do not leak PI boosting priority to the child:
-@@ -3608,6 +3628,7 @@
+@@ -3554,6 +3574,7 @@
#endif
static inline int interactive_sleep(enum sleep_type sleep_type)
{
return (sleep_type == SLEEP_INTERACTIVE ||
-@@ -3617,16 +3638,28 @@
+@@ -3563,16 +3584,28 @@
/*
* schedule() is the main scheduler function.
*/
+struct event_spec {
+ unsigned long pc;
+ unsigned long dcookie;
-+ unsigned count;
-+ unsigned char reason;
++ unsigned int count;
++ unsigned int reason;
+};
+#endif
+
/*
* Test if we are atomic. Since do_exit() needs to call into
-@@ -3680,6 +3713,7 @@
+@@ -3626,6 +3659,7 @@
switch_count = &prev->nivcsw;
if (prev->state && !(preempt_count() & PREEMPT_ACTIVE)) {
switch_count = &prev->nvcsw;
if (unlikely((prev->state & TASK_INTERRUPTIBLE) &&
unlikely(signal_pending(prev))))
prev->state = TASK_RUNNING;
-@@ -3689,6 +3723,17 @@
- vx_uninterruptible_inc(prev);
- }
+@@ -3633,6 +3667,17 @@
+ if (prev->state == TASK_UNINTERRUPTIBLE)
+ rq->nr_uninterruptible++;
deactivate_task(prev, rq);
+#ifdef CONFIG_CHOPSTIX
+ /* An uninterruptible process just yielded. Record the current jiffie */
}
}
-@@ -3765,6 +3810,40 @@
+@@ -3696,6 +3741,40 @@
prev->sleep_avg = 0;
prev->timestamp = prev->last_ran = now;
+ if (diff >= HZ/10) {
+ struct event event;
+ struct event_spec espec;
-+ unsigned long eip;
++ struct pt_regs *regs;
++ regs = task_pt_regs(current);
+
+ espec.reason = sampling_reason;
-+ eip = next->thread.esp & 4095;
+ event.event_data=&espec;
+ event.task=next;
-+ espec.pc=eip;
++ espec.pc=regs->eip;
+ event.event_type=2;
+ /* index in the event array currently set up */
+ /* make sure the counters are loaded in the order we want them to show up*/
sched_info_switch(prev, next);
if (likely(prev != next)) {
next->timestamp = next->last_ran = now;
-@@ -4664,6 +4743,7 @@
+@@ -4594,6 +4673,7 @@
get_task_struct(p);
read_unlock(&tasklist_lock);
retval = -EPERM;
if ((current->euid != p->euid) && (current->euid != p->uid) &&
!capable(CAP_SYS_NICE))
-@@ -5032,6 +5112,7 @@
+@@ -4962,6 +5042,7 @@
jiffies_to_timespec(p->policy == SCHED_FIFO ?
0 : task_timeslice(p), &t);
read_unlock(&tasklist_lock);
retval = copy_to_user(interval, &t, sizeof(t)) ? -EFAULT : 0;
out_nounlock:
return retval;
-@@ -7275,3 +7356,14 @@
+@@ -7200,3 +7281,20 @@
}
#endif
+
+/* To support safe calling from asm */
+asmlinkage void rec_event_asm (struct event *event_signature_in, unsigned int count) {
++ struct pt_regs *regs;
++ struct event_spec *es = event_signature_in->event_data;
++ regs = task_pt_regs(current);
++ event_signature_in->task=current;
++ es->pc=regs->eip;
++ event_signature_in->count=1;
+ (*rec_event)(event_signature_in, count);
+}
+EXPORT_SYMBOL(rec_event);
+EXPORT_SYMBOL(in_sched_functions);
+#endif
-diff -Nurb --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' linux-2.6.22-580/mm/memory.c linux-2.6.22-590/mm/memory.c
---- linux-2.6.22-580/mm/memory.c 2009-02-18 09:56:03.000000000 -0500
-+++ linux-2.6.22-590/mm/memory.c 2009-02-18 09:57:23.000000000 -0500
+diff -Nurb --exclude='*.orig' --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' --exclude='*.svn*' linux-2.6.22.19/mm/memory.c linux-chopstix/mm/memory.c
+--- linux-2.6.22.19/mm/memory.c 2008-02-25 18:59:40.000000000 -0500
++++ linux-chopstix/mm/memory.c 2009-03-05 08:46:20.000000000 -0500
@@ -59,6 +59,7 @@
#include <linux/swapops.h>
#ifndef CONFIG_NEED_MULTIPLE_NODES
/* use the per-pgdat data instead for discontigmem - mbligh */
-@@ -2601,6 +2602,15 @@
- return ret;
+@@ -2581,6 +2582,15 @@
+ return VM_FAULT_MINOR;
}
+extern void (*rec_event)(void *,unsigned int);
/*
* By the time we get here, we already hold the mm semaphore
*/
-@@ -2630,6 +2640,24 @@
+@@ -2610,6 +2620,24 @@
if (!pte)
return VM_FAULT_OOM;
return handle_pte_fault(mm, vma, address, pte, pmd, write_access);
}
-diff -Nurb --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' linux-2.6.22-580/mm/slab.c linux-2.6.22-590/mm/slab.c
---- linux-2.6.22-580/mm/slab.c 2009-02-18 09:56:03.000000000 -0500
-+++ linux-2.6.22-590/mm/slab.c 2009-02-18 10:00:42.000000000 -0500
+diff -Nurb --exclude='*.orig' --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' --exclude='*.svn*' linux-2.6.22.19/mm/slab.c linux-chopstix/mm/slab.c
+--- linux-2.6.22.19/mm/slab.c 2008-02-25 18:59:40.000000000 -0500
++++ linux-chopstix/mm/slab.c 2009-03-05 08:46:20.000000000 -0500
@@ -110,11 +110,13 @@
#include <linux/fault-inject.h>
#include <linux/rtmutex.h>
/*
* struct array_cache
*
-@@ -3443,6 +3453,19 @@
+@@ -3439,6 +3449,19 @@
local_irq_restore(save_flags);
objp = cache_alloc_debugcheck_after(cachep, flags, objp, caller);
prefetchw(objp);
return objp;
}
-@@ -3549,12 +3572,26 @@
+@@ -3545,12 +3568,25 @@
* Release an obj back to its cache. If the obj has a constructed state, it must
* be in this state _before_ it is released. Called with disabled ints.
*/
check_irq_off();
- objp = cache_free_debugcheck(cachep, objp, __builtin_return_address(0));
+ objp = cache_free_debugcheck(cachep, objp, caller);
-+ #ifdef CONFIG_CHOPSTIX
-+ if (rec_event && objp) {
-+ struct event event;
-+ struct event_spec espec;
-+
-+ espec.reason = 1; /* free */
-+ event.event_data=&espec;
-+ event.task = current;
-+ espec.pc=caller;
-+ event.event_type=4;
-+ (*rec_event)(&event, cachep->buffer_size);
-+ }
-+ #endif
-+
- vx_slab_free(cachep);
++#ifdef CONFIG_CHOPSTIX
++ if (rec_event && objp) {
++ struct event event;
++ struct event_spec espec;
++
++ espec.reason = 1; /* free */
++ event.event_data=&espec;
++ event.task = current;
++ espec.pc=caller;
++ event.event_type=4;
++ (*rec_event)(&event, cachep->buffer_size);
++ }
++#endif
if (cache_free_alien(cachep, objp))
-@@ -3651,16 +3688,19 @@
+ return;
+@@ -3646,16 +3682,19 @@
__builtin_return_address(0));
}
EXPORT_SYMBOL(kmem_cache_alloc_node);
}
#ifdef CONFIG_DEBUG_SLAB
-@@ -3696,6 +3736,7 @@
+@@ -3691,6 +3730,7 @@
void *caller)
{
struct kmem_cache *cachep;
/* If you want to save a few bytes .text space: replace
* __ with kmem_.
-@@ -3705,9 +3746,10 @@
+@@ -3700,9 +3740,10 @@
cachep = __find_general_cachep(size, flags);
if (unlikely(cachep == NULL))
return NULL;
#ifdef CONFIG_DEBUG_SLAB
void *__kmalloc(size_t size, gfp_t flags)
-@@ -3723,10 +3765,17 @@
+@@ -3718,10 +3759,17 @@
EXPORT_SYMBOL(__kmalloc_track_caller);
#else
EXPORT_SYMBOL(__kmalloc);
#endif
-@@ -3792,7 +3841,7 @@
+@@ -3787,7 +3835,7 @@
local_irq_save(flags);
debug_check_no_locks_freed(objp, obj_size(cachep));
local_irq_restore(flags);
}
EXPORT_SYMBOL(kmem_cache_free);
-@@ -3817,7 +3866,7 @@
+@@ -3812,7 +3860,7 @@
kfree_debugcheck(objp);
c = virt_to_cache(objp);
debug_check_no_locks_freed(objp, obj_size(c));
+ __cache_free(c, (void *)objp,__builtin_return_address(0));
local_irq_restore(flags);
}
+ EXPORT_SYMBOL(kfree);
git://git.onelab.eu / linux-2.6.git / commitdiff