1.1 --- a/src/intr-asm.S	Thu Jul 28 17:56:05 2011 +0300
     1.2 +++ b/src/intr-asm.S	Sat Jul 30 07:21:54 2011 +0300
     1.3 @@ -70,9 +70,15 @@
     1.4  intr_entry_common:
     1.5  	pusha
     1.6  	call dispatch_intr
     1.7 +	jmp 0f
     1.8  
     1.9  	.globl intr_ret
    1.10  intr_ret:
    1.11 +	/* if called as a function from context_switch, we must
    1.12 +	 * remove the pushed return address before continuing
    1.13 +     */
    1.14 +	add $4, %esp
    1.15 +0:	/* ... we skip to here otherwise */
    1.16  	popa
    1.17  	/* remove error code and intr num from stack */
    1.18  	add $8, %esp