summaryrefslogtreecommitdiff
path: root/arch/sparc64/kernel/sys_sunos32.c
diff options
context:
space:
mode:
authorJody McIntyre <scjody@modernduck.com>2006-01-04 11:43:17 -0500
committerJody McIntyre <scjody@modernduck.com>2006-01-04 11:43:17 -0500
commit34b8c399dc04c8e51f014b73458e654570698597 (patch)
tree7027eda7a780e9d945ef271f8c2ea5aaede5dd25 /arch/sparc64/kernel/sys_sunos32.c
parenteaceec7f6cc5223d0f146086884d67746b8aa81d (diff)
parent88026842b0a760145aa71d69e74fbc9ec118ca44 (diff)
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/sparc64/kernel/sys_sunos32.c')
-rw-r--r--arch/sparc64/kernel/sys_sunos32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/sys_sunos32.c b/arch/sparc64/kernel/sys_sunos32.c
index d0592ed54ea5..bfa4aa68312d 100644
--- a/arch/sparc64/kernel/sys_sunos32.c
+++ b/arch/sparc64/kernel/sys_sunos32.c
@@ -854,7 +854,7 @@ asmlinkage s32 sunos_sysconf (int name)
ret = ARG_MAX;
break;
case _SC_CHILD_MAX:
- ret = CHILD_MAX;
+ ret = -1; /* no limit */
break;
case _SC_CLK_TCK:
ret = HZ;