From 7ad01f676a99aaab4f31108bc12582809e2e4880 Mon Sep 17 00:00:00 2001 From: Sapan Bhatia Date: Thu, 9 Apr 2009 19:38:38 +0000 Subject: [PATCH] Lost the syscall hunk in my last checkin. This version includes it. --- linux-2.6-590-chopstix-intern.patch | 78 +++++++++++++++++------------ 1 file changed, 46 insertions(+), 32 deletions(-) diff --git a/linux-2.6-590-chopstix-intern.patch b/linux-2.6-590-chopstix-intern.patch index daf166a63..b09339f2a 100644 --- a/linux-2.6-590-chopstix-intern.patch +++ b/linux-2.6-590-chopstix-intern.patch @@ -1,6 +1,6 @@ -diff -Nurb --exclude='*.cmd' --exclude='*.orig' --exclude='*.swp' --exclude=tags --exclude='*.patch' --exclude='*.diff' --exclude='*.svn*' linux-2.6.22-590/arch/i386/Kconfig linux-2.6.22-591/arch/i386/Kconfig ---- linux-2.6.22-590/arch/i386/Kconfig 2009-03-16 20:49:42.000000000 -0400 -+++ linux-2.6.22-591/arch/i386/Kconfig 2009-03-16 20:58:59.000000000 -0400 +diff -Nurb 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-04-08 16:36:16.000000000 -0400 ++++ linux-2.6.22-590/arch/i386/Kconfig 2009-04-08 16:37:10.000000000 -0400 @@ -1217,6 +1217,14 @@ source "arch/i386/oprofile/Kconfig" @@ -16,8 +16,9 @@ diff -Nurb --exclude='*.cmd' --exclude='*.orig' --exclude='*.swp' --exclude=tags config KPROBES bool "Kprobes (EXPERIMENTAL)" depends on KALLSYMS && EXPERIMENTAL && MODULES ---- linux-2.6.22-590/arch/i386/kernel/asm-offsets.c 2007-07-08 19:32:17.000000000 -0400 -+++ linux-2.6.22-591/arch/i386/kernel/asm-offsets.c 2009-03-16 20:58:59.000000000 -0400 +diff -Nurb 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-04-08 16:37:10.000000000 -0400 @@ -9,6 +9,7 @@ #include #include @@ -64,8 +65,9 @@ diff -Nurb --exclude='*.cmd' --exclude='*.orig' --exclude='*.swp' --exclude=tags OFFSET(TI_exec_domain, thread_info, exec_domain); OFFSET(TI_flags, thread_info, flags); OFFSET(TI_status, thread_info, status); ---- linux-2.6.22-590/arch/i386/mm/fault.c 2009-03-16 20:49:42.000000000 -0400 -+++ linux-2.6.22-591/arch/i386/mm/fault.c 2009-03-16 20:58:59.000000000 -0400 +diff -Nurb 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-04-08 16:36:16.000000000 -0400 ++++ linux-2.6.22-590/arch/i386/mm/fault.c 2009-04-08 16:37:10.000000000 -0400 @@ -60,6 +60,15 @@ DIE_PAGE_FAULT, &args); } @@ -91,8 +93,9 @@ diff -Nurb --exclude='*.cmd' --exclude='*.orig' --exclude='*.swp' --exclude=tags fastcall void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code) { ---- linux-2.6.22-590/block/ll_rw_blk.c 2009-03-16 20:49:07.000000000 -0400 -+++ linux-2.6.22-591/block/ll_rw_blk.c 2009-03-16 20:58:59.000000000 -0400 +diff -Nurb 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-04-08 16:36:09.000000000 -0400 ++++ linux-2.6.22-590/block/ll_rw_blk.c 2009-04-08 16:37:10.000000000 -0400 @@ -30,6 +30,7 @@ #include #include @@ -140,8 +143,9 @@ diff -Nurb --exclude='*.cmd' --exclude='*.orig' --exclude='*.swp' --exclude=tags ret = q->make_request_fn(q, bio); } while (ret); } ---- linux-2.6.22-590/drivers/oprofile/cpu_buffer.c 2007-07-08 19:32:17.000000000 -0400 -+++ linux-2.6.22-591/drivers/oprofile/cpu_buffer.c 2009-03-16 20:58:59.000000000 -0400 +diff -Nurb 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-04-08 16:37:10.000000000 -0400 @@ -21,6 +21,7 @@ #include #include @@ -205,8 +209,9 @@ diff -Nurb --exclude='*.cmd' --exclude='*.orig' --exclude='*.swp' --exclude=tags } void oprofile_add_pc(unsigned long pc, int is_kernel, unsigned long event) ---- linux-2.6.22-590/fs/bio.c 2007-07-08 19:32:17.000000000 -0400 -+++ linux-2.6.22-591/fs/bio.c 2009-03-16 20:58:59.000000000 -0400 +diff -Nurb 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-04-08 16:37:10.000000000 -0400 @@ -27,6 +27,7 @@ #include #include @@ -263,8 +268,9 @@ diff -Nurb --exclude='*.cmd' --exclude='*.orig' --exclude='*.swp' --exclude=tags if (bio->bi_end_io) bio->bi_end_io(bio, bytes_done, error); } ---- linux-2.6.22-590/fs/exec.c 2009-03-16 20:49:42.000000000 -0400 -+++ linux-2.6.22-591/fs/exec.c 2009-03-16 20:58:59.000000000 -0400 +diff -Nurb 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-04-08 16:36:16.000000000 -0400 ++++ linux-2.6.22-590/fs/exec.c 2009-04-08 16:40:34.000000000 -0400 @@ -27,6 +27,7 @@ #include #include @@ -282,20 +288,21 @@ diff -Nurb --exclude='*.cmd' --exclude='*.orig' --exclude='*.swp' --exclude=tags #include #include #include -@@ -488,6 +489,12 @@ +@@ -488,6 +489,13 @@ if (!err) { struct inode *inode = nd.dentry->d_inode; +#ifdef CONFIG_CHOPSTIX + unsigned long cookie; -+ if (!nd.dentry->d_cookie) ++ extern void (*rec_event)(void *, unsigned int); ++ if (rec_event && !nd.dentry->d_cookie) + get_dcookie(nd.dentry, nd.mnt, &cookie); +#endif + file = ERR_PTR(-EACCES); if (!(nd.mnt->mnt_flags & MNT_NOEXEC) && S_ISREG(inode->i_mode)) { -@@ -627,8 +634,10 @@ +@@ -627,8 +635,10 @@ * Reparenting needs write_lock on tasklist_lock, * so it is safe to do it under read_lock. */ @@ -306,8 +313,9 @@ diff -Nurb --exclude='*.cmd' --exclude='*.orig' --exclude='*.swp' --exclude=tags zap_other_threads(tsk); read_unlock(&tasklist_lock); ---- linux-2.6.22-590/include/linux/arrays.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.22-591/include/linux/arrays.h 2009-03-16 20:58:59.000000000 -0400 +diff -Nurb 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-04-08 16:37:10.000000000 -0400 @@ -0,0 +1,36 @@ +#ifndef __ARRAYS_H__ +#define __ARRAYS_H__ @@ -345,8 +353,9 @@ diff -Nurb --exclude='*.cmd' --exclude='*.orig' --exclude='*.swp' --exclude=tags + struct task_struct *task; +}; +#endif ---- linux-2.6.22-590/include/linux/mutex.h 2007-07-08 19:32:17.000000000 -0400 -+++ linux-2.6.22-591/include/linux/mutex.h 2009-03-16 20:58:59.000000000 -0400 +diff -Nurb 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-04-08 16:37:10.000000000 -0400 @@ -53,6 +53,10 @@ struct thread_info *owner; const char *name; @@ -358,8 +367,9 @@ diff -Nurb --exclude='*.cmd' --exclude='*.orig' --exclude='*.swp' --exclude=tags #endif #ifdef CONFIG_DEBUG_LOCK_ALLOC struct lockdep_map dep_map; ---- linux-2.6.22-590/include/linux/sched.h 2009-03-16 20:49:42.000000000 -0400 -+++ linux-2.6.22-591/include/linux/sched.h 2009-03-16 20:58:59.000000000 -0400 +diff -Nurb 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-04-08 16:36:17.000000000 -0400 ++++ linux-2.6.22-590/include/linux/sched.h 2009-04-08 16:37:10.000000000 -0400 @@ -850,6 +850,10 @@ #endif unsigned long sleep_avg; @@ -371,8 +381,9 @@ diff -Nurb --exclude='*.cmd' --exclude='*.orig' --exclude='*.swp' --exclude=tags unsigned long long sched_time; /* sched_clock time spent running */ enum sleep_type sleep_type; ---- linux-2.6.22-590/kernel/mutex.c 2007-07-08 19:32:17.000000000 -0400 -+++ linux-2.6.22-591/kernel/mutex.c 2009-03-16 20:58:59.000000000 -0400 +diff -Nurb 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-04-08 16:37:10.000000000 -0400 @@ -18,6 +18,17 @@ #include #include @@ -487,8 +498,9 @@ diff -Nurb --exclude='*.cmd' --exclude='*.orig' --exclude='*.swp' --exclude=tags wake_up_process(waiter->task); } ---- linux-2.6.22-590/kernel/sched.c 2009-03-16 20:49:42.000000000 -0400 -+++ linux-2.6.22-591/kernel/sched.c 2009-03-16 20:58:59.000000000 -0400 +diff -Nurb 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-04-08 16:36:17.000000000 -0400 ++++ linux-2.6.22-590/kernel/sched.c 2009-04-08 16:37:10.000000000 -0400 @@ -10,7 +10,7 @@ * 1998-11-19 Implemented schedule_timeout() and related stuff * by Andrea Arcangeli @@ -688,8 +700,9 @@ diff -Nurb --exclude='*.cmd' --exclude='*.orig' --exclude='*.swp' --exclude=tags +EXPORT_SYMBOL(rec_event); +EXPORT_SYMBOL(in_sched_functions); +#endif ---- linux-2.6.22-590/mm/memory.c 2009-03-16 20:49:42.000000000 -0400 -+++ linux-2.6.22-591/mm/memory.c 2009-03-16 20:58:59.000000000 -0400 +diff -Nurb 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-04-08 16:36:17.000000000 -0400 ++++ linux-2.6.22-590/mm/memory.c 2009-04-08 16:37:10.000000000 -0400 @@ -59,6 +59,7 @@ #include @@ -739,8 +752,9 @@ diff -Nurb --exclude='*.cmd' --exclude='*.orig' --exclude='*.swp' --exclude=tags return handle_pte_fault(mm, vma, address, pte, pmd, write_access); } ---- linux-2.6.22-590/mm/slab.c 2009-03-16 20:49:42.000000000 -0400 -+++ linux-2.6.22-591/mm/slab.c 2009-03-16 21:00:27.000000000 -0400 +diff -Nurb 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-04-08 16:36:17.000000000 -0400 ++++ linux-2.6.22-590/mm/slab.c 2009-04-08 16:37:10.000000000 -0400 @@ -110,11 +110,13 @@ #include #include -- 2.43.0