diff --git a/configure b/configure index 944ff6bd2a3..ce49aed1f81 100755 --- a/configure +++ b/configure @@ -6809,6 +6809,7 @@ for ac_header in \ sys/statvfs.h \ sys/strtio.h \ sys/syscall.h \ + sys/sysinfo.h \ sys/tihdr.h \ sys/time.h \ sys/timeout.h \ diff --git a/configure.ac b/configure.ac index 6e960a1fbef..019d549f13e 100644 --- a/configure.ac +++ b/configure.ac @@ -494,6 +494,7 @@ AC_CHECK_HEADERS(\ sys/statvfs.h \ sys/strtio.h \ sys/syscall.h \ + sys/sysinfo.h \ sys/tihdr.h \ sys/time.h \ sys/timeout.h \ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 5c43d26d4eb..2e63b786d2e 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -38,6 +38,9 @@ #ifdef HAVE_SYS_MMAN_H # include #endif +#ifdef HAVE_SYS_SYSINFO_H +# include +#endif #ifdef HAVE_VALGRIND_VALGRIND_H # include #endif @@ -1356,11 +1359,22 @@ void virtual_init_threading(void) */ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) { +#ifdef HAVE_SYS_SYSINFO_H + struct sysinfo sinfo; +#endif + info->unknown = 0; info->KeMaximumIncrement = 0; /* FIXME */ info->PageSize = page_size; info->MmLowestPhysicalPage = 1; info->MmHighestPhysicalPage = 0x7fffffff / page_size; +#ifdef HAVE_SYS_SYSINFO_H + if (!sysinfo(&sinfo)) + { + ULONG64 total = (ULONG64)sinfo.totalram * sinfo.mem_unit; + info->MmHighestPhysicalPage = max(1, total / page_size); + } +#endif info->MmNumberOfPhysicalPages = info->MmHighestPhysicalPage - info->MmLowestPhysicalPage; info->AllocationGranularity = get_mask(0) + 1; info->LowestUserAddress = (void *)0x10000; diff --git a/include/config.h.in b/include/config.h.in index a4a4bb42d8c..64f56fdb2c1 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1119,6 +1119,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SYSCTL_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SYSINFO_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_THR_H