diff options
| -rw-r--r-- | cmake/os/Linux.cmake | 2 | ||||
| -rw-r--r-- | config.h.cmake | 2 | ||||
| -rw-r--r-- | include/my_sys.h | 6 | ||||
| -rw-r--r-- | mysys/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | mysys/my_largepage.c | 4 | ||||
| -rw-r--r-- | mysys/my_static.c | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 4 |
7 files changed, 11 insertions, 11 deletions
diff --git a/cmake/os/Linux.cmake b/cmake/os/Linux.cmake index b0680d92a1b..6c846570ea7 100644 --- a/cmake/os/Linux.cmake +++ b/cmake/os/Linux.cmake @@ -45,7 +45,7 @@ SET(_FILE_OFFSET_BITS 64) # Linux specific HUGETLB /large page support CHECK_SYMBOL_EXISTS(SHM_HUGETLB sys/shm.h HAVE_DECL_SHM_HUGETLB) IF(HAVE_DECL_SHM_HUGETLB) - SET(HAVE_LARGE_PAGES 1) + SET(HAVE_LINUX_LARGE_PAGES 1) SET(HUGETLB_USE_PROC_MEMINFO 1) SET(HAVE_LARGE_PAGE_OPTION 1) ENDIF() diff --git a/config.h.cmake b/config.h.cmake index c18e17179fd..3e5a9a95397 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -394,7 +394,7 @@ #cmakedefine HAVE_GCC_C11_ATOMICS 1 #cmakedefine HAVE_SOLARIS_ATOMIC 1 #cmakedefine HAVE_DECL_SHM_HUGETLB 1 -#cmakedefine HAVE_LARGE_PAGES 1 +#cmakedefine HAVE_LINUX_LARGE_PAGES 1 #cmakedefine HUGETLB_USE_PROC_MEMINFO 1 #cmakedefine NO_FCNTL_NONBLOCK 1 #cmakedefine NO_ALARM 1 diff --git a/include/my_sys.h b/include/my_sys.h index fb3e15b64a4..a7ab851a5fe 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -176,7 +176,7 @@ extern void *my_memdup(const void *from,size_t length,myf MyFlags); extern char *my_strdup(const char *from,myf MyFlags); extern char *my_strndup(const char *from, size_t length, myf MyFlags); -#ifdef HAVE_LARGE_PAGES +#ifdef HAVE_LINUX_LARGE_PAGES extern uint my_get_large_page_size(void); extern uchar * my_large_malloc(size_t size, myf my_flags); extern void my_large_free(uchar *ptr); @@ -184,7 +184,7 @@ extern void my_large_free(uchar *ptr); #define my_get_large_page_size() (0) #define my_large_malloc(A,B) my_malloc_lock((A),(B)) #define my_large_free(A) my_free_lock((A)) -#endif /* HAVE_LARGE_PAGES */ +#endif /* HAVE_LINUX_LARGE_PAGES */ void my_init_atomic_write(void); #ifdef __linux__ @@ -242,7 +242,7 @@ extern int sf_leaking_memory; /* set to 1 to disable memleak detection */ extern void (*proc_info_hook)(void *, const PSI_stage_info *, PSI_stage_info *, const char *, const char *, const unsigned int); -#ifdef HAVE_LARGE_PAGES +#ifdef HAVE_LINUX_LARGE_PAGES extern my_bool my_use_large_pages; extern uint my_large_page_size; #endif diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt index b9f92124cc3..26dbd953324 100644 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt @@ -63,7 +63,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_C_COMPILER_ID MATCHES "SunPro") PROPERTIES COMPILE_FLAGS "${CMAKE_CURRENT_SOURCE_DIR}/my_timer_cycles.il") ENDIF() -IF(HAVE_LARGE_PAGES) +IF(HAVE_LINUX_LARGE_PAGES) SET(MYSYS_SOURCES ${MYSYS_SOURCES} my_largepage.c) ENDIF() diff --git a/mysys/my_largepage.c b/mysys/my_largepage.c index 59f815a9d87..dab63ae3817 100644 --- a/mysys/my_largepage.c +++ b/mysys/my_largepage.c @@ -15,7 +15,7 @@ #include "mysys_priv.h" -#ifdef HAVE_LARGE_PAGES +#ifdef HAVE_LINUX_LARGE_PAGES #ifdef HAVE_SYS_IPC_H #include <sys/ipc.h> @@ -163,4 +163,4 @@ my_bool my_large_free_int(uchar *ptr) } #endif /* HAVE_DECL_SHM_HUGETLB */ -#endif /* HAVE_LARGE_PAGES */ +#endif /* HAVE_LINUX_LARGE_PAGES */ diff --git a/mysys/my_static.c b/mysys/my_static.c index 08edf2c4200..f2a9fbb7335 100644 --- a/mysys/my_static.c +++ b/mysys/my_static.c @@ -59,7 +59,7 @@ USED_MEM* my_once_root_block=0; /* pointer to first block */ uint my_once_extra=ONCE_ALLOC_INIT; /* Memory to alloc / block */ /* from my_largepage.c */ -#ifdef HAVE_LARGE_PAGES +#ifdef HAVE_LINUX_LARGE_PAGES my_bool my_use_large_pages= 0; uint my_large_page_size= 0; #endif diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 01f5febd5a0..1c4fcaeca20 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4318,7 +4318,7 @@ static int init_common_variables() DBUG_PRINT("info",("%s Ver %s for %s on %s\n",my_progname, server_version, SYSTEM_TYPE,MACHINE_TYPE)); -#ifdef HAVE_LARGE_PAGES +#ifdef HAVE_LINUX_LARGE_PAGES /* Initialize large page size */ if (opt_large_pages) { @@ -4333,7 +4333,7 @@ static int init_common_variables() else SYSVAR_AUTOSIZE(opt_large_pages, 0); } -#endif /* HAVE_LARGE_PAGES */ +#endif /* HAVE_LINUX_LARGE_PAGES */ #ifdef HAVE_SOLARIS_LARGE_PAGES #define LARGE_PAGESIZE (4*1024*1024) /* 4MB */ #define SUPER_LARGE_PAGESIZE (256*1024*1024) /* 256MB */ |