diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-23 13:11:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-23 13:11:50 -0500 |
| commit | 8f43d8e1147406901b7d972d1b528d94def23b0e (patch) | |
| tree | 8e0667ce322b79c6a9aade51dc9739f3dc9430fe /arch/sparc64/solaris/misc.c | |
| parent | 7b3dad3d854654e470a598d361919ebdb858f37b (diff) | |
| parent | 597d1f0622d21ffe54aceef8da9682e776f51cc2 (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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/solaris/misc.c b/arch/sparc64/solaris/misc.c index 302efbcba70e..3ab4677395f2 100644 --- a/arch/sparc64/solaris/misc.c +++ b/arch/sparc64/solaris/misc.c | |||
| @@ -353,7 +353,7 @@ asmlinkage int solaris_sysconf(int id) | |||
| 353 | { | 353 | { |
| 354 | switch (id) { | 354 | switch (id) { |
| 355 | case SOLARIS_CONFIG_NGROUPS: return NGROUPS_MAX; | 355 | case SOLARIS_CONFIG_NGROUPS: return NGROUPS_MAX; |
| 356 | case SOLARIS_CONFIG_CHILD_MAX: return CHILD_MAX; | 356 | case SOLARIS_CONFIG_CHILD_MAX: return -1; /* no limit */ |
| 357 | case SOLARIS_CONFIG_OPEN_FILES: return OPEN_MAX; | 357 | case SOLARIS_CONFIG_OPEN_FILES: return OPEN_MAX; |
| 358 | case SOLARIS_CONFIG_POSIX_VER: return 199309; | 358 | case SOLARIS_CONFIG_POSIX_VER: return 199309; |
| 359 | case SOLARIS_CONFIG_PAGESIZE: return PAGE_SIZE; | 359 | case SOLARIS_CONFIG_PAGESIZE: return PAGE_SIZE; |