svn commit: r276812 - stable/10/sys/compat/linux

Dmitry Chagin dchagin at FreeBSD.org
Thu Jan 8 06:29:53 UTC 2015


Author: dchagin
Date: Thu Jan  8 06:29:52 2015
New Revision: 276812
URL: https://svnweb.freebsd.org/changeset/base/276812

Log:
  MFC r276511:
  Fix Clang warning: passing 'unsigned int *' to parameter of type 'int *'
  converts between pointers to integer types with different sign.

Modified:
  stable/10/sys/compat/linux/linux_futex.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/compat/linux/linux_futex.c
==============================================================================
--- stable/10/sys/compat/linux/linux_futex.c	Thu Jan  8 06:24:43 2015	(r276811)
+++ stable/10/sys/compat/linux/linux_futex.c	Thu Jan  8 06:29:52 2015	(r276812)
@@ -176,11 +176,12 @@ LIN_SDT_PROBE_DEFINE2(futex, linux_get_r
 LIN_SDT_PROBE_DEFINE1(futex, linux_get_robust_list, copyout_error, "int");
 LIN_SDT_PROBE_DEFINE1(futex, linux_get_robust_list, return, "int");
 LIN_SDT_PROBE_DEFINE3(futex, handle_futex_death, entry, "struct proc *",
-    "uint32_t *", "int");
+    "uint32_t *", "unsigned int");
 LIN_SDT_PROBE_DEFINE1(futex, handle_futex_death, copyin_error, "int");
 LIN_SDT_PROBE_DEFINE1(futex, handle_futex_death, return, "int");
 LIN_SDT_PROBE_DEFINE3(futex, fetch_robust_entry, entry,
-    "struct linux_robust_list **", "struct linux_robust_list **", "int *");
+    "struct linux_robust_list **", "struct linux_robust_list **",
+    "unsigned int *");
 LIN_SDT_PROBE_DEFINE1(futex, fetch_robust_entry, copyin_error, "int");
 LIN_SDT_PROBE_DEFINE1(futex, fetch_robust_entry, return, "int");
 LIN_SDT_PROBE_DEFINE1(futex, release_futexes, entry, "struct proc *");
@@ -1101,7 +1102,7 @@ linux_get_robust_list(struct thread *td,
 }
 
 static int
-handle_futex_death(struct proc *p, uint32_t *uaddr, int pi)
+handle_futex_death(struct proc *p, uint32_t *uaddr, unsigned int pi)
 {
 	uint32_t uval, nval, mval;
 	struct futex *f;
@@ -1150,7 +1151,7 @@ retry:
 
 static int
 fetch_robust_entry(struct linux_robust_list **entry,
-    struct linux_robust_list **head, int *pi)
+    struct linux_robust_list **head, unsigned int *pi)
 {
 	l_ulong uentry;
 	int error;


More information about the svn-src-stable-10 mailing list