| Andrew Geissler | c926e17 | 2021-05-07 16:11:35 -0500 | [diff] [blame^] | 1 | From 76e4054801350ebd4a44057379431a33d460ad0f Mon Sep 17 00:00:00 2001 |
| 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
| 3 | Date: Wed, 21 Apr 2021 11:01:34 +0000 |
| 4 | Subject: [PATCH] mbim: Fix build with ell-0.39 by restoring unlikely macro |
| 5 | from ell/util.h |
| 6 | |
| 7 | Upstream-Status: Pending |
| 8 | |
| 9 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
| 10 | --- |
| 11 | drivers/mbimmodem/mbim-private.h | 4 ++++ |
| 12 | 1 file changed, 4 insertions(+) |
| 13 | |
| 14 | diff --git a/drivers/mbimmodem/mbim-private.h b/drivers/mbimmodem/mbim-private.h |
| 15 | index 51693eae..d917312c 100644 |
| 16 | --- a/drivers/mbimmodem/mbim-private.h |
| 17 | +++ b/drivers/mbimmodem/mbim-private.h |
| 18 | @@ -30,6 +30,10 @@ |
| 19 | __result; }) |
| 20 | #endif |
| 21 | |
| 22 | +/* used to be part of ell/util.h before 0.39: |
| 23 | + https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=2a682421b06e41c45098217a686157f576847021 */ |
| 24 | +#define unlikely(x) __builtin_expect(!!(x), 0) |
| 25 | + |
| 26 | enum mbim_control_message { |
| 27 | MBIM_OPEN_MSG = 0x1, |
| 28 | MBIM_CLOSE_MSG = 0x2, |