Changeset b473611 in mainline for kernel/generic

Timestamp:

2010-02-13T23:56:33Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e3a3a619

Parents:

e70edd1 (diff), b86d436 (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 the sparc branch.
Both sun4u and sun4v appear to work.
HM cleanup is pending.

Location:

kernel/generic

Files:

• include/errno.h (modified) (1 diff)
• src/main/kinit.c (modified) (3 diffs)

kernel/generic/include/errno.h

@@ -57 +57 @@
 #define EADDRNOTAVAIL   -12     /* Address not available. */
 #define ETIMEOUT        -13     /* Timeout expired */
+//MH
+#ifndef EINVAL
 #define EINVAL          -14     /* Invalid value */
+#endif
+#ifndef EBUSY
 #define EBUSY           -15     /* Resource is busy */
+#endif
 #define EOVERFLOW       -16     /* The result does not fit its size. */
 #define EINTR           -17     /* Operation was interrupted. */

kernel/generic/src/main/kinit.c

@@ -94 +94 @@
 void kinit(void *arg)
 {
-
 #if defined(CONFIG_SMP) || defined(CONFIG_KCONSOLE)
         thread_t *thread;
@@ -217 +216 @@
                 }
         }
-        
+
         /*
          * Run user tasks.
@@ -225 +224 @@
                         program_ready(&programs[i]);
         }
-        
+
 #ifdef CONFIG_KCONSOLE
         if (!stdin) {