aboutsummaryrefslogtreecommitdiffstats
path: root/main/zfs-grsec/0004-Ensure-correct-return-value-type.patch
blob: 9897864c02f948ba03b66b40e87d60bbf4eecfcb (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
From 8fb2f7092f5188d6ad42f0f66049568e49c8e7c8 Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@gmail.com>
Date: Tue, 1 Mar 2016 15:32:52 +0100
Subject: [PATCH 4/8] Ensure correct return value type

When compiling with musl libc the return type will be incorrect.

Signed-off-by: Carlo Landmeter <clandmeter@gmail.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #4454
---
 include/sys/zfs_context.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h
index 4f7e328..78e33e1 100644
--- a/include/sys/zfs_context.h
+++ b/include/sys/zfs_context.h
@@ -623,7 +623,7 @@ extern void delay(clock_t ticks);
 #define	maxclsyspri	-20
 #define	defclsyspri	0
 
-#define	CPU_SEQID	(pthread_self() & (max_ncpus - 1))
+#define	CPU_SEQID	((uintptr_t)pthread_self() & (max_ncpus - 1))
 
 #define	kcred		NULL
 #define	CRED()		NULL
-- 
2.7.4