Changeset b678410 in mainline for kernel/arch

Timestamp:

2011-04-27T20:01:13Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a6dffb8

Parents:

628d548 (diff), 933cadf (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:

• abs32le/include/types.h (modified) (1 diff)
• amd64/include/types.h (modified) (1 diff)
• arm32/include/types.h (modified) (1 diff)
• ia32/include/types.h (modified) (1 diff)
• ia64/_link.ld.in (modified) (1 diff)
• ia64/include/types.h (modified) (1 diff)
• ia64/src/ivt.S (modified) (1 diff)
• ia64/src/start.S (modified) (1 diff)
• mips32/include/atomic.h (modified) (1 diff)
• mips32/include/types.h (modified) (1 diff)
• mips32/src/mm/frame.c (modified) (1 diff)
• ppc32/include/types.h (modified) (1 diff)
• sparc64/include/cpu.h (modified) (1 diff)
• sparc64/include/sun4u/cpu.h (modified) (1 diff)
• sparc64/include/types.h (modified) (1 diff)

kernel/arch/abs32le/include/types.h

@@ -40 +40 @@
 
 typedef uint32_t size_t;
+typedef int32_t ssize_t;
 
 typedef uint32_t uintptr_t;

kernel/arch/amd64/include/types.h

@@ -37 +37 @@
 
 typedef uint64_t size_t;
+typedef int64_t ssize_t;
 
 typedef uint64_t uintptr_t;

kernel/arch/arm32/include/types.h

@@ -44 +44 @@
 
 typedef uint32_t size_t;
+typedef int32_t ssize_t;
 
 typedef uint32_t uintptr_t;

kernel/arch/ia32/include/types.h

@@ -37 +37 @@
 
 typedef uint32_t size_t;
+typedef int32_t ssize_t;
 
 typedef uint32_t uintptr_t;

kernel/arch/ia64/_link.ld.in

@@ -30 +30 @@
                 hardcoded_kdata_size = .;
                 QUAD(kdata_end - kdata_start);
+                __gp = .;
                 *(.got .got.*)
                 *(.sdata)

kernel/arch/ia64/include/types.h

@@ -37 +37 @@
 
 typedef uint64_t size_t;
+typedef int64_t ssize_t;
 
 typedef uint64_t uintptr_t;

kernel/arch/ia64/src/ivt.S

@@ -391 +391 @@
 
     /* 10. call handler */
-        movl r1 = kernel_image_start
+        movl r1 = __gp
     
         mov b1 = loc2

kernel/arch/ia64/src/start.S

@@ -174 +174 @@
         
         # Initialize gp (Global Pointer) register
-        movl gp = kernel_image_start
+        movl gp = __gp
         
-        #       
+        #
         # Initialize bootinfo on BSP.
         #

kernel/arch/mips32/include/atomic.h

@@ -91 +91 @@
                 "       sc %0, %1\n"
                 "       beqz %0, 1b\n"
+                "       nop\n"
                 "2:\n"
                 : "=&r" (tmp),

kernel/arch/mips32/include/types.h

@@ -37 +37 @@
 
 typedef uint32_t size_t;
+typedef int32_t ssize_t;
 
 typedef uint32_t uintptr_t;

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

@@ -88 +88 @@
         /* gxemul devices */
         if (overlaps(frame << ZERO_PAGE_WIDTH, ZERO_PAGE_SIZE,
-            0x10000000, MB2SIZE(256)))
+            0x10000000, MiB2SIZE(256)))
                 return false;
 #endif

kernel/arch/ppc32/include/types.h

@@ -37 +37 @@
 
 typedef uint32_t size_t;
+typedef int32_t ssize_t;
 
 typedef uint32_t uintptr_t;

kernel/arch/sparc64/include/cpu.h

@@ -59 +59 @@
 #include <arch/asm.h>
 
-#ifdef CONFIG_SMP
-#include <arch/mm/cache.h>
-#endif
-
-
 #if defined (SUN4U)
 #include <arch/sun4u/cpu.h>

kernel/arch/sparc64/include/sun4u/cpu.h

@@ -60 +60 @@
 #include <trace.h>
 
-#ifdef CONFIG_SMP
-#include <arch/mm/cache.h>
-#endif
-
 typedef struct {
         uint32_t mid;              /**< Processor ID as read from

kernel/arch/sparc64/include/types.h

@@ -37 +37 @@
 
 typedef uint64_t size_t;
+typedef int64_t ssize_t;
 
 typedef uint64_t uintptr_t;