summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--inotail.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/inotail.h b/inotail.h
index f6e90e8..b47e6a4 100644
--- a/inotail.h
+++ b/inotail.h
@@ -24,7 +24,10 @@ struct file_struct {
# define dprintf(fmt, args...)
#endif /* DEBUG */
-/* Taken from linux kernel source tree */
-#define unlikely(x) __builtin_expect(!!(x), 0)
+#ifdef __GNUC__
+# define unlikely(x) __builtin_expect(!!(x), 0) /* Taken from linux kernel source */
+#else
+# define unlikely(x) (x)
+#endif
#endif /* _INOTAIL_H */
r FIB replace and append
The FIB notification chain currently uses the NLM_F_{REPLACE,APPEND} flags to signal routes being replaced or appended. Instead of using netlink flags for in-kernel notifications we can simply introduce two new events in the FIB notification chain. This has the added advantage of making the API cleaner, thereby making it clear that these events should be supported by listeners of the notification chain. Signed-off-by: Ido Schimmel <idosch@mellanox.com> Signed-off-by: Jiri Pirko <jiri@mellanox.com> CC: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/ip_fib.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h