MALI: utgard: upgrade DDK to r6p1-01rel0

[firefly-linux-kernel-4.4.55.git] / kernel / membarrier.c

diff --git a/kernel/membarrier.c b/kernel/membarrier.c
index 536c727a56e975e2e310fb3fb82474f07a1b916f..9f9284f37f8d8b6d3149ecc22634c613123e792d 100644 (file)
--- a/kernel/membarrier.c
+++ b/kernel/membarrier.c
@@ -16,6 +16,7 @@
 
 #include <linux/syscalls.h>
 #include <linux/membarrier.h>
+#include <linux/tick.h>
 
 /*
  * Bitmask made from a "or" of all commands within enum membarrier_cmd,
@@ -51,6 +52,9 @@
  */
 SYSCALL_DEFINE2(membarrier, int, cmd, int, flags)
 {
+       /* MEMBARRIER_CMD_SHARED is not compatible with nohz_full. */
+       if (tick_nohz_full_enabled())
+               return -ENOSYS;
        if (unlikely(flags))
                return -EINVAL;
        switch (cmd) {