Changeset 20

Timestamp:

11/12/05 13:21:36 (6 years ago)

Author:

dkaplan1

Message:

Regression tests passed
Fixed printk implementation
Added lots of callgates to support rtc.c
rtc.c is UNTESTED
Added calldriver calls in for /proc support and for timers
Also added possibility of calling driver method asynchronously

Files:

• arch/i386/kernel/callgate.c (modified) (18 diffs)
• arch/i386/kernel/process.c (modified) (2 diffs)
• .config (modified) (1 diff)
• .config.old (modified) (18 diffs)
• fs/proc/generic.c (modified) (2 diffs)
• fs/select.c (modified) (1 diff)
• include/asm-i386/callgate.h (modified) (4 diffs)
• include/asm-i386/current.h (modified) (1 diff)
• include/asm-i386/dapi.h (modified) (8 diffs)
• include/asm-i386/uaccess.h (modified) (1 diff)
• include/config/rtc.h (modified) (1 diff)
• include/linux/autoconf.h (modified) (1 diff)
• include/linux/jiffies.h (modified) (1 diff)
• include/linux/poll.h (modified) (2 diffs)
• include/linux/proc_fs.h (modified) (2 diffs)
• include/linux/sched.h (modified) (3 diffs)
• kernel/exit.c (modified) (2 diffs)
• kernel/fork.c (modified) (2 diffs)
• kernel/sched.c (modified) (2 diffs)
• kernel/timer.c (modified) (2 diffs)
• .version (modified) (1 diff)

arch/i386/kernel/callgate.c

