Clean up interrupt handling.

[pintos-anon] / src / threads / interrupt.h

diff --git a/src/threads/interrupt.h b/src/threads/interrupt.h
index 2a2b3ef0818409fb7e10c62b50fe3f1affc4a140..a40276a5852340ef5dd54f969c9346ba5dcca281 100644 (file)
--- a/src/threads/interrupt.h
+++ b/src/threads/interrupt.h
@@ -15,7 +15,7 @@ enum if_level intr_set_level (enum if_level);
 enum if_level intr_enable (void);
 enum if_level intr_disable (void);
 \f
-struct intr_args
+struct intr_frame
   {
     /* Pushed by the stubs. */
     uint32_t edi;
@@ -37,11 +37,11 @@ struct intr_args
     void (*eip) (void);
     uint16_t cs, :16;
     uint32_t eflags;
-    uint32_t esp;
+    void *esp;
     uint16_t ss, :16;
   };
 
-typedef void intr_handler_func (struct intr_args *);
+typedef void intr_handler_func (struct intr_frame *);
 
 void intr_init (void);
 void intr_register (uint8_t vec, int dpl, enum if_level, intr_handler_func *);