Changeset 5f83634 in mainline for kernel/arch/ia32/src/pm.c

Timestamp:

2010-07-12T16:45:05Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6b1a85c

Parents:

bee2d4c (diff), 8078180 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/upa

File:

• kernel/arch/ia32/src/pm.c (modified) (2 diffs)

kernel/arch/ia32/src/pm.c

@@ -130 +130 @@
                 d->selector = gdtselector(KTEXT_DES);
 
-                d->access = AR_PRESENT | AR_INTERRUPT;  /* masking interrupt */
-
                 if (i == VECTOR_SYSCALL) {
                         /*
-                         * The syscall interrupt gate must be calleable from
-                         * userland.
+                         * The syscall trap gate must be callable from
+                         * userland. Interrupts will remain enabled.
                          */
-                        d->access |= DPL_USER;
+                        d->access = AR_PRESENT | AR_TRAP | DPL_USER;
+                } else {
+                        /*
+                         * Other interrupts use interrupt gates which
+                         * disable interrupts.
+                         */
+                        d->access = AR_PRESENT | AR_INTERRUPT;
                 }
         }
@@ -206 +210 @@
         idt_setoffset(d++, (uintptr_t) &int_62);
         idt_setoffset(d++, (uintptr_t) &int_63);
+
+        idt_setoffset(&idt[VECTOR_SYSCALL], (uintptr_t) &int_syscall);
 }