diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-13 21:20:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-13 21:20:39 -0400 |
| commit | b1847a041aba157bdf1643bd151e98dc44366b1c (patch) | |
| tree | 60240c03d6af4831fc4a202e471ae87a53caaf11 /arch/sparc64/solaris/misc.c | |
| parent | 2918cd81f58aa9748acf961240c006394f474047 (diff) | |
| parent | 24fc6f00b64985773b5abd592c4cb2e30bad7584 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Fix inline directive in pci_iommu.c
[SPARC64]: Fix arg passing to compat_sys_ipc().
[SPARC]: Fix section mismatch warnings in pci.c and pcic.c
[SUNRPC]: Make sure on-stack cmsg buffer is properly aligned.
[SPARC]: avoid CHILD_MAX and OPEN_MAX constants
[SPARC64]: Fix SBUS IOMMU allocation code.
Diffstat (limited to 'arch/sparc64/solaris/misc.c')
| -rw-r--r-- | arch/sparc64/solaris/misc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/sparc64/solaris/misc.c b/arch/sparc64/solaris/misc.c index bca16e8c95c3..9fcaad6dd11f 100644 --- a/arch/sparc64/solaris/misc.c +++ b/arch/sparc64/solaris/misc.c | |||
| @@ -363,8 +363,10 @@ asmlinkage int solaris_sysconf(int id) | |||
| 363 | { | 363 | { |
| 364 | switch (id) { | 364 | switch (id) { |
| 365 | case SOLARIS_CONFIG_NGROUPS: return NGROUPS_MAX; | 365 | case SOLARIS_CONFIG_NGROUPS: return NGROUPS_MAX; |
| 366 | case SOLARIS_CONFIG_CHILD_MAX: return -1; /* no limit */ | 366 | case SOLARIS_CONFIG_CHILD_MAX: |
| 367 | case SOLARIS_CONFIG_OPEN_FILES: return OPEN_MAX; | 367 | return current->signal->rlim[RLIMIT_NPROC].rlim_cur; |
| 368 | case SOLARIS_CONFIG_OPEN_FILES: | ||
| 369 | return current->signal->rlim[RLIMIT_NOFILE].rlim_cur; | ||
| 368 | case SOLARIS_CONFIG_POSIX_VER: return 199309; | 370 | case SOLARIS_CONFIG_POSIX_VER: return 199309; |
| 369 | case SOLARIS_CONFIG_PAGESIZE: return PAGE_SIZE; | 371 | case SOLARIS_CONFIG_PAGESIZE: return PAGE_SIZE; |
| 370 | case SOLARIS_CONFIG_XOPEN_VER: return 3; | 372 | case SOLARIS_CONFIG_XOPEN_VER: return 3; |