Changeset b0f00a9 in mainline for kernel/arch/ia32/src/cpu/cpu.c

Timestamp:

2011-11-06T22:21:05Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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.

File:

• kernel/arch/ia32/src/cpu/cpu.c (modified) (1 diff)

kernel/arch/ia32/src/cpu/cpu.c

@@ -118 +118 @@
                 );
         }
-        
+
+#ifndef PROCESSOR_i486
         if (CPU->arch.fi.bits.sep) {
                 /* Setup fast SYSENTER/SYSEXIT syscalls */
                 syscall_setup_cpu();
         }
+#endif
 }