Changeset 74bcf5e in mainline

Timestamp:

2009-02-14T20:42:04Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

687c3cd

Parents:

1f7cb3a

Message:

Get rid of CONFIG_SIMICS_FIX.

Files:

• HelenOS.config (modified) (1 diff)
• kernel/arch/ia32/src/mm/frame.c (modified) (2 diffs)

HelenOS.config

@@ -286 +286 @@
 % Improved support for hyperthreading
 ! [((PLATFORM=ia32&MACHINE!=athlon-xp&MACHINE!=athlon-mp&MACHINE!=pentium3)|PLATFORM=amd64)&CONFIG_SMP=y] CONFIG_HT (y/n)
-
-% Simics BIOS AP boot fix
-! [(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_SMP=y] CONFIG_SIMICS_FIX (y/n)
 
 % Lazy FPU context switching

kernel/arch/ia32/src/mm/frame.c

@@ -119 +119 @@
                         hardcoded_unmapped_kdata_size));
 #endif
-#ifdef CONFIG_SIMICS_FIX
-                minconf = max(minconf, ADDR2PFN(0x10000));
-#endif
                 init_e820_memory(minconf);
 
@@ -132 +129 @@
                         (hardcoded_unmapped_ktext_size +
                         hardcoded_unmapped_kdata_size) >> FRAME_WIDTH);
-                
-#ifdef CONFIG_SIMICS_FIX
-                /* Don't know why, but these addresses help */
-                frame_mark_unavailable(0xd000 >> FRAME_WIDTH, 3);
-#endif
 #endif
         }