33c33
< __FBSDID("$FreeBSD: head/sys/compat/linux/linux_util.c 258541 2013-11-25 07:38:45Z attilio $");
---
> __FBSDID("$FreeBSD: head/sys/compat/linux/linux_util.c 283421 2015-05-24 15:51:18Z dchagin $");
55,59d54
< #ifdef COMPAT_LINUX32
< #include <machine/../linux32/linux.h>
< #else
< #include <machine/../linux/linux.h>
< #endif
61c56
< #include <compat/linux/linux_dtrace.h>
---
> MALLOC_DEFINE(M_LINUX, "linux", "Linux mode structures");
65,96d59
< /* DTrace init */
< LIN_SDT_PROVIDER_DECLARE(LINUX_DTRACE);
<
< /**
< * DTrace probes in this module.
< */
< LIN_SDT_PROBE_DEFINE5(util, linux_emul_convpath, entry, "const char *",
< "enum uio_seg", "char **", "int", "int");
< LIN_SDT_PROBE_DEFINE1(util, linux_emul_convpath, return, "int");
< LIN_SDT_PROBE_DEFINE1(util, linux_msg, entry, "const char *");
< LIN_SDT_PROBE_DEFINE0(util, linux_msg, return);
< LIN_SDT_PROBE_DEFINE2(util, linux_driver_get_name_dev, entry, "device_t",
< "const char *");
< LIN_SDT_PROBE_DEFINE0(util, linux_driver_get_name_dev, nullcall);
< LIN_SDT_PROBE_DEFINE1(util, linux_driver_get_name_dev, return, "char *");
< LIN_SDT_PROBE_DEFINE3(util, linux_driver_get_major_minor, entry, "char *",
< "int *", "int *");
< LIN_SDT_PROBE_DEFINE0(util, linux_driver_get_major_minor, nullcall);
< LIN_SDT_PROBE_DEFINE1(util, linux_driver_get_major_minor, notfound, "char *");
< LIN_SDT_PROBE_DEFINE3(util, linux_driver_get_major_minor, return, "int",
< "int", "int");
< LIN_SDT_PROBE_DEFINE0(util, linux_get_char_devices, entry);
< LIN_SDT_PROBE_DEFINE1(util, linux_get_char_devices, return, "char *");
< LIN_SDT_PROBE_DEFINE1(util, linux_free_get_char_devices, entry, "char *");
< LIN_SDT_PROBE_DEFINE0(util, linux_free_get_char_devices, return);
< LIN_SDT_PROBE_DEFINE1(util, linux_device_register_handler, entry,
< "struct linux_device_handler *");
< LIN_SDT_PROBE_DEFINE1(util, linux_device_register_handler, return, "int");
< LIN_SDT_PROBE_DEFINE1(util, linux_device_unregister_handler, entry,
< "struct linux_device_handler *");
< LIN_SDT_PROBE_DEFINE1(util, linux_device_unregister_handler, return, "int");
<
110,112d72
< LIN_SDT_PROBE5(util, linux_emul_convpath, entry, path, pathseg, pbuf,
< cflag, dfd);
<
116d75
< LIN_SDT_PROBE1(util, linux_emul_convpath, return, retval);
126,127d84
< LIN_SDT_PROBE1(util, linux_msg, entry, fmt);
<
134,135d90
<
< LIN_SDT_PROBE0(util, linux_msg, return);
158,163c113
< LIN_SDT_PROBE2(util, linux_driver_get_name_dev, entry, dev,
< device_name);
<
< if (device_name == NULL) {
< LIN_SDT_PROBE0(util, linux_driver_get_name_dev, nullcall);
< LIN_SDT_PROBE1(util, linux_driver_get_name_dev, return, NULL);
---
> if (device_name == NULL)
165d114
< }
167,169c116
< if (strcmp(device_name, de->entry.bsd_driver_name) == 0) {
< LIN_SDT_PROBE1(util, linux_driver_get_name_dev, return,
< de->entry.linux_driver_name);
---
> if (strcmp(device_name, de->entry.bsd_driver_name) == 0)
171d117
< }
174,175c120
< LIN_SDT_PROBE1(util, linux_driver_get_name_dev, return, NULL);
< return NULL;
---
> return (NULL);
183,189c128
< LIN_SDT_PROBE3(util, linux_driver_get_major_minor, entry, node, major,
< minor);
<
< if (node == NULL || major == NULL || minor == NULL) {
< LIN_SDT_PROBE0(util, linux_driver_get_major_minor, nullcall);
< LIN_SDT_PROBE3(util, linux_driver_get_major_minor, return, 1,
< 0, 0);
---
> if (node == NULL || major == NULL || minor == NULL)
191d129
< }
206,208c144
< LIN_SDT_PROBE3(util, linux_driver_get_major_minor, return, 0,
< *major, *minor);
< return 0;
---
> return (0);
215,218c151
<
< LIN_SDT_PROBE3(util, linux_driver_get_major_minor,
< return, 0, *major, *minor);
< return 0;
---
> return (0);
222,224c155
< LIN_SDT_PROBE1(util, linux_driver_get_major_minor, notfound, node);
< LIN_SDT_PROBE3(util, linux_driver_get_major_minor, return, 1, 0, 0);
< return 1;
---
> return (1);
235,236d165
< LIN_SDT_PROBE0(util, linux_get_char_devices, entry);
<
263,264c192
< LIN_SDT_PROBE1(util, linux_get_char_devices, return, string);
< return string;
---
> return (string);
271,272d198
< LIN_SDT_PROBE1(util, linux_get_char_devices, entry, string);
<
274,275d199
<
< LIN_SDT_PROBE0(util, linux_get_char_devices, return);
285,289c209
< LIN_SDT_PROBE1(util, linux_device_register_handler, entry, d);
<
< if (d == NULL) {
< LIN_SDT_PROBE1(util, linux_device_register_handler, return,
< EINVAL);
---
> if (d == NULL)
291d210
< }
302d220
< LIN_SDT_PROBE1(util, linux_device_register_handler, return, 0);
311,315c229
< LIN_SDT_PROBE1(util, linux_device_unregister_handler, entry, d);
<
< if (d == NULL) {
< LIN_SDT_PROBE1(util, linux_device_unregister_handler, return,
< EINVAL);
---
> if (d == NULL)
317d230
< }
324,325d236
< LIN_SDT_PROBE1(util, linux_device_unregister_handler,
< return, 0);
330d240
< LIN_SDT_PROBE1(util, linux_device_unregister_handler, return, EINVAL);