Changeset 8aa2b3b in mainline for kernel/arch/ia32

Timestamp:

2011-04-03T15:41:33Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e2098dd7

Parents:

3a3d4ca (diff), b2a081ae (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:

• _link.ld.in (modified) (1 diff)
• src/asm.S (modified) (3 diffs)
• src/cpu/cpu.c (modified) (2 diffs)

kernel/arch/ia32/_link.ld.in

@@ -25 +25 @@
         .mapped (PA2KA(BOOT_OFFSET)+SIZEOF(.unmapped)): AT (SIZEOF(.unmapped)) { 
                 ktext_start = .;
-                *(.text);
+                *(.text .text.*);
                 ktext_end = .;
                 
                 kdata_start = .;
                 *(.data);               /* initialized data */
-                *(.rodata*);            /* string literals */
+                *(.rodata .rodata.*);   /* string literals */
                 *(COMMON);              /* global variables */
                 hardcoded_load_address = .;

kernel/arch/ia32/src/asm.S

@@ -38 +38 @@
 .global paging_on
 .global enable_l_apic_in_msr
-.global memsetb
-.global memsetw
-.global memcpy
 .global memcpy_from_uspace
 .global memcpy_from_uspace_failover_address
@@ -47 +44 @@
 .global early_putchar
 
-/* Wrapper for generic memsetb */
-memsetb:
-        jmp _memsetb
-
-/* Wrapper for generic memsetw */
-memsetw:
-        jmp _memsetw
-
 #define MEMCPY_DST   4
 #define MEMCPY_SRC   8
@@ -74 +63 @@
  *
  */
-memcpy:
 memcpy_from_uspace:
 memcpy_to_uspace:

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

@@ -92 +92 @@
 void cpu_arch_init(void)
 {
-        cpuid_extended_feature_info efi;
         cpu_info_t info;
         uint32_t help = 0;
@@ -104 +103 @@
         
         CPU->arch.fi.word = info.cpuid_edx;
-        efi.word = info.cpuid_ecx;
         
         if (CPU->arch.fi.bits.fxsr)