diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/kernel-features.h | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/shm_open.c | 9 |
3 files changed, 25 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index a468befa87..d147d69184 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2006-01-16 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/unix/sysv/linux/kernel-features.h: Define + __ASSUME_TMPFS_NAME. + * sysdeps/unix/sysv/linux/shm_open.c [!__ASSUME_TMPFS_NAME] + (where_is_shmfs): Don't test for obsolete shm filesystem name. + + * sysdeps/unix/sysv/linux/getsysstats.c: Don't search for proc + mount point. We assume procfs is mounted at /proc in many other + places already. + 2006-01-15 Andreas Jaeger <aj@suse.de> [BZ #1950] diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h index b28cb73626..594af419c8 100644 --- a/sysdeps/unix/sysv/linux/kernel-features.h +++ b/sysdeps/unix/sysv/linux/kernel-features.h @@ -456,3 +456,10 @@ && defined __arch64__ # define __ASSUME_STAT64_SYSCALL 1 #endif + +/* Early kernel used "shm" as the filesystem name for the filesystem used + for shm_open etc. Later it is "tmpfs". 2.4.20 is a safe bet for the + cutover. */ +#if __LINUX_KERNEL_VERSION >= 0x02041a +# define __ASSUME_TMPFS_NAME 1 +#endif diff --git a/sysdeps/unix/sysv/linux/shm_open.c b/sysdeps/unix/sysv/linux/shm_open.c index 2e94b76cdb..0d40632e5f 100644 --- a/sysdeps/unix/sysv/linux/shm_open.c +++ b/sysdeps/unix/sysv/linux/shm_open.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 2000,2001,2002,2003,2004,2006 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -29,6 +29,8 @@ #include <bits/libc-lock.h> #include "linux_fsinfo.h" +#include <kernel-features.h> + /* Mount point of the shared memory filesystem. */ static struct @@ -81,7 +83,10 @@ where_is_shmfs (void) /* The original name is "shm" but this got changed in early Linux 2.4.x to "tmpfs". */ if (strcmp (mp->mnt_type, "tmpfs") == 0 - || strcmp (mp->mnt_type, "shm") == 0) +#ifndef __ASSUME_TMPFS_NAME + || strcmp (mp->mnt_type, "shm") == 0 +#endif + ) { /* Found it. There might be more than one place where the filesystem is mounted but one is enough for us. */ |