summaryrefslogtreecommitdiff
path: root/net/tipc/monitor.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-09-25 10:22:13 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-09-25 10:22:13 +0300
commita12c689209185c1ad872723a644d0cd27e52d49c (patch)
tree11c01d147a9241561eb7a3ad5a999e234be2750c /net/tipc/monitor.c
parent4c8928850c9dc5c849ee37d89a79d44a283bdd87 (diff)
parent7e2cd21e02b35483ce8ea88da5732d4d3ec3a6c9 (diff)
downloadlinux-a12c689209185c1ad872723a644d0cd27e52d49c.tar.xz
Merge 7e2cd21e02b3 ("Merge tag 'tty-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty") into tty-next
We need the tty fixes and api additions in this branch. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/tipc/monitor.c')
-rw-r--r--net/tipc/monitor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/monitor.c b/net/tipc/monitor.c
index 2f4d23238a7e..9618e4429f0f 100644
--- a/net/tipc/monitor.c
+++ b/net/tipc/monitor.c
@@ -160,7 +160,7 @@ static void map_set(u64 *up_map, int i, unsigned int v)
static int map_get(u64 up_map, int i)
{
- return (up_map & (1 << i)) >> i;
+ return (up_map & (1ULL << i)) >> i;
}
static struct tipc_peer *peer_prev(struct tipc_peer *peer)