diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h b/intern/cycles/kernel/geom/geom_triangle_intersect.h
index 4f4ee93c077..ca6e54c6b33 100644
--- a/intern/cycles/kernel/geom/geom_triangle_intersect.h
+++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h
@@ -96,12 +96,6 @@ void triangle_intersect_precalc(float3 dir,
 	isect_precalc->kz = kz;
 }
 
-/* TODO(sergey): Make it general utility function. */
-ccl_device_inline float xor_signmask(float x, int y)
-{
-	return __int_as_float(__float_as_int(x) ^ y);
-}
-
 ccl_device_inline bool triangle_intersect(KernelGlobals *kg,
                                           const IsectPrecalc *isect_precalc,
                                           Intersection *isect,
diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h
index 329b7f645c5..a41beab6285 100644
--- a/intern/cycles/util/util_math.h
+++ b/intern/cycles/util/util_math.h
@@ -1451,6 +1451,11 @@ ccl_device_inline float beta(float x, float y)
 #endif
 }
 
+ccl_device_inline float xor_signmask(float x, int y)
+{
+	return __int_as_float(__float_as_int(x) ^ y);
+}
+
 /* projections */
 ccl_device_inline float2 map_to_tube(const float3 co)
 {