Changeset 70253688 in mainline for kernel/generic

Timestamp:

2012-09-07T08:12:05Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

e0c836e8

Parents:

131d9a4 (diff), 8cf4823 (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/generic/include

Files:

• interrupt.h (modified) (1 diff)
• lib/elf_load.h (modified) (1 diff)
• print.h (modified) (1 diff)
• printf/verify.h (added)

kernel/generic/include/interrupt.h

@@ -59 +59 @@
 extern exc_table_t exc_table[];
 
-extern void fault_from_uspace(istate_t *, const char *, ...);
+extern void fault_from_uspace(istate_t *, const char *, ...)
+    PRINTF_ATTRIBUTE(2, 3);
 extern void fault_if_from_uspace(istate_t *, const char *, ...)
     PRINTF_ATTRIBUTE(2, 3);

kernel/generic/include/lib/elf_load.h

@@ -42 +42 @@
  * ELF error return codes
  */
-#define EE_OK                   0       /* No error */
-#define EE_INVALID              1       /* Invalid ELF image */
-#define EE_MEMORY               2       /* Cannot allocate address space */
-#define EE_INCOMPATIBLE         3       /* ELF image is not compatible with current architecture */
-#define EE_UNSUPPORTED          4       /* Non-supported ELF (e.g. dynamic ELFs) */
-#define EE_LOADER               5       /* The image is actually a program loader. */
-#define EE_IRRECOVERABLE        6
+#define EE_OK             0  /* No error */
+#define EE_INVALID        1  /* Invalid ELF image */
+#define EE_MEMORY         2  /* Cannot allocate address space */
+#define EE_INCOMPATIBLE   3  /* ELF image is not compatible with current architecture */
+#define EE_UNSUPPORTED    4  /* Non-supported ELF (e.g. dynamic ELFs) */
+#define EE_LOADER         5  /* The image is actually a program loader. */
+#define EE_IRRECOVERABLE  6  /* Irrecoverable error. */
 
 /**
  * This flags is passed when running the loader, otherwise elf_load()
  * would return with a EE_LOADER error code.
- *
  */
 #define ELD_F_NONE    0

kernel/generic/include/print.h

@@ -38 +38 @@
 #include <typedefs.h>
 #include <stdarg.h>
-
-#ifndef NVERIFY_PRINTF
-
-#define PRINTF_ATTRIBUTE(start, end) \
-        __attribute__((format(gnu_printf, start, end)))
-
-#else /* NVERIFY_PRINTF */
-
-#define PRINTF_ATTRIBUTE(start, end)
-
-#endif /* NVERIFY_PRINTF */
+#include <printf/verify.h>
 
 #define EOF  (-1)