Changeset 1787e527 in mainline for kernel/arch/ia64/src/cpu/cpu.c

Timestamp:

2009-11-16T21:22:54Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

5ebdf94

Parents:

fcbd1be (diff), 9c70ed6 (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:

merged with head (unstable)

File:

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

kernel/arch/ia64/src/cpu/cpu.c

@@ -54 +54 @@
         char vendor[2 * sizeof(uint64_t) + 1];
         
-        *((uint64_t *) &vendor[0 * sizeof(uint64_t)]) = CPU->arch.cpuid0;
-        *((uint64_t *) &vendor[1 * sizeof(uint64_t)]) = CPU->arch.cpuid1;
+        memcpy(vendor, &CPU->arch.cpuid0, 8);
+        memcpy(vendor + 8, &CPU->arch.cpuid1, 8);
         vendor[sizeof(vendor) - 1] = 0;
         
-        switch(m->arch.cpuid3.family) {
+        switch (m->arch.cpuid3.family) {
         case FAMILY_ITANIUM:
                 family_str = "Itanium";