Merge XtraDB 8 into MariaDB.

1 files changed, 12 insertions, 19 deletions

diff --git a/storage/xtradb/include/os0proc.h b/storage/xtradb/include/os0proc.h
index 19b0b112638..fd46bd7db87 100644
--- a/storage/xtradb/include/os0proc.h
+++ b/storage/xtradb/include/os0proc.h
@@ -16,7 +16,8 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 
 *****************************************************************************/
 
-/******************************************************
+/**************************************************//**
+@file include/os0proc.h
 The interface to the operating system
 process control primitives
 
@@ -40,42 +41,34 @@ extern ibool os_use_large_pages;
 /* Large page size. This may be a boot-time option on some platforms */
 extern ulint os_large_page_size;
 
-/********************************************************************
+/****************************************************************//**
 Converts the current process id to a number. It is not guaranteed that the
 number is unique. In Linux returns the 'process number' of the current
 thread. That number is the same as one sees in 'top', for example. In Linux
-the thread id is not the same as one sees in 'top'. */
+the thread id is not the same as one sees in 'top'.
+@return	process id as a number */
 UNIV_INTERN
 ulint
 os_proc_get_number(void);
 /*====================*/
-/********************************************************************
-Allocates large pages memory. */
+/****************************************************************//**
+Allocates large pages memory.
+@return	allocated memory */
 UNIV_INTERN
 void*
 os_mem_alloc_large(
 /*===============*/
-					/* out: allocated memory */
-	ulint*	n);			/* in/out: number of bytes */
-/********************************************************************
+	ulint*	n);			/*!< in/out: number of bytes */
+/****************************************************************//**
 Frees large pages memory. */
 UNIV_INTERN
 void
 os_mem_free_large(
 /*==============*/
-	void	*ptr,			/* in: pointer returned by
+	void	*ptr,			/*!< in: pointer returned by
 					os_mem_alloc_large() */
-	ulint	size);			/* in: size returned by
+	ulint	size);			/*!< in: size returned by
 					os_mem_alloc_large() */
-/********************************************************************
-Sets the priority boost for threads released from waiting within the current
-process. */
-UNIV_INTERN
-void
-os_process_set_priority_boost(
-/*==========================*/
-	ibool	do_boost);	/* in: TRUE if priority boost should be done,
-				FALSE if not */
 
 #ifndef UNIV_NONINL
 #include "os0proc.ic"