Changeset e6a78b9 in mainline for kernel/arch/ia32

Timestamp:

2012-06-29T15:31:44Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9432f08

Parents:

34ab31c0 (diff), 0bbd13e (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 mainline changes.

Location:

kernel/arch/ia32

Files:

• Makefile.inc (modified) (2 diffs)
• src/userspace.c (modified) (2 diffs)

kernel/arch/ia32/Makefile.inc

@@ -38 +38 @@
 GCC_CFLAGS += $(CMN1)
 ICC_CFLAGS += $(CMN1)
-SUNCC_CFLAGS += $(CMN1)
 CLANG_CFLAGS += $(CMN1)
 
@@ -50 +49 @@
 ifeq ($(PROCESSOR),athlon_xp)
         CMN2 = -march=athlon-xp
-        SUNCC_CFLAGS += -xarch=ssea
 endif
 
 ifeq ($(PROCESSOR),athlon_mp)
         CMN2 = -march=athlon-mp
-        SUNCC_CFLAGS += xarch=ssea
 endif
 
 ifeq ($(PROCESSOR),pentium3)
         CMN2 = -march=pentium3
-        SUNCC_CFLAGS += -xarch=sse
 endif
 
 ifeq ($(PROCESSOR),pentium4)
         CMN2 = -march=pentium4
-        SUNCC_CFLAGS += -xarch=sse2
 endif
 
 ifeq ($(PROCESSOR),core)
         CMN2 = -march=prescott
-        SUNCC_CFLAGS += -xarch=sse3
 endif
 

kernel/arch/ia32/src/userspace.c

@@ -63 +63 @@
                 
                 "pushl %[udata_des]\n"
-                "pushl %[stack_size]\n"
+                "pushl %[stack_top]\n"
                 "pushl %[ipl]\n"
                 "pushl %[utext_des]\n"
@@ -75 +75 @@
                 :
                 : [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
-                  [stack_size] "r" ((uint8_t *) kernel_uarg->uspace_stack + STACK_SIZE),
+                  [stack_top] "r" ((uint8_t *) kernel_uarg->uspace_stack +
+                      kernel_uarg->uspace_stack_size),
                   [ipl] "r" (ipl),
                   [utext_des] "i" (GDT_SELECTOR(UTEXT_DES) | PL_USER),