git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release
[pandora-kernel.git]
/
arch
/
sparc64
/
solaris
/
fs.c
diff --git
a/arch/sparc64/solaris/fs.c
b/arch/sparc64/solaris/fs.c
index
61be597
..
9311bfe
100644
(file)
--- a/
arch/sparc64/solaris/fs.c
+++ b/
arch/sparc64/solaris/fs.c
@@
-624,7
+624,7
@@
asmlinkage int solaris_ulimit(int cmd, int val)
case 3: /* UL_GMEMLIM */
return current->signal->rlim[RLIMIT_DATA].rlim_cur;
case 4: /* UL_GDESLIM */
- return
NR_OPEN
;
+ return
sysctl_nr_open
;
}
return -EINVAL;
}