Merge branch 'master' into prog-loader

[lunaix-os.git] / lunaix-os / kernel / asm / x86 / syscall.S

diff --git a/lunaix-os/kernel/asm/x86/syscall.S b/lunaix-os/kernel/asm/x86/syscall.S
index bde7f36d9d79b6a0f2e59736be6fd5e4ad191fdc..62e07212264d300aed2a80d7aaee2c0d0267d635 100644 (file)
--- a/lunaix-os/kernel/asm/x86/syscall.S
+++ b/lunaix-os/kernel/asm/x86/syscall.S
@@ -72,10 +72,11 @@
 .section .text
     syscall_hndlr:
         pushl %ebp
 .section .text
     syscall_hndlr:
         pushl %ebp

-        movl 8(%esp), %ebp
+        movl 8(%esp), %ebp          // isr_param*

 
 

-        movl  (%ebp), %eax          /* eax: call code as well as the return value from syscall */
-        cmpl  $__SYSCALL_MAX, %eax
+        addl $4, %ebp
+        movl (%ebp), %eax          /* eax: call code as well as the return value from syscall */
+        cmpl $__SYSCALL_MAX, %eax

         jae 2f
 
         shll $2, %eax
         jae 2f
 
         shll $2, %eax