Changeset 5c1b3cd in mainline for kernel/arch/ia32

Timestamp:

2013-03-16T21:48:33Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

6b0cfa1

Parents:

71fe7e9d (diff), f597bc4 (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:

Mainline changes

Location:

kernel/arch/ia32/include

Files:

• arch/arch.h (moved) (moved from kernel/arch/ia32/include/arch.h )
• arch/asm.h (moved) (moved from kernel/arch/ia32/include/asm.h )
• arch/atomic.h (moved) (moved from kernel/arch/ia32/include/atomic.h )
• arch/barrier.h (moved) (moved from kernel/arch/ia32/include/barrier.h )
• arch/bios/bios.h (moved) (moved from kernel/arch/ia32/include/bios/bios.h )
• arch/boot/boot.h (moved) (moved from kernel/arch/ia32/include/boot/boot.h )
• arch/boot/memmap.h (moved) (moved from kernel/arch/ia32/include/boot/memmap.h )
• arch/context.h (moved) (moved from kernel/arch/ia32/include/context.h )
• arch/context_offset.h (moved) (moved from kernel/arch/ia32/include/context_offset.h )
• arch/cpu.h (moved) (moved from kernel/arch/ia32/include/cpu.h )
• arch/cpuid.h (moved) (moved from kernel/arch/ia32/include/cpuid.h )
• arch/cycle.h (moved) (moved from kernel/arch/ia32/include/cycle.h )
• arch/ddi/ddi.h (moved) (moved from kernel/arch/ia32/include/ddi/ddi.h )
• arch/drivers/i8254.h (moved) (moved from kernel/arch/ia32/include/drivers/i8254.h )
• arch/drivers/i8259.h (moved) (moved from kernel/arch/ia32/include/drivers/i8259.h )
• arch/elf.h (moved) (moved from kernel/arch/ia32/include/elf.h )
• arch/faddr.h (moved) (moved from kernel/arch/ia32/include/faddr.h )
• arch/fpu_context.h (moved) (moved from kernel/arch/ia32/include/fpu_context.h )
• arch/interrupt.h (moved) (moved from kernel/arch/ia32/include/interrupt.h )
• arch/istate.h (moved) (moved from kernel/arch/ia32/include/istate.h ) (1 diff)
• arch/mm/as.h (moved) (moved from kernel/arch/ia32/include/mm/as.h )
• arch/mm/asid.h (moved) (moved from kernel/arch/ia32/include/mm/asid.h )
• arch/mm/frame.h (moved) (moved from kernel/arch/ia32/include/mm/frame.h )
• arch/mm/km.h (moved) (moved from kernel/arch/ia32/include/mm/km.h )
• arch/mm/page.h (moved) (moved from kernel/arch/ia32/include/mm/page.h )
• arch/mm/tlb.h (moved) (moved from kernel/arch/ia32/include/mm/tlb.h )
• arch/pm.h (moved) (moved from kernel/arch/ia32/include/pm.h )
• arch/proc/task.h (moved) (moved from kernel/arch/ia32/include/proc/task.h )
• arch/proc/thread.h (moved) (moved from kernel/arch/ia32/include/proc/thread.h )
• arch/smp/ap.h (moved) (moved from kernel/arch/ia32/include/smp/ap.h )
• arch/smp/apic.h (moved) (moved from kernel/arch/ia32/include/smp/apic.h )
• arch/smp/mps.h (moved) (moved from kernel/arch/ia32/include/smp/mps.h )
• arch/smp/smp.h (moved) (moved from kernel/arch/ia32/include/smp/smp.h )
• arch/stack.h (added)
• arch/syscall.h (added)
• arch/types.h (moved) (moved from kernel/arch/ia32/include/types.h )
• syscall.h (deleted)

kernel/arch/ia32/include/arch/istate.h

@@ -68 +68 @@
 } istate_t;
 
+#define RPL_USER        3
+
 /** Return true if exception happened while in userspace */
 NO_TRACE static inline int istate_from_uspace(istate_t *istate)
 {
-        return !(istate->eip & UINT32_C(0x80000000));
+        return (istate->cs & RPL_USER) == RPL_USER;
 }