Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FreeBSD: fix compilation of FreeBSD world after 29274c9f6 #12282

Merged
merged 1 commit into from
Jun 25, 2021
+4 −4
Merged

FreeBSD: fix compilation of FreeBSD world after 29274c9f6 #12282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/os/freebsd/spl/sys/random.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ random_get_pseudo_bytes(uint8_t *p, size_t s)
static inline uint32_t
random_in_range(uint32_t range)
{
#if __FreeBSD_version >= 1300108
#if defined(_KERNEL) && __FreeBSD_version >= 1300108
return (prng32_bounded(range));
#else
uint32_t r;
Expand All @@ -61,7 +61,7 @@ random_in_range(uint32_t range)
if (range == 1)
return (0);

(void) random_get_pseudo_bytes((void *)&r, sizeof (r));
(void) random_get_pseudo_bytes((uint8_t *)&r, sizeof (r));

return (r % range);
#endif
Expand Down
2 changes: 1 addition & 1 deletion include/os/linux/spl/sys/random.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ random_in_range(uint32_t range)
if (range == 1)
return (0);

(void) random_get_pseudo_bytes((void *)&r, sizeof (r));
(void) random_get_pseudo_bytes((uint8_t *)&r, sizeof (r));

return (r % range);
}
Expand Down
2 changes: 1 addition & 1 deletion include/sys/zfs_context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,7 @@ random_in_range(uint32_t range)
if (range == 1)
return (0);

(void) random_get_pseudo_bytes((void *)&r, sizeof (r));
(void) random_get_pseudo_bytes((uint8_t *)&r, sizeof (r));

return (r % range);
}
Expand Down