1 files changed, 3 insertions, 3 deletions
diff --git a/fs/file.c b/fs/file.c
index 39f8f15921da..1aed0add16a2 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -25,9 +25,9 @@
 int sysctl_nr_open __read_mostly = 1024*1024;
 int sysctl_nr_open_min = BITS_PER_LONG;
-/* our max() is unusable in constant expressions ;-/ */
+/* our min() is unusable in constant expressions ;-/ */
-#define __const_max(x, y) ((x) < (y) ? (x) : (y))
+#define __const_min(x, y) ((x) < (y) ? (x) : (y))
-int sysctl_nr_open_max = __const_max(INT_MAX, ~(size_t)0/sizeof(void *)) &
+int sysctl_nr_open_max = __const_min(INT_MAX, ~(size_t)0/sizeof(void *)) &
                         -BITS_PER_LONG;
 static void *alloc_fdmem(size_t size)

diff --git a/fs/file.c b/fs/file.c index 39f8f15921da..1aed0add16a2 100644 --- a/fs/file.c +++ b/fs/file.c
@@ -25,9 +25,9 @@
25		25
26	int sysctl_nr_open __read_mostly = 1024*1024;	26	int sysctl_nr_open __read_mostly = 1024*1024;
27	int sysctl_nr_open_min = BITS_PER_LONG;	27	int sysctl_nr_open_min = BITS_PER_LONG;
28	/* our max() is unusable in constant expressions ;-/ */	28	/* our min() is unusable in constant expressions ;-/ */
29	#define __const_max(x, y) ((x) < (y) ? (x) : (y))	29	#define __const_min(x, y) ((x) < (y) ? (x) : (y))
30	int sysctl_nr_open_max = __const_max(INT_MAX, ~(size_t)0/sizeof(void *)) &	30	int sysctl_nr_open_max = __const_min(INT_MAX, ~(size_t)0/sizeof(void *)) &
31	-BITS_PER_LONG;	31	-BITS_PER_LONG;
32		32
33	static void *alloc_fdmem(size_t size)	33	static void *alloc_fdmem(size_t size)