Changeset 7715994 in mainline for kernel/arch/arm32/src/cpu/cpu.c

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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/arm32/src/cpu/cpu.c (modified) (3 diffs)

kernel/arch/arm32/src/cpu/cpu.c

@@ -43 +43 @@
 
 /** Implementators (vendor) names */
-static char *imp_data[] = {
+static const char *imp_data[] = {
         "?",                                    /* IMP_DATA_START_OFFSET */
         "ARM Ltd",                              /* 0x41 */
@@ -60 +60 @@
 
 /** Architecture names */
-static char *arch_data[] = {
+static const char *arch_data[] = {
         "?",       /* 0x0 */
         "4",       /* 0x1 */
@@ -108 +108 @@
 void cpu_print_report(cpu_t *m)
 {
-        char * vendor = imp_data[0];
-        char * architecture = arch_data[0];
+        const char *vendor = imp_data[0];
+        const char *architecture = arch_data[0];
         cpu_arch_t * cpu_arch = &m->arch;