aboutsummaryrefslogtreecommitdiff
path: root/arch/sparc64/solaris/misc.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-12-23 10:11:50 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-23 10:11:50 -0800
commit8f43d8e1147406901b7d972d1b528d94def23b0e (patch)
tree8e0667ce322b79c6a9aade51dc9739f3dc9430fe /arch/sparc64/solaris/misc.c
parent7b3dad3d854654e470a598d361919ebdb858f37b (diff)
parent597d1f0622d21ffe54aceef8da9682e776f51cc2 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch/sparc64/solaris/misc.c')
-rw-r--r--arch/sparc64/solaris/misc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/solaris/misc.c b/arch/sparc64/solaris/misc.c
index 302efbcba70..3ab4677395f 100644
--- a/arch/sparc64/solaris/misc.c
+++ b/arch/sparc64/solaris/misc.c
@@ -353,7 +353,7 @@ asmlinkage int solaris_sysconf(int id)
{
switch (id) {
case SOLARIS_CONFIG_NGROUPS: return NGROUPS_MAX;
- case SOLARIS_CONFIG_CHILD_MAX: return CHILD_MAX;
+ case SOLARIS_CONFIG_CHILD_MAX: return -1; /* no limit */
case SOLARIS_CONFIG_OPEN_FILES: return OPEN_MAX;
case SOLARIS_CONFIG_POSIX_VER: return 199309;
case SOLARIS_CONFIG_PAGESIZE: return PAGE_SIZE;