mapping_set_error: add unlikely()

[linux-2.6-omap-h63xx.git] / include / asm-sparc / resource.h

diff --git a/include/asm-sparc/resource.h b/include/asm-sparc/resource.h
index 985948a412990797f5e70550d479d143a9f74299..fe163cafb4c7553ba6c8ec61b727e6c8673854df 100644 (file)
--- a/include/asm-sparc/resource.h
+++ b/include/asm-sparc/resource.h
@@ -1,7 +1,7 @@
 /*
  * resource.h: Resource definitions.
  *
- * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
+ * Copyright (C) 1995,1996 David S. Miller (davem@caip.rutgers.edu)
  */
 
 #ifndef _SPARC_RESOURCE_H
@@ -14,12 +14,16 @@
 #define RLIMIT_NOFILE          6       /* max number of open files */
 #define RLIMIT_NPROC           7       /* max number of processes */
 
+#if defined(__sparc__) && defined(__arch64__)
+/* Use generic version */
+#else
 /*
  * SuS says limits have to be unsigned.
  * We make this unsigned, but keep the
  * old value for compatibility:
  */
 #define RLIM_INFINITY          0x7fffffff
+#endif
 
 #include <asm-generic/resource.h>