Changeset dff90fa7 in mainline for kernel/generic/include

Timestamp:

2013-06-05T19:41:12Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

74dcc07

Parents:

f288d85 (diff), 6db5d4b (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:

mainline changes

Location:

kernel/generic/include

Files:

• debug.h (modified) (1 diff)
• lib/memfnc.h (modified) (1 diff)
• mm/tlb.h (modified) (1 diff)
• printf/verify.h (modified) (1 diff)

kernel/generic/include/debug.h

@@ -77 +77 @@
         } while (0)
 
+/** Static assert macro
+ *
+ */
+#define STATIC_ASSERT(expr) \
+        _Static_assert(expr, "")
+
+#define STATIC_ASSERT_VERBOSE(expr, msg) \
+        _Static_assert(expr, msg)
+
+
 #else /* CONFIG_DEBUG */
 
 #define ASSERT(expr)
 #define ASSERT_VERBOSE(expr, msg)
+#define STATIC_ASSERT(expr)
+#define STATIC_ASSERT_VERBOSE(expr, msg)
 
 #endif /* CONFIG_DEBUG */

kernel/generic/include/lib/memfnc.h

@@ -38 +38 @@
 #include <typedefs.h>
 
-extern void *memset(void *, int, size_t);
-extern void *memcpy(void *, const void *, size_t);
+extern void *memset(void *, int, size_t)
+    __attribute__ ((optimize("-fno-tree-loop-distribute-patterns")));
+extern void *memcpy(void *, const void *, size_t)
+    __attribute__ ((optimize("-fno-tree-loop-distribute-patterns")));
 
 #endif

kernel/generic/include/mm/tlb.h

@@ -73 +73 @@
 extern void tlb_shootdown_ipi_recv(void);
 #else
-#define tlb_shootdown_start(w, x, y, z) (0)
-#define tlb_shootdown_finalize(i)       ((i) = (i));
+#define tlb_shootdown_start(w, x, y, z) interrupts_disable()    
+#define tlb_shootdown_finalize(i)       (interrupts_restore(i));
 #define tlb_shootdown_ipi_recv()
 #endif /* CONFIG_SMP */

kernel/generic/include/printf/verify.h

@@ -38 +38 @@
 #ifndef NVERIFY_PRINTF
 
+#ifdef __clang__
+#define PRINTF_ATTRIBUTE(start, end) \
+        __attribute__((format(__printf__, start, end)))
+#else
 #define PRINTF_ATTRIBUTE(start, end) \
         __attribute__((format(gnu_printf, start, end)))
+#endif
+
 
 #else /* NVERIFY_PRINTF */