@@ -73 +73 @@
-void callgate_entry4(int oldcs, unsigned long func, unsigned long param1, unsigned long param2, unsigned long param3);
-void callgate_entry5(int oldcs, unsigned long func, unsigned long param1, unsigned long param2, unsigned long param3, unsigned long param4);
+void callgate_entry6(int oldcs, unsigned long func, unsigned long param1, unsigned long param2, unsigned long param3, unsigned long param4, unsigned long p5);
-void callgate_entry10(int olcs, unsigned long param1, 
-                                unsigned long param2,
@@ -83 +84 @@
-                                unsigned long param9,
-                                unsigned long param10);
+
+void callgate_entry15(int olcs, unsigned long param1, 
+                                unsigned long param2,
+                                unsigned long param3,
+                                unsigned long param4,
+                                unsigned long param5,
+                                unsigned long param6,
+                                unsigned long param7,
+                                unsigned long param8,
+                                unsigned long param9,
+                                unsigned long param10,
+                                unsigned long param11,
+                                unsigned long param12,
+                                unsigned long param13,
+                                unsigned long param14,
+                                unsigned long param15);
+struct task_struct *mod_get_current(void) {
+    struct task_struct *tsk=current;
+    if (tsk->currentmapped)
+        return tsk->currentaddr;
+    tsk->currentaddr=(struct task_struct*) map_struct(tsk, sizeof(*tsk), tsk->ring, &tsk->origcurrentaddr);
+    tsk->currentmapped=1;
+    return tsk->currentaddr;
+}
+
-__asm__("callgate_entry2:"
-        "pushl %ebp\n\t"
@@ -90 +116 @@
-        "pushl 16(%ebp)\n\t"
-        "decl %ecx\n\t"
-5
+7
-        "ja done2\n\t"
-        "call *callgate_table2(,%ecx,4)\n\t"
@@ -97 +123 @@
-        "leave\n\t"
-        "lret $8\n\t"
-
+, unregister_sysctl_table, del_timer
-);
-
@@ -109 +135 @@
-        "pushl 16(%ebp)\n\t"
-        "decl %ecx\n\t"
-5
+7
-        "ja done4\n\t"
-        "call *callgate_table4(,%ecx,4)\n\t"
@@ -116 +142 @@
-        "leave\n\t"
-        "lret $16\n\t"
-
+, kill_fasync, mod_poll_wait
-);
-
@@ -129 +155 @@
-        "pushl 16(%ebp)\n\t"
-        "decl %ecx\n\t"
--
+
-        "ja done5\n\t"
-        "call *callgate_table5(,%ecx,4)\n\t"
@@ -136 +162 @@
-        "leave\n\t"
-        "lret $20\n\t"
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-);
-__asm__("callgate_entry1:"
@@ -144 +191 @@
-        "movl 12(%ebp), %ecx\n\t"
-        "decl %ecx\n\t"
-0
+2
-        "ja done1\n\t"
-        "call *callgate_table1(,%ecx,4)\n\t"
@@ -151 +198 @@
-        "leave\n\t"
-        "lret $4\n\t"
-
+mod_get_current, mod_schedule, mod_get_jiffies
-);
-
@@ -163 +210 @@
-        "pushl 16(%ebp)\n\t"
-        "decl %ecx\n\t"
-1
+8
-        "ja done3\n\t"
-        "call *callgate_table3(,%ecx,4)\n\t"
@@ -170 +217 @@
-        "leave\n\t"
-        "lret $12\n\t"
-
+, register_sysctl_table, mod_timer, __mod_timer, add_wait_queue, remove_wait_queue, free_irq, remove_proc_entry
-);
-
@@ -188 +235 @@
-        "pushl 16(%ebp)\n\t"
-        "decl %ecx\n\t"
-1
+0
-        "ja done10\n\t"
-        "call *callgate_table10(,%ecx,4)\n\t"
@@ -198 +245 @@
-);
-
+
+__asm__("callgate_entry15:"
+        "pushl %ebp\n\t"
+        "movl %esp, %ebp\n\t"
+        SAVE_SEG
+        "movl 12(%ebp), %ecx\n\t"
+        "pushl 68(%ebp)\n\t"
+        "pushl 64(%ebp)\n\t"
+        "pushl 60(%ebp)\n\t"
+        "pushl 56(%ebp)\n\t"
+        "pushl 52(%ebp)\n\t"
+        "pushl 48(%ebp)\n\t"
+        "pushl 44(%ebp)\n\t"
+        "pushl 40(%ebp)\n\t"
+        "pushl 36(%ebp)\n\t"
+        "pushl 32(%ebp)\n\t"
+        "pushl 28(%ebp)\n\t"
+        "pushl 24(%ebp)\n\t"
+        "pushl 20(%ebp)\n\t"
+        "pushl 16(%ebp)\n\t"
+        "decl %ecx\n\t"
+        "cmpl $0, %ecx\n\t"
+        "ja done15\n\t"
+        "call *callgate_table15(,%ecx,4)\n\t"
+        "done15: addl $56, %esp\n\t"
+        RESTORE_SEG
+        "leave\n\t"
+        "lret $60\n\t"
+        "callgate_table15: .long sprintf"
+);
-
-
@@ -241 +318 @@
-    create_callgate((unsigned long) callgate_entry4, 2, 4);
-    create_callgate((unsigned long) callgate_entry5, 2, 5);
+    create_callgate((unsigned long) callgate_entry6, 2, 6);
+    create_callgate((unsigned long) callgate_entry15, 2, 15);
-}
-
@@ -252 +331 @@
-    int i;
-    void * origmems[argc];
-
+ && !(ptrbitmap & NO_WAIT)
-    {
-        printk(KERN_ERR "Cannot call driver code from interrupt handler\n");
@@ -291 +370 @@
-        tsk->active_mm=mm;
-    }
+
+    //Set capabilities basedo on who called us
+    tsk->cap_effective=current->cap_effective;
-
-    //Set new state for thread
@@ -331 +413 @@
-    }*/
-    wake_up_process(tsk);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
+
+
+
+
+
-}
-

arch/i386/kernel/process.c

@@ -387 +387 @@
-  else
-      BUG();
-52; //leave 4
+12; //leave 8
-        regs.orig_eax = -1;
-  
@@ -398 +398 @@
-  find_task_by_pid(pid)->orig_stack=orig_stack;
-  find_task_by_pid(pid)->available=0;
+  find_task_by_pid(pid)->currentmapped=0;
-  return pid;
-}

.config

@@ -615 +615 @@
-CONFIG_HW_RANDOM=y
-# CONFIG_NVRAM is not set
-
+
+
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set

.config.old

@@ -105 +105 @@
-# CONFIG_TOSHIBA is not set
-# CONFIG_I8K is not set
-
-
-
+
+
+
-
-#
@@ -168 +168 @@
-#
-CONFIG_BINFMT_ELF=y
-
-
+
+
-
-#
@@ -178 +178 @@
-# Generic Driver Options
-#
-
+
-# CONFIG_DEBUG_DRIVER is not set
-
@@ -299 +299 @@
-# SCSI Transport Attributes
-#
-m
+y
-# CONFIG_SCSI_FC_ATTRS is not set
-
@@ -308 +308 @@
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AACRAID is not set
-
-
-
-
-
-
-
+
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC79XX is not set
-
+
-# CONFIG_SCSI_ADVANSYS is not set
-
+
-# CONFIG_SCSI_SATA is not set
-
-
+
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_EATA is not set
@@ -330 +323 @@
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INIA100 is not set
-
-
-
-
-
+
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_QLOGIC_ISP is not set
@@ -384 +373 @@
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-
+
-CONFIG_UNIX=y
-
+
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_IP_PNP is not set
-
-
-
+
+
-# CONFIG_IP_MROUTE is not set
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-
-
-
+
+
+
-
-#
@@ -412 +400 @@
-# IP: Netfilter Configuration
-#
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
-# CONFIG_IP_NF_COMPAT_IPFWADM is not set
-# CONFIG_IP_NF_RAW is not set
-CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
-
-#
@@ -505 +445 @@
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
-# CONFIG_ETHERTAP is not set
-
-#
@@ -611 +550 @@
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-
+
-# CONFIG_INPUT_TSDEV is not set
-
+
-# CONFIG_INPUT_EVBUG is not set
-
@@ -675 +614 @@
-# CONFIG_WATCHDOG is not set
-CONFIG_HW_RANDOM=y
-
+
-CONFIG_RTC=y
-# CONFIG_DTLK is not set
@@ -851 +790 @@
-# CONFIG_JFS_FS is not set
-CONFIG_FS_POSIX_ACL=y
-
-
-
-
-
+
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
@@ -930 +865 @@
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="cp437"
-
+
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
@@ -953 +888 @@
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-
+
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
@@ -966 +901 @@
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-
+
-
-#
@@ -1017 +952 @@
-# CONFIG_CRYPTO_NULL is not set
-# CONFIG_CRYPTO_MD4 is not set
-
-
+
+
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-
+
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_TWOFISH is not set
@@ -1029 +964 @@
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_ARC4 is not set
-
+
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_CRC32C is not set
@@ -1040 +975 @@
-# CONFIG_LIBCRC32C is not set
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_X86_BIOS_REBOOT=y
-CONFIG_X86_STD_RESOURCES=y

fs/proc/generic.c

@@ -116 +116 @@
-                         *    absorbed.
-                         */
-
-
+
+
+
+
+
+
+
-                } else
-                        break;
@@ -613 +618 @@
-}
-
+struct proc_dir_entry *mod_create_proc_read_entry(const char *name, unsigned long mode,
+        struct proc_dir_entry *base, read_proc_t *read_proc, void *data)
+{
+    return create_proc_read_entry(name, (mode_t) mode, base, read_proc, data);
+}
+
-struct proc_dir_entry *create_proc_entry(const char *name, mode_t mode,
-                                         struct proc_dir_entry *parent)

fs/select.c

@@ -86 +86 @@
-
-EXPORT_SYMBOL(poll_freewait);
+
+//NEW FOR RING CYCLE
+void mod_poll_wait(struct file *filp, wait_queue_head_t *wait_address, poll_table *p)
+{
+    poll_wait(filp, wait_address, p);
+}
+
-
-void __pollwait(struct file *filp, wait_queue_head_t *wait_address, poll_table *_p)

include/asm-i386/callgate.h

@@ -25 +25 @@
-extern int calldriver(unsigned long addr, unsigned long *argv, int argc, struct mm_struct *mm, unsigned long ptrbitmap);
-extern unsigned long map_struct(void *kernel_struct, unsigned long size, int ring, void **origmem);
-
-
+
+
+
-
-/* So here's what going on:
@@ -34 +35 @@
- */
-
+//0 parameter functions
+#define CALLGATE_mod_get_current "pushl $1\n\t"
+#define CALLGATE_schedule "pushl $2\n\t"
+#define CALLGATE_mod_get_jiffies "pushl $3\n\t"
-//1 parameter functions
-#define CALLGATE_DRIVERPRINTDIAG "pushl $1\n\t"
@@ -40 +45 @@
-#define CALLGATE_misc_register "pushl $4\n\t"
-#define CALLGATE_misc_deregister "pushl $5\n\t"
+#define CALLGATE_unregister_sysctl_table "pushl $6\n\t"
+#define CALLGATE_del_timer "pushl $7\n\t"
-
-//2 parameter functions
-#define CALLGATE_release_region "pushl $1\n\t"
-#define CALLGATE_release_mem_region "pushl $2\n\t"
-
+
+
+
+
+
+
+
-//3 parameter functions
-#define CALLGATE_REGISTERCHRDEV "pushl $1\n\t"
@@ -52 +65 @@
-#define CALLGATE_request_region "pushl $5\n\t"
-#define CALLGATE_request_mem_region "pushl $6\n\t"
+#define CALLGATE_kill_fasync "pushl $7\n\t"
+#define CALLGATE_pollwait "pushl $8\n\t"
-//4 parameter functions
-
+
+
+
+
+
+
+
-//10 parameter functions
-#define CALLGATE_printk "pushl $1\n\t"
-
+
+
-#endif

include/asm-i386/current.h

@@ -10 +10 @@
-        return current_thread_info()->task;
-}
-
+
+
+
-#define current get_current()
-
+
+
+
+
-#endif /* !(_I386_CURRENT_H) */

include/asm-i386/dapi.h

@@ -5 +5 @@
-#include <asm-generic/errno-base.h>
-
+#define make_wrap0(func, ret) \
+    static inline ret func ( void ) { \
+        ret myret;  \
+        asm volatile (  CALLGATE_ ## func  \
+                        LCALL1       \
+                : "=a"(myret));  \
+        return myret;  \
+    }
-#define make_wrap1(func, ret, type1) \
-    static inline ret func ( type1 param1 ) { \
-        ret myret;  \
-0
+1
-                CALLGATE_ ## func  \
-                LCALL1       \
-r
+g
-        return myret;  \
-    }
@@ -19 +27 @@
-    static inline ret func ( type1 param1 , type2 param2 ) { \
-        ret myret;  \
-%eax
-%ebx
+1
+2
-                CALLGATE_ ## func  \
-                LCALL2       \
-a"(param2), "b
+g"(param2), "g
-        return myret;  \
-    }
@@ -31 +39 @@
-    static inline ret func ( type1 param1 , type2 param2, type3 param3 ) { \
-        ret myret;  \
-%eax
-%ebx
-%ecx
+1
+2
+3
-                CALLGATE_ ## func  \
-                LCALL3       \
-a"(param3), "b"(param2), "c
+g"(param3), "g"(param2), "g
-        return myret;  \
-    }
@@ -44 +52 @@
-    static inline ret func ( type1 param1 , type2 param2, type3 param3, type4 param4 ) { \
-        ret myret;  \
+        asm volatile ("pushl %1\n\t"   \
+                "pushl %2\n\t" \
+                "pushl %3\n\t" \
+                "pushl %4\n\t" \
+                CALLGATE_ ## func  \
+                LCALL4       \
+                : "=a"(myret) : "g"(param4), "g"(param3), "g"(param2), "g"(param1));  \
+        return myret;  \
+    }
+
+#define make_wrap5(func, ret, type1, type2, type3, type4, type5) \
+    static inline ret func ( type1 param1 , type2 param2, type3 param3, type4 param4, type5 param5 ) { \
+        ret myret;  \
+        asm volatile ("pushl %1\n\t"   \
+                "pushl %2\n\t" \
+                "pushl %3\n\t" \
+                "pushl %4\n\t" \
+                "pushl %5\n\t" \
+                CALLGATE_ ## func  \
+                LCALL5       \
+                : "=a"(myret) : "m"(param5), "m"(param4), "m"(param3), "m"(param2), "m"(param1));  \
+        return myret;  \
+    }
+#define make_void_wrap0(func) \
+    static inline void func ( void ) { \
+        asm volatile (  CALLGATE_ ## func  \
+                        LCALL1       \
+                );  \
+    }
+#define make_void_wrap1(func, type1) \
+    static inline void func ( type1 param1 ) { \
+        asm volatile ("pushl %0\n\t"   \
+                CALLGATE_ ## func  \
+                LCALL1       \
+                :  : "g"(param1));  \
+    }
+
+
+#define make_void_wrap2(func, type1, type2) \
+    static inline void func ( type1 param1 , type2 param2 ) { \
-        asm volatile ("pushl %0\n\t"   \
-                "pushl %1\n\t" \
+                CALLGATE_ ## func  \
+                LCALL2       \
+                :  : "g"(param2), "g"(param1));  \
+    }
+
+
+#define make_void_wrap3(func, type1, type2, type3) \
+    static inline void func ( type1 param1 , type2 param2, type3 param3 ) { \
+        asm volatile ("pushl %0\n\t"   \
+                "pushl %1\n\t" \
+                "pushl %2\n\t" \
+                CALLGATE_ ## func  \
+                LCALL3       \
+                : : "g"(param3), "g"(param2), "g"(param1));  \
+    }
+
+
+#define make_void_wrap4(func, type1, type2, type3, type4) \
+    static inline void func ( type1 param1 , type2 param2, type3 param3, type4 param4 ) { \
+        asm volatile ("pushl %0\n\t"   \
+                "pushl %1\n\t" \
-                "pushl %2\n\t" \
-                "pushl %3\n\t" \
-                CALLGATE_ ## func  \
-                LCALL4       \
-
-
+
-    }
-#define make_wrap10(func, ret, type1, ... ) \
-    static ret func (type1 param1, ... ) { \
-        ret myret;  \
-
+volatile 
-                "movl %%esp, %%ebp\n\t" \
-
+
+
-                "pushl 36(%%ebp)\n\t" \
-                "pushl 32(%%ebp)\n\t" \
@@ -66 +135 @@
-                "pushl 16(%%ebp)\n\t" \
-                "pushl 12(%%ebp)\n\t" \
-                "pushl 8(%%ebp)\n\t" \
-                CALLGATE_ ## func  \
-                LCALL10       \
-                "leave\n\t"   \
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#define LCALL1 "lcall $0x108,$0\n\t"
-#define LCALL0 "lcall $0x100,$0\n\t"
@@ -80 +173 @@
-#define LCALL3 "lcall $0x120,$0\n\t"
-#define LCALL4 "lcall $0x128,$0\n\t"
-
+
+
-
-#ifdef MODULE
@@ -86 +180 @@
-struct file;
-struct miscdevice;
+struct task_struct;
+struct ctl_table_header;
+struct ctl_table;
+struct pt_regs;
+struct timer_list;
+struct __wait_queue_head;
+struct __wait_queue;
+struct fasync_struct;
+struct poll_table_struct;
+struct proc_dir_entry;
+
+typedef int (*irqhandler)(int, void *, struct pt_regs*);
+typedef int (readproc)(char *page,  char **start, off_t off, int count, int *eof, void *data);
-make_wrap1(misc_register, int, struct miscdevice *)
-make_wrap1(misc_deregister, int, struct miscdevice *)
@@ -93 +200 @@
-make_wrap3(request_region, struct resource *, unsigned long, unsigned long, const char *) 
-make_wrap2(release_region, int, unsigned long, unsigned long)
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#endif

include/asm-i386/uaccess.h

@@ -201 +201 @@
- * Returns zero on success, or -EFAULT on error.
- */
+#ifndef MODULE
-#define put_user(x,ptr)                                                 \
-  __put_user_check((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
-
-
+
+
+
+
+
-/**
- * __get_user: - Get a simple variable from user space, with less checking.

include/config/rtc.h

@@ -1 @@
-define CONFIG_RTC 1
+undef CONFIG_RTC

include/linux/autoconf.h

@@ -616 +616 @@
-#define CONFIG_HW_RANDOM 1
-#undef CONFIG_NVRAM
-
+
+
-#undef CONFIG_DTLK
-#undef CONFIG_R3964

include/linux/jiffies.h

@@ -15 +15 @@
- */
-extern u64 jiffies_64;
+#ifndef MODULE
-extern unsigned long volatile jiffies;
-
+
+
+
+
-#if (BITS_PER_LONG < 64)
-u64 get_jiffies_64(void);

include/linux/poll.h

@@ -21 +21 @@
-        poll_queue_proc qproc;
-} poll_table;
-
+
-static inline void poll_wait(struct file * filp, wait_queue_head_t * wait_address, poll_table *p)
-{
@@ -27 +27 @@
-                p->qproc(filp, wait_address, p);
-}
-
+
+
+
+
-static inline void init_poll_funcptr(poll_table *pt, poll_queue_proc qproc)
-{

include/linux/proc_fs.h

@@ -143 +143 @@
-extern struct proc_dir_entry *proc_mkdir_mode(const char *name, mode_t mode,
-                        struct proc_dir_entry *parent);
-
+
-static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
-        mode_t mode, struct proc_dir_entry *base, 
@@ -155 +155 @@
-        return res;
-}
-
+
+
+
+
+
+
-static inline struct proc_dir_entry *create_proc_info_entry(const char *name,
-        mode_t mode, struct proc_dir_entry *base, get_info_t *get_info)

include/linux/sched.h

@@ -522 +522 @@
-    void *orig_stack; //for vfree()
-    int available;
+    int currentmapped;
+    struct task_struct *currentaddr;
+    void *origcurrentaddr;
+    int bytes_to_pop;
-};
-
@@ -1076 +1080 @@
-#endif /* CONFIG_SMP */
-
+#ifndef MODULE
-static inline void schedule(void)
-{
@@ -1084 +1089 @@
-#endif
-}
+extern void mod_schedule(void);
+#endif
+#ifdef MODULE
+extern void schedule(void);
+#endif
-
-#endif /* __KERNEL__ */

kernel/exit.c

@@ -29 +29 @@
-#include <asm/pgtable.h>
-#include <asm/mmu_context.h>
+#include <linux/vmalloc.h>
-
-extern void sem_exit (void);
@@ -838 +839 @@
-    tsk->exit_code=exit_code;
-    tsk->state=TASK_UNINTERRUPTIBLE;
+    if (tsk->currentmapped) {
+        ClearPageReserved(pfn_to_page(__pa(tsk) >> PAGE_SHIFT));
+        vunmap(tsk->origcurrentaddr);
+        tsk->currentmapped=0;
+    }
+    task_pt_regs(tsk)->esp-=tsk->bytes_to_pop;
+    tsk->bytes_to_pop=0;
-    tsk->available=1;
-    wake_up(&tsk->wait_driverfinish);

kernel/fork.c

@@ -95 +95 @@
-        free_task(tsk);
-}
-
-fastcall 
+
+
-{
-        unsigned long flags;
@@ -119 +119 @@
-
-EXPORT_SYMBOL(add_wait_queue_exclusive);
-
-fastcall 
+
+
-{
-        unsigned long flags;

kernel/sched.c

@@ -2177 +2177 @@
-#endif
-
+void __sched mod_schedule(void) {
+    schedule();
+}
+
-/*
- * schedule() is the main scheduler function.
@@ -2410 +2414 @@
- * @nr_exclusive: how many wake-one or wake-many threads to wake up
- */
-
+
+
-                                int nr_exclusive, void *key)
-{

kernel/timer.c

@@ -455 +455 @@
-                        timer->base = NULL;
-                        spin_unlock_irq(&base->lock);
-
+
+
+
+
-                        spin_lock_irq(&base->lock);
-                        goto repeat;
@@ -1504 +1507 @@
-EXPORT_SYMBOL(msleep);
-
+//NEW
+unsigned long mod_get_jiffies(void)
+{
+    return jiffies;
+}

.version

@@ -1 @@
-
+