Changeset 76b5a95c in mainline for kernel/arch

Timestamp:

2011-03-23T20:53:30Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

71af5a4

Parents:

5716e9a (diff), ab10b842 (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

Files:

• arm32/src/mach/integratorcp/integratorcp.c (modified) (1 diff)
• ia32/_link.ld.in (modified) (1 diff)
• mips32/src/mm/tlb.c (modified) (1 diff)
• sparc64/src/sun4v/asm.S (modified) (1 diff)

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/ia32/_link.ld.in

@@ -49 +49 @@
         }
         
+#ifdef CONFIG_LINE_DEBUG
+        .comment 0 : { *(.comment); }
+        .debug_abbrev 0 : { *(.debug_abbrev); }
+        .debug_aranges 0 : { *(.debug_aranges); }
+        .debug_info 0 : { *(.debug_info); }
+        .debug_line 0 : { *(.debug_line); }
+        .debug_loc 0 : { *(.debug_loc); }
+        .debug_pubnames 0 : { *(.debug_pubnames); }
+        .debug_pubtypes 0 : { *(.debug_pubtypes); }
+        .debug_ranges 0 : { *(.debug_ranges); }
+        .debug_str 0 : { *(.debug_str); }
+#endif
+        
         /DISCARD/ : {
-                *(.note.GNU-stack);
-                *(.comment);
+                *(*);
         }
         

kernel/arch/mips32/src/mm/tlb.c

@@ -557 +557 @@
         entry_hi_t hi, hi_save;
         tlb_index_t index;
-
-        ASSERT(asid != ASID_INVALID);
+        
+        if (asid == ASID_INVALID)
+                return;
 
         hi_save.value = cp0_entry_hi_read();

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

@@ -41 +41 @@
 .global switch_to_userspace
 switch_to_userspace:
-        wrpr PSTATE_PRIV_BIT, %pstate
-        save %o1, -STACK_WINDOW_SAVE_AREA_SIZE, %sp
+        save %o1, -(STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE), %sp
         flushw
         wrpr %g0, 0, %cleanwin          ! avoid information leak