2 files changed, 5 insertions, 3 deletions

diff --git a/arch/sparc64/solaris/fs.c b/arch/sparc64/solaris/fs.c
index 61be597bf430..9311bfe4f2f7 100644
--- 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;
 }
diff --git a/arch/sparc64/solaris/timod.c b/arch/sparc64/solaris/timod.c
index a9d32ceabf26..f53123c02c2b 100644
--- a/arch/sparc64/solaris/timod.c
+++ b/arch/sparc64/solaris/timod.c
@@ -859,7 +859,8 @@ asmlinkage int solaris_getmsg(unsigned int fd, u32 arg1, u32 arg2, u32 arg3)
 
         SOLD("entry");
         lock_kernel();
-        if(fd >= NR_OPEN) goto out;
+        if (fd >= sysctl_nr_open)
+                goto out;
 
         fdt = files_fdtable(current->files);
         filp = fdt->fd[fd];
@@ -927,7 +928,8 @@ asmlinkage int solaris_putmsg(unsigned int fd, u32 arg1, u32 arg2, u32 arg3)
 
         SOLD("entry");
         lock_kernel();
-        if(fd >= NR_OPEN) goto out;
+        if (fd >= sysctl_nr_open)
+                goto out;
 
         fdt = files_fdtable(current->files);
         filp = fdt->fd[fd];