Merge tag 'bitmap-for-5.19-rc1' of https://github.com/norov/linux

[platform/kernel/linux-starfive.git] / include / linux / nodemask.h

diff --git a/include/linux/nodemask.h b/include/linux/nodemask.h
index 2c39663..0f233b7 100644 (file)
--- a/include/linux/nodemask.h
+++ b/include/linux/nodemask.h
@@ -375,14 +375,13 @@ static inline void __nodes_fold(nodemask_t *dstp, const nodemask_t *origp,
 }
 
 #if MAX_NUMNODES > 1
-#define for_each_node_mask(node, mask)                 \
-       for ((node) = first_node(mask);                 \
-               (node) < MAX_NUMNODES;                  \
-               (node) = next_node((node), (mask)))
+#define for_each_node_mask(node, mask)                             \
+       for ((node) = first_node(mask);                             \
+            (node >= 0) && (node) < MAX_NUMNODES;                  \
+            (node) = next_node((node), (mask)))
 #else /* MAX_NUMNODES == 1 */
-#define for_each_node_mask(node, mask)                 \
-       if (!nodes_empty(mask))                         \
-               for ((node) = 0; (node) < 1; (node)++)
+#define for_each_node_mask(node, mask)                                  \
+       for ((node) = 0; (node) < 1 && !nodes_empty(mask); (node)++)
 #endif /* MAX_NUMNODES */
 
 /*