Following problems fixed here:
- barrier() undefined for UP kernel
- file locking #defines update
- remove addressless weak symbols ("w")
from System.map (depmod -F breaks on these)
Ivan.
diff -urp 2.4.0t9p7/Makefile linux/Makefile
--- 2.4.0t9p7/Makefile Tue Sep 26 12:13:02 2000
+++ linux/Makefile Tue Sep 26 13:23:10 2000
@@ -209,7 +209,7 @@ vmlinux: $(CONFIGURATION) init/main.o in
$(LIBS) \
--end-group \
-o vmlinux
- $(NM) vmlinux | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aU]
\)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > System.map
+ $(NM) vmlinux | grep -v '\(compiled\)\|\(\.o$$\)\|\( [awU]
+\)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > System.map
symlinks:
rm -f include/asm
diff -urp 2.4.0t9p7/include/asm-alpha/bitops.h linux/include/asm-alpha/bitops.h
--- 2.4.0t9p7/include/asm-alpha/bitops.h Tue Sep 26 12:10:50 2000
+++ linux/include/asm-alpha/bitops.h Tue Sep 26 13:02:51 2000
@@ -2,6 +2,7 @@
#define _ALPHA_BITOPS_H
#include <linux/config.h>
+#include <linux/kernel.h>
/*
* Copyright 1994, Linus Torvalds.
diff -urp 2.4.0t9p7/include/asm-alpha/fcntl.h linux/include/asm-alpha/fcntl.h
--- 2.4.0t9p7/include/asm-alpha/fcntl.h Sat Aug 12 01:37:49 2000
+++ linux/include/asm-alpha/fcntl.h Tue Sep 26 12:40:08 2000
@@ -48,6 +48,9 @@
#define F_EXLCK 16 /* or 3 */
#define F_SHLCK 32 /* or 4 */
+/* for leases */
+#define F_INPROGRESS 64
+
/* operations for bsd flock(), also used by the kernel implementation */
#define LOCK_SH 1 /* shared lock */
#define LOCK_EX 2 /* exclusive lock */
@@ -55,6 +58,11 @@
blocking */
#define LOCK_UN 8 /* remove lock */
+#define LOCK_MAND 32 /* This is a mandatory flock */
+#define LOCK_READ 64 /* ... Which allows concurrent read operations */
+#define LOCK_WRITE 128 /* ... Which allows concurrent write operations */
+#define LOCK_RW 192 /* ... Which allows concurrent read & write
+ops */
+
struct flock {
short l_type;
short l_whence;
@@ -66,5 +74,7 @@ struct flock {
#ifdef __KERNEL__
#define flock64 flock
#endif
+
+#define F_LINUX_SPECIFIC_BASE 1024
#endif
diff -urp 2.4.0t9p7/include/asm-alpha/resource.h linux/include/asm-alpha/resource.h
--- 2.4.0t9p7/include/asm-alpha/resource.h Thu Feb 17 20:35:07 2000
+++ linux/include/asm-alpha/resource.h Tue Sep 26 12:25:11 2000
@@ -15,8 +15,9 @@
#define RLIMIT_AS 7 /* address space limit(?) */
#define RLIMIT_NPROC 8 /* max number of processes */
#define RLIMIT_MEMLOCK 9 /* max locked-in-memory address space */
+#define RLIMIT_LOCKS 10 /* maximum file locks held */
-#define RLIM_NLIMITS 10
+#define RLIM_NLIMITS 11
/*
* SuS says limits have to be unsigned. Fine, it's unsigned, but
@@ -39,6 +40,7 @@
{LONG_MAX, LONG_MAX}, /* RLIMIT_AS */ \
{LONG_MAX, LONG_MAX}, /* RLIMIT_NPROC */ \
{LONG_MAX, LONG_MAX}, /* RLIMIT_MEMLOCK */ \
+ {LONG_MAX, LONG_MAX}, /* RLIMIT_LOCKS */ \
}
#endif /* __KERNEL__ */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
Please read the FAQ at http://www.tux.org/lkml/
