1.1 --- a/src/intr.c	Tue Jun 14 01:19:07 2011 +0300
     1.2 +++ b/src/intr.c	Sun Jul 24 18:29:24 2011 +0300
     1.3 @@ -40,12 +40,13 @@
     1.4   */
     1.5  struct intr_frame {
     1.6  	/* registers pushed by pusha in intr_entry_* */
     1.7 -	uint32_t edi, esi, ebp, esp;
     1.8 -	uint32_t ebx, edx, ecx, eax;
     1.9 +	struct registers regs;
    1.10  	/* interrupt number and error code pushed in intr_entry_* */
    1.11  	uint32_t inum, err;
    1.12  	/* pushed by CPU during interrupt entry */
    1.13  	uint32_t eip, cs, eflags;
    1.14 +	/* pushed by CPU during interrupt entry from user space */
    1.15 +	uint32_t esp, ss;
    1.16  };
    1.17  
    1.18