Merge to Fedora kernel-2.6.6-1.422

[linux-2.6.git] / include / asm-alpha / resource.h

diff --git a/include/asm-alpha/resource.h b/include/asm-alpha/resource.h
index 686b955..558d177 100644 (file)
--- a/include/asm-alpha/resource.h
+++ b/include/asm-alpha/resource.h
@@ -39,7 +39,7 @@
     {INR_OPEN, INR_OPEN},                      /* RLIMIT_NOFILE */     \
     {LONG_MAX, LONG_MAX},                      /* RLIMIT_AS */         \
     {LONG_MAX, LONG_MAX},                      /* RLIMIT_NPROC */      \
-    {LONG_MAX, LONG_MAX},                      /* RLIMIT_MEMLOCK */    \
+    {PAGE_SIZE,PAGE_SIZE},                     /* RLIMIT_MEMLOCK */    \
     {LONG_MAX, LONG_MAX},                       /* RLIMIT_LOCKS */      \
 }