Changeset 22

Timestamp:

11/13/05 22:32:16 (6 years ago)

Author:

dkaplan1

Message:

Lots of modifications to make the rtc driver work, see bugzilla for more
information

copy_to_user still untested

Files:

• arch/i386/kernel/callgate.c (modified) (3 diffs)
• arch/i386/kernel/irq.c (modified) (1 diff)
• arch/i386/lib/usercopy.c (modified) (1 diff)
• arch/i386/mm/fault.c (modified) (1 diff)
• include/linux/module.h (modified) (1 diff)
• include/linux/sched.h (modified) (2 diffs)
• kernel/exit.c (modified) (1 diff)
• kernel/fork.c (modified) (1 diff)
• kernel/module.c (modified) (2 diffs)
• kernel/sched.c (modified) (3 diffs)
• kernel/timer.c (modified) (1 diff)
• .version (modified) (1 diff)

arch/i386/kernel/callgate.c

@@ -363 +363 @@
-        return -1;
-    }*/
-    tsk->available=0;
-    //Set memory map
-    if (mm) {
@@ -371 +370 @@
-        tsk->active_mm=mm;
-    }
-
+
-    //Set capabilities basedo on who called us
-    tsk->cap_effective=current->cap_effective;
@@ -413 +412 @@
-        tsk->state=TASK_RUNNING;
-    }*/
+    /*if (ptrbitmap & NO_WAIT) {
+        //increase priority
+        set_user_nice(tsk, -20);
+    } else {
+        set_user_nice(tsk, 0);
+    }*/
-    wake_up_process(tsk);
-    if (!(ptrbitmap & NO_WAIT)) {
-        tsk->bytes_to_pop=0;
-interruptible_
+
-        //Free any memory we allocated
-        for (i=0; i<argc; i++) {

arch/i386/kernel/irq.c

@@ -234 +234 @@
-    else {
-        unsigned long args[3]={irq, (unsigned long) action->dev_id, (unsigned long) regs};
-current->mm
+NULL
-        retval|=IRQ_HANDLED;
-    }

arch/i386/lib/usercopy.c

@@ -595 +595 @@
-copy_to_user(void __user *to, const void *from, unsigned long n)
-{
+    if (current->ring==1) {
+        printk("need to copy %d bytes from %x to %x\n", n, from, to);
+        return 0;
+    }
-        might_sleep();
-        if (access_ok(VERIFY_WRITE, to, n))

arch/i386/mm/fault.c

@@ -520 +520 @@
-                if (!pte_present(*pte_k))
-    {
-        printk("Could not find pte_k");
-        goto no_context;
-    }

include/linux/module.h

@@ -323 +323 @@
-  struct task_struct *worker_threads[NR_DRIVERTHREADS];
-
+  //Lock for worker threads
+  spinlock_t threads_lock;
+
-  /*ring we got loaded in*/
-  unsigned int ring;

include/linux/sched.h

@@ -526 +526 @@
-    void *origcurrentaddr;
-    int bytes_to_pop;
+    struct task_struct *caller;
-};
-
@@ -744 +745 @@
-extern int FASTCALL(wake_up_process(struct task_struct * tsk));
-extern void FASTCALL(wake_up_forked_process(struct task_struct * tsk, unsigned long clone_flags));
+extern int wake_up_sync(task_t *p);
-#ifdef CONFIG_SMP
- extern void kick_process(struct task_struct *tsk);

kernel/exit.c

@@ -837 +837 @@
-    //Make it look like we finished, but stick around
-    struct task_struct *tsk=current;
+    int irq;
-    tsk->exit_code=exit_code;
-    tsk->state=TASK_UNINTERRUPTIBLE;
-
+/*
-        ClearPageReserved(pfn_to_page(__pa(tsk) >> PAGE_SHIFT));
-        ClearPageReserved(pfn_to_page((__pa(tsk) >> PAGE_SHIFT) + 1));
-        vunmap(tsk->origcurrentaddr);
-        tsk->currentmapped=0;
-
+
+
-    task_pt_regs(tsk)->esp+=tsk->bytes_to_pop;
-    tsk->bytes_to_pop=0;

kernel/fork.c

@@ -946 +946 @@
-        init_waitqueue_head(&p->wait_chldexit);
-  init_waitqueue_head(&p->wait_driverfinish);
+  p->caller=p;
-        p->vfork_done = NULL;
-        spin_lock_init(&p->alloc_lock);

kernel/module.c

@@ -1873 +1873 @@
-  //FIXME: Figure out what ring to load module in (how?)
-  mod->ring=1;
+  spin_lock_init(&mod->threads_lock);
-  for (i=0; i<NR_DRIVERTHREADS; i++) {
-      pid=create_driver_thread(0, mod->ring);
@@ -1943 +1944 @@
-        if (within(addr, mod->module_init, mod->init_size) ||
-                within(addr, mod->module_core, mod->core_size)) {
+            spin_lock_irq(&mod->threads_lock);
-            //Now find an availalbe one
-            while (i < (NR_DRIVERTHREADS-1+use_reserved)) {
-                if (mod->worker_threads[i]->available) {
+                    mod->worker_threads[i]->available=0;
-                    tsk=mod->worker_threads[i]; 
+                    spin_unlock_irq(&mod->threads_lock);
-                    goto out;
-                }

kernel/sched.c

@@ -2181 +2181 @@
-}
-
+int wake_up_sync(task_t *p) {
+    return try_to_wake_up(p, TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE, 1);
+}
+
-/*
- * schedule() is the main scheduler function.
@@ -2360 +2364 @@
-{
-        task_t *p = curr->task;
+  if (!p) BUG();
-        return try_to_wake_up(p, mode, sync);
-}
@@ -4062 +4067 @@
-
-int mod_signal_pending(struct task_struct *p) {
-
-
+->caller
+

kernel/timer.c

@@ -457 +457 @@
-      if ((unsigned long) fn > PAGE_OFFSET)
-                          fn(data);
-
-
+
+
+
+
-                        spin_lock_irq(&base->lock);
-                        goto repeat;

.version

@@ -1 @@
-3
+6