Changeset 95c675b in mainline for kernel/arch/sparc64/src/sparc64.c

Timestamp:

2017-10-17T13:11:35Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

• kernel/arch/sparc64/src/sparc64.c (modified) (1 diff)

kernel/arch/sparc64/src/sparc64.c

@@ -70 +70 @@
 
         if (config.cpu_active == 1) {
-                STATIC_ASSERT(UWB_SIZE <= UWB_ALIGNMENT);
+                static_assert(UWB_SIZE <= UWB_ALIGNMENT, "");
                 /* Create slab cache for the userspace window buffers */
                 uwb_cache = slab_cache_create("uwb_cache", UWB_SIZE,