Changeset 51e5608 in mainline for kernel

Timestamp:

2011-03-27T17:58:54Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

27bdfa5, 79e1abd, a8ac368, cd1e6b62

Parents:

b330b309 (diff), df81f9ca (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 (0.4.3 Sashimi)

Location:

kernel

Files:

• arch/arm32/src/mach/integratorcp/integratorcp.c (modified) (1 diff)
• arch/mips32/include/cp0.h (modified) (2 diffs)
• arch/sparc64/src/smp/sun4v/smp.c (modified) (2 diffs)
• arch/sparc64/src/sun4v/start.S (modified) (1 diff)
• arch/sparc64/src/trap/sun4v/interrupt.c (modified) (1 diff)
• genarch/Makefile.inc (modified) (1 diff)
• genarch/src/kbrd/kbrd_pl050.c (deleted)
• genarch/src/kbrd/scanc_pl050.c (deleted)

kernel/arch/arm32/src/mach/integratorcp/integratorcp.c

@@ -292 +292 @@
                 .y = 480,
                 .scan = 2560,
-                .visual = VISUAL_BGR_0_8_8_8,
+                .visual = VISUAL_RGB_8_8_8_0,
         };
         

kernel/arch/mips32/include/cp0.h

@@ -70 +70 @@
   { \
       uint32_t retval; \
-      asm("mfc0 %0, $" #reg : "=r"(retval)); \
+      asm volatile ("mfc0 %0, $" #reg : "=r"(retval)); \
       return retval; \
   }
@@ -76 +76 @@
 #define GEN_WRITE_CP0(nm,reg) static inline void cp0_ ##nm##_write(uint32_t val) \
  { \
-    asm("mtc0 %0, $" #reg : : "r"(val) ); \
+    asm volatile ("mtc0 %0, $" #reg : : "r"(val) ); \
  }
 

kernel/arch/sparc64/src/smp/sun4v/smp.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Jakub Jermar
- * Copyright (c) 2009 Pavel Rimsky 
+ * Copyright (c) 2009 Pavel Rimsky
  * All rights reserved.
  *
@@ -439 +439 @@
         if (waitq_sleep_timeout(&ap_completion_wq, 10000000, SYNCH_FLAGS_NONE) ==
             ESYNCH_TIMEOUT)
-                printf("%s: waiting for processor (cpuid = %" PRIu32 ") timed out\n",
+                printf("%s: waiting for processor (cpuid = %" PRIu64 ") timed out\n",
                     __func__, cpuid);
         

kernel/arch/sparc64/src/sun4v/start.S

@@ -296 +296 @@
          * Create the first stack frame.
          */
-        save %sp, -(STACK_WINDWO_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE), %sp
+        save %sp, -(STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE), %sp
         flushw
         add %g0, -STACK_BIAS, %fp

kernel/arch/sparc64/src/trap/sun4v/interrupt.c

@@ -111 +111 @@
                         ((void (*)(void)) data1)();
                 } else {
-                        printf("Spurious interrupt on %d, data = %" PRIx64 ".\n",
+                        printf("Spurious interrupt on %" PRIu64 ", data = %" PRIx64 ".\n",
                             CPU->arch.id, data1);
                 }

kernel/genarch/Makefile.inc

@@ -122 +122 @@
 endif
 
-ifeq ($(CONFIG_PL050),y)
-        GENARCH_SOURCES += \
-                genarch/src/kbrd/kbrd_pl050.c \
-                genarch/src/kbrd/scanc_pl050.c
-endif
-
 ifeq ($(CONFIG_MAC_KBD),y)
         GENARCH_SOURCES += \