[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/kernel/devel kernel-2.6.spec, 1.2759, 1.2760 linux-2.6-tux.patch, 1.30, 1.31



Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20849

Modified Files:
	kernel-2.6.spec linux-2.6-tux.patch 
Log Message:
* Wed Oct 11 2006 Dave Jones <davej redhat com>
- Tux lockdep fixes.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2759
retrieving revision 1.2760
diff -u -r1.2759 -r1.2760
--- kernel-2.6.spec	10 Oct 2006 21:26:50 -0000	1.2759
+++ kernel-2.6.spec	11 Oct 2006 05:56:16 -0000	1.2760
@@ -2002,6 +2002,9 @@
 %endif
 
 %changelog
+* Wed Oct 11 2006 Dave Jones <davej redhat com>
+- Tux lockdep fixes.
+
 * Tue Oct 10 2006 Dave Jones <davej redhat com>
 - OOM Killer improvements.
 - Fix bug in set_page_dirty_buffers

linux-2.6-tux.patch:
 arch/alpha/kernel/systbls.S      |    8 
 arch/i386/kernel/syscall_table.S |   10 
 arch/ia64/kernel/entry.S         |    8 
 arch/ia64/kernel/ia64_ksyms.c    |    5 
 arch/x86_64/ia32/ia32entry.S     |   10 
 fs/dcache.c                      |   36 
 fs/exec.c                        |    2 
 fs/fcntl.c                       |    4 
 fs/namei.c                       |   18 
 fs/namespace.c                   |    2 
 fs/open.c                        |    4 
 fs/pipe.c                        |    2 
 fs/read_write.c                  |    2 
 include/asm-alpha/fcntl.h        |    1 
 include/asm-generic/fcntl.h      |    4 
 include/asm-i386/unistd.h        |    5 
 include/asm-ia64/unistd.h        |    2 
 include/asm-sparc/fcntl.h        |    1 
 include/asm-sparc64/fcntl.h      |    1 
 include/asm-x86_64/unistd.h      |   10 
 include/linux/buffer_head.h      |    1 
 include/linux/dcache.h           |    8 
 include/linux/errno.h            |    3 
 include/linux/file.h             |    2 
 include/linux/fs.h               |    7 
 include/linux/kmod.h             |    2 
 include/linux/namei.h            |    2 
 include/linux/net.h              |    1 
 include/linux/sched.h            |    5 
 include/linux/skbuff.h           |    2 
 include/linux/socket.h           |    4 
 include/linux/sysctl.h           |   50 
 include/net/sock.h               |    8 
 include/net/tcp.h                |    3 
 include/net/tux.h                |  803 ++++++++++++++
 include/net/tux_u.h              |  163 ++
 kernel/exit.c                    |    9 
 kernel/fork.c                    |    2 
 kernel/kmod.c                    |   28 
 kernel/signal.c                  |    1 
 mm/filemap.c                     |   19 
 mm/truncate.c                    |    2 
 net/Kconfig                      |    1 
 net/Makefile                     |    1 
 net/core/sock.c                  |    5 
 net/ipv4/tcp.c                   |    1 
 net/ipv4/tcp_input.c             |    1 
 net/ipv4/tcp_output.c            |    3 
 net/socket.c                     |   54 
 net/tux/Kconfig                  |   25 
 net/tux/Makefile                 |   12 
 net/tux/abuf.c                   |  190 +++
 net/tux/accept.c                 |  863 +++++++++++++++
 net/tux/cachemiss.c              |  265 ++++
 net/tux/cgi.c                    |  171 +++
 net/tux/directory.c              |  302 +++++
 net/tux/extcgi.c                 |  329 +++++
 net/tux/gzip.c                   |   40 
 net/tux/input.c                  |  641 +++++++++++
 net/tux/logger.c                 |  841 ++++++++++++++
 net/tux/main.c                   | 1417 +++++++++++++++++++++++++
 net/tux/mod.c                    |  262 ++++
 net/tux/output.c                 |  352 ++++++
 net/tux/parser.h                 |  102 +
 net/tux/postpone.c               |   77 +
 net/tux/proc.c                   | 1149 ++++++++++++++++++++
 net/tux/proto_ftp.c              | 1555 +++++++++++++++++++++++++++
 net/tux/proto_http.c             | 2197 +++++++++++++++++++++++++++++++++++++++
 net/tux/redirect.c               |  172 +++
 net/tux/times.c                  |  392 ++++++
 net/tux/times.h                  |   26 
 net/tux/userspace.c              |   27 
 72 files changed, 12702 insertions(+), 31 deletions(-)

Index: linux-2.6-tux.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-tux.patch,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- linux-2.6-tux.patch	10 Oct 2006 03:56:50 -0000	1.30
+++ linux-2.6-tux.patch	11 Oct 2006 05:56:16 -0000	1.31
@@ -1,6 +1,7 @@
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/arch/alpha/kernel/systbls.S linux-910/arch/alpha/kernel/systbls.S
---- linux-905/arch/alpha/kernel/systbls.S
-+++ linux-910/arch/alpha/kernel/systbls.S
+Index: latest/arch/alpha/kernel/systbls.S
+===================================================================
+--- latest.orig/arch/alpha/kernel/systbls.S
++++ latest/arch/alpha/kernel/systbls.S
 @@ -239,7 +239,15 @@ sys_call_table:
  	.quad alpha_ni_syscall
  	.quad alpha_ni_syscall			/* 220 */
@@ -17,9 +18,10 @@
  	.quad alpha_ni_syscall
  	.quad alpha_ni_syscall
  	.quad alpha_ni_syscall			/* 225 */
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/arch/i386/kernel/syscall_table.S linux-910/arch/i386/kernel/syscall_table.S
---- linux-905/arch/i386/kernel/syscall_table.S
-+++ linux-910/arch/i386/kernel/syscall_table.S
+Index: latest/arch/i386/kernel/syscall_table.S
+===================================================================
+--- latest.orig/arch/i386/kernel/syscall_table.S
++++ latest/arch/i386/kernel/syscall_table.S
 @@ -221,7 +221,15 @@ ENTRY(sys_call_table)
  	.long sys_madvise
  	.long sys_getdents64	/* 220 */
@@ -37,9 +39,10 @@
  	.long sys_ni_syscall
  	.long sys_gettid
  	.long sys_readahead	/* 225 */
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/arch/ia64/kernel/entry.S linux-910/arch/ia64/kernel/entry.S
---- linux-905/arch/ia64/kernel/entry.S
-+++ linux-910/arch/ia64/kernel/entry.S
+Index: latest/arch/ia64/kernel/entry.S
+===================================================================
+--- latest.orig/arch/ia64/kernel/entry.S
++++ latest/arch/ia64/kernel/entry.S
 @@ -1427,7 +1427,15 @@ sys_call_table:
  	data8 sys_syslog
  	data8 sys_setitimer
@@ -56,9 +59,10 @@
  	data8 sys_ni_syscall					/* was: ia64_oldlstat */
  	data8 sys_ni_syscall					/* was: ia64_oldfstat */
  	data8 sys_vhangup
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/arch/ia64/kernel/ia64_ksyms.c linux-910/arch/ia64/kernel/ia64_ksyms.c
---- linux-905/arch/ia64/kernel/ia64_ksyms.c
-+++ linux-910/arch/ia64/kernel/ia64_ksyms.c
+Index: latest/arch/ia64/kernel/ia64_ksyms.c
+===================================================================
+--- latest.orig/arch/ia64/kernel/ia64_ksyms.c
++++ latest/arch/ia64/kernel/ia64_ksyms.c
 @@ -43,6 +43,11 @@ EXPORT_SYMBOL(__strlen_user);
  EXPORT_SYMBOL(__strncpy_from_user);
  EXPORT_SYMBOL(__strnlen_user);
@@ -71,9 +75,10 @@
  /* from arch/ia64/lib */
  extern void __divsi3(void);
  extern void __udivsi3(void);
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/arch/x86_64/ia32/ia32entry.S linux-910/arch/x86_64/ia32/ia32entry.S
---- linux-905/arch/x86_64/ia32/ia32entry.S
-+++ linux-910/arch/x86_64/ia32/ia32entry.S
+Index: latest/arch/x86_64/ia32/ia32entry.S
+===================================================================
+--- latest.orig/arch/x86_64/ia32/ia32entry.S
++++ latest/arch/x86_64/ia32/ia32entry.S
 @@ -617,7 +617,15 @@ ia32_sys_call_table:
  	.quad sys_madvise
  	.quad compat_sys_getdents64	/* 220 getdents64 */
@@ -91,9 +96,10 @@
  	.quad quiet_ni_syscall    	/* security */
  	.quad sys_gettid	
  	.quad sys_readahead	/* 225 */
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/fs/dcache.c linux-910/fs/dcache.c
---- linux-905/fs/dcache.c
-+++ linux-910/fs/dcache.c
+Index: latest/fs/dcache.c
+===================================================================
+--- latest.orig/fs/dcache.c
++++ latest/fs/dcache.c
 @@ -84,6 +84,10 @@ static void d_free(struct dentry *dentry
  {
  	if (dentry->d_op && dentry->d_op->d_release)
@@ -126,7 +132,7 @@
 + 		kfree(target->d_extra_attributes);
 + 		target->d_extra_attributes = NULL;
 + 	}
-+ 
++
  	list_del(&dentry->d_u.d_child);
  	list_del(&target->d_u.d_child);
  
@@ -172,9 +178,10 @@
  static void __init dcache_init(unsigned long mempages)
  {
  	int loop;
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/fs/exec.c linux-910/fs/exec.c
---- linux-905/fs/exec.c
-+++ linux-910/fs/exec.c
+Index: latest/fs/exec.c
+===================================================================
+--- latest.orig/fs/exec.c
++++ latest/fs/exec.c
 @@ -1466,6 +1466,8 @@ int do_coredump(long signr, int exit_cod
  	binfmt = current->binfmt;
  	if (!binfmt || !binfmt->core_dump)
@@ -184,9 +191,10 @@
  	down_write(&mm->mmap_sem);
  	if (!mm->dumpable) {
  		up_write(&mm->mmap_sem);
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/fs/fcntl.c linux-910/fs/fcntl.c
---- linux-905/fs/fcntl.c
-+++ linux-910/fs/fcntl.c
+Index: latest/fs/fcntl.c
+===================================================================
+--- latest.orig/fs/fcntl.c
++++ latest/fs/fcntl.c
 @@ -111,7 +111,7 @@ out:
  	return error;
  }
@@ -205,9 +213,10 @@
  asmlinkage long sys_dup2(unsigned int oldfd, unsigned int newfd)
  {
  	int err = -EBADF;
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/fs/namei.c linux-910/fs/namei.c
---- linux-905/fs/namei.c
-+++ linux-910/fs/namei.c
+Index: latest/fs/namei.c
+===================================================================
+--- latest.orig/fs/namei.c
++++ latest/fs/namei.c
 @@ -745,7 +745,7 @@ static __always_inline void follow_dotdo
   *  It _is_ time-critical.
   */
@@ -275,9 +284,10 @@
  
  	return retval;
  }
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/fs/namespace.c linux-910/fs/namespace.c
---- linux-905/fs/namespace.c
-+++ linux-910/fs/namespace.c
+Index: latest/fs/namespace.c
+===================================================================
+--- latest.orig/fs/namespace.c
++++ latest/fs/namespace.c
 @@ -1609,6 +1609,8 @@ void set_fs_root(struct fs_struct *fs, s
  	}
  }
@@ -287,9 +297,10 @@
  /*
   * Replace the fs->{pwdmnt,pwd} with {mnt,dentry}. Put the old values.
   * It can block. Requires the big lock held.
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/fs/open.c linux-910/fs/open.c
---- linux-905/fs/open.c
-+++ linux-910/fs/open.c
+Index: latest/fs/open.c
+===================================================================
+--- latest.orig/fs/open.c
++++ latest/fs/open.c
 @@ -562,6 +562,8 @@ out:
  	return error;
  }
@@ -308,9 +319,10 @@
  asmlinkage long sys_fchmod(unsigned int fd, mode_t mode)
  {
  	struct inode * inode;
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/fs/pipe.c linux-910/fs/pipe.c
---- linux-905/fs/pipe.c
-+++ linux-910/fs/pipe.c
+Index: latest/fs/pipe.c
+===================================================================
+--- latest.orig/fs/pipe.c
++++ latest/fs/pipe.c
 @@ -973,6 +973,8 @@ no_files:
  	return error;	
  }
@@ -320,9 +332,10 @@
  /*
   * pipefs should _never_ be mounted by userland - too much of security hassle,
   * no real gain from having the whole whorehouse mounted. So we don't need
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/fs/read_write.c linux-910/fs/read_write.c
---- linux-905/fs/read_write.c
-+++ linux-910/fs/read_write.c
+Index: latest/fs/read_write.c
+===================================================================
+--- latest.orig/fs/read_write.c
++++ latest/fs/read_write.c
 @@ -374,6 +374,8 @@ asmlinkage ssize_t sys_write(unsigned in
  	return ret;
  }
@@ -332,9 +345,10 @@
  asmlinkage ssize_t sys_pread64(unsigned int fd, char __user *buf,
  			     size_t count, loff_t pos)
  {
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/include/asm-alpha/fcntl.h linux-910/include/asm-alpha/fcntl.h
---- linux-905/include/asm-alpha/fcntl.h
-+++ linux-910/include/asm-alpha/fcntl.h
+Index: latest/include/asm-alpha/fcntl.h
+===================================================================
+--- latest.orig/include/asm-alpha/fcntl.h
++++ latest/include/asm-alpha/fcntl.h
 @@ -14,6 +14,7 @@
  #define O_DIRECTORY	0100000	/* must be a directory */
  #define O_NOFOLLOW	0200000 /* don't follow links */
@@ -343,9 +357,10 @@
  #define O_DIRECT	02000000 /* direct disk access - should check with OSF/1 */
  #define O_NOATIME	04000000
  
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/include/asm-generic/fcntl.h linux-910/include/asm-generic/fcntl.h
---- linux-905/include/asm-generic/fcntl.h
-+++ linux-910/include/asm-generic/fcntl.h
+Index: latest/include/asm-generic/fcntl.h
+===================================================================
+--- latest.orig/include/asm-generic/fcntl.h
++++ latest/include/asm-generic/fcntl.h
 @@ -48,6 +48,10 @@
  #ifndef O_NOATIME
  #define O_NOATIME	01000000
@@ -357,10 +372,11 @@
  #ifndef O_NDELAY
  #define O_NDELAY	O_NONBLOCK
  #endif
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/include/asm-i386/unistd.h linux-910/include/asm-i386/unistd.h
---- linux-905/include/asm-i386/unistd.h
-+++ linux-910/include/asm-i386/unistd.h
-@@ -326,6 +326,7 @@
+Index: latest/include/asm-i386/unistd.h
+===================================================================
+--- latest.orig/include/asm-i386/unistd.h
++++ latest/include/asm-i386/unistd.h
+@@ -328,6 +328,7 @@
  
  #define NR_syscalls 318
  
@@ -368,7 +384,7 @@
  /*
   * user-visible error numbers are in the range -1 - -128: see
   * <asm-i386/errno.h>
-@@ -339,6 +340,10 @@ do { \
+@@ -341,6 +342,10 @@ do { \
  	return (type) (res); \
  } while (0)
  
@@ -379,9 +395,10 @@
  /* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
  #define _syscall0(type,name) \
  type name(void) \
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/include/asm-ia64/unistd.h linux-910/include/asm-ia64/unistd.h
---- linux-905/include/asm-ia64/unistd.h
-+++ linux-910/include/asm-ia64/unistd.h
+Index: latest/include/asm-ia64/unistd.h
+===================================================================
+--- latest.orig/include/asm-ia64/unistd.h
++++ latest/include/asm-ia64/unistd.h
 @@ -109,7 +109,7 @@
  #define __NR_syslog			1117
  #define __NR_setitimer			1118
@@ -391,9 +408,10 @@
  /* 1121 was __NR_old_lstat */
  /* 1122 was __NR_old_fstat */
  #define __NR_vhangup			1123
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/include/asm-sparc/fcntl.h linux-910/include/asm-sparc/fcntl.h
---- linux-905/include/asm-sparc/fcntl.h
-+++ linux-910/include/asm-sparc/fcntl.h
+Index: latest/include/asm-sparc/fcntl.h
+===================================================================
+--- latest.orig/include/asm-sparc/fcntl.h
++++ latest/include/asm-sparc/fcntl.h
 @@ -14,6 +14,7 @@
  #define O_NDELAY	(0x0004 | O_NONBLOCK)
  #define O_NOCTTY	0x8000	/* not fcntl */
@@ -402,9 +420,10 @@
  #define O_DIRECT        0x100000 /* direct disk access hint */
  #define O_NOATIME	0x200000
  
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/include/asm-sparc64/fcntl.h linux-910/include/asm-sparc64/fcntl.h
---- linux-905/include/asm-sparc64/fcntl.h
-+++ linux-910/include/asm-sparc64/fcntl.h
+Index: latest/include/asm-sparc64/fcntl.h
+===================================================================
+--- latest.orig/include/asm-sparc64/fcntl.h
++++ latest/include/asm-sparc64/fcntl.h
 @@ -14,6 +14,7 @@
  #define O_NONBLOCK	0x4000
  #define O_NOCTTY	0x8000	/* not fcntl */
@@ -413,9 +432,10 @@
  #define O_DIRECT        0x100000 /* direct disk access hint */
  #define O_NOATIME	0x200000
  
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/include/asm-x86_64/unistd.h linux-910/include/asm-x86_64/unistd.h
---- linux-905/include/asm-x86_64/unistd.h
-+++ linux-910/include/asm-x86_64/unistd.h
+Index: latest/include/asm-x86_64/unistd.h
+===================================================================
+--- latest.orig/include/asm-x86_64/unistd.h
++++ latest/include/asm-x86_64/unistd.h
 @@ -425,7 +425,15 @@ __SYSCALL(__NR_putpmsg, sys_ni_syscall)
  __SYSCALL(__NR_afs_syscall, sys_ni_syscall)
  
@@ -433,9 +453,10 @@
  
  #define __NR_security			185
  __SYSCALL(__NR_security, sys_ni_syscall)
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/include/linux/buffer_head.h linux-910/include/linux/buffer_head.h
---- linux-905/include/linux/buffer_head.h
-+++ linux-910/include/linux/buffer_head.h
+Index: latest/include/linux/buffer_head.h
+===================================================================
+--- latest.orig/include/linux/buffer_head.h
++++ latest/include/linux/buffer_head.h
 @@ -203,6 +203,7 @@ int generic_cont_expand(struct inode *in
  int generic_cont_expand_simple(struct inode *inode, loff_t size);
  int block_commit_write(struct page *page, unsigned from, unsigned to);
@@ -444,9 +465,10 @@
  sector_t generic_block_bmap(struct address_space *, sector_t, get_block_t *);
  int generic_commit_write(struct file *, struct page *, unsigned, unsigned);
  int block_truncate_page(struct address_space *, loff_t, get_block_t *);
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/include/linux/dcache.h linux-910/include/linux/dcache.h
---- linux-905/include/linux/dcache.h
-+++ linux-910/include/linux/dcache.h
+Index: latest/include/linux/dcache.h
+===================================================================
+--- latest.orig/include/linux/dcache.h
++++ latest/include/linux/dcache.h
 @@ -107,6 +107,7 @@ struct dentry {
  	struct dentry_operations *d_op;
  	struct super_block *d_sb;	/* The root of the dentry tree */
@@ -477,9 +499,10 @@
  /* Allocation counts.. */
  
  /**
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/include/linux/errno.h linux-910/include/linux/errno.h
---- linux-905/include/linux/errno.h
-+++ linux-910/include/linux/errno.h
+Index: latest/include/linux/errno.h
+===================================================================
+--- latest.orig/include/linux/errno.h
++++ latest/include/linux/errno.h
 @@ -24,6 +24,9 @@
  #define EIOCBQUEUED	529	/* iocb queued, will get completion event */
  #define EIOCBRETRY	530	/* iocb queued, will trigger a retry */
@@ -490,9 +513,10 @@
  #endif
  
  #endif
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/include/linux/file.h linux-910/include/linux/file.h
---- linux-905/include/linux/file.h
-+++ linux-910/include/linux/file.h
+Index: latest/include/linux/file.h
+===================================================================
+--- latest.orig/include/linux/file.h
++++ latest/include/linux/file.h
 @@ -113,4 +113,6 @@ struct task_struct;
  struct files_struct *get_files_struct(struct task_struct *);
  void FASTCALL(put_files_struct(struct files_struct *fs));
@@ -500,9 +524,10 @@
 +extern int dupfd(struct file *file, unsigned int start);
 +
  #endif /* __LINUX_FILE_H */
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/include/linux/fs.h linux-910/include/linux/fs.h
---- linux-905/include/linux/fs.h
-+++ linux-910/include/linux/fs.h
+Index: latest/include/linux/fs.h
+===================================================================
+--- latest.orig/include/linux/fs.h
++++ latest/include/linux/fs.h
 @@ -1659,7 +1659,7 @@ ssize_t generic_file_write_nolock(struct
  extern ssize_t generic_file_sendfile(struct file *, loff_t *, size_t, read_actor_t, void *);
  extern void do_generic_mapping_read(struct address_space *mapping,
@@ -530,9 +555,10 @@
  }
  
  ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/include/linux/kmod.h linux-910/include/linux/kmod.h
---- linux-905/include/linux/kmod.h
-+++ linux-910/include/linux/kmod.h
+Index: latest/include/linux/kmod.h
+===================================================================
+--- latest.orig/include/linux/kmod.h
++++ latest/include/linux/kmod.h
 @@ -46,5 +46,7 @@ call_usermodehelper(char *path, char **a
  }
  
@@ -541,9 +567,10 @@
 +				 struct key *ring);
  
  #endif /* __LINUX_KMOD_H__ */
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/include/linux/namei.h linux-910/include/linux/namei.h
---- linux-905/include/linux/namei.h
-+++ linux-910/include/linux/namei.h
+Index: latest/include/linux/namei.h
+===================================================================
+--- latest.orig/include/linux/namei.h
++++ latest/include/linux/namei.h
 @@ -48,6 +48,8 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LA
  #define LOOKUP_PARENT		16
  #define LOOKUP_NOALT		32
@@ -553,9 +580,10 @@
  /*
   * Intent data
   */
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/include/linux/net.h linux-910/include/linux/net.h
---- linux-905/include/linux/net.h
-+++ linux-910/include/linux/net.h
+Index: latest/include/linux/net.h
+===================================================================
+--- latest.orig/include/linux/net.h
++++ latest/include/linux/net.h
 @@ -189,6 +189,7 @@ extern int	     sock_create_kern(int fam
  				      struct socket **res);
  extern int	     sock_create_lite(int family, int type, int proto,
@@ -564,9 +592,10 @@
  extern void	     sock_release(struct socket *sock);
  extern int   	     sock_sendmsg(struct socket *sock, struct msghdr *msg,
  				  size_t len);
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/include/linux/sched.h linux-910/include/linux/sched.h
---- linux-905/include/linux/sched.h
-+++ linux-910/include/linux/sched.h
+Index: latest/include/linux/sched.h
+===================================================================
+--- latest.orig/include/linux/sched.h
++++ latest/include/linux/sched.h
 @@ -895,6 +895,11 @@ struct task_struct {
  	int (*notifier)(void *priv);
  	void *notifier_data;
@@ -579,9 +608,10 @@
  	
  	void *security;
  	struct audit_context *audit_context;
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/include/linux/skbuff.h linux-910/include/linux/skbuff.h
---- linux-905/include/linux/skbuff.h
-+++ linux-910/include/linux/skbuff.h
+Index: latest/include/linux/skbuff.h
+===================================================================
+--- latest.orig/include/linux/skbuff.h
++++ latest/include/linux/skbuff.h
 @@ -1422,6 +1422,8 @@ static inline unsigned int skb_checksum_
  		__skb_checksum_complete(skb);
  }
@@ -591,9 +621,10 @@
  #ifdef CONFIG_NETFILTER
  static inline void nf_conntrack_put(struct nf_conntrack *nfct)
  {
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/include/linux/socket.h linux-910/include/linux/socket.h
---- linux-905/include/linux/socket.h
-+++ linux-910/include/linux/socket.h
+Index: latest/include/linux/socket.h
+===================================================================
+--- latest.orig/include/linux/socket.h
++++ latest/include/linux/socket.h
 @@ -300,6 +300,10 @@ extern int move_addr_to_user(void *kaddr
  extern int move_addr_to_kernel(void __user *uaddr, int ulen, void *kaddr);
  extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data);
@@ -605,9 +636,10 @@
  #endif
  #endif /* not kernel and not glibc */
  #endif /* _LINUX_SOCKET_H */
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/include/linux/sysctl.h linux-910/include/linux/sysctl.h
---- linux-905/include/linux/sysctl.h
-+++ linux-910/include/linux/sysctl.h
+Index: latest/include/linux/sysctl.h
+===================================================================
+--- latest.orig/include/linux/sysctl.h
++++ latest/include/linux/sysctl.h
 @@ -220,6 +220,7 @@ enum
  	NET_LLC=18,
  	NET_NETFILTER=19,
@@ -672,9 +704,10 @@
  /* CTL_FS names: */
  enum
  {
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/include/net/sock.h linux-910/include/net/sock.h
---- linux-905/include/net/sock.h
-+++ linux-910/include/net/sock.h
+Index: latest/include/net/sock.h
+===================================================================
+--- latest.orig/include/net/sock.h
++++ latest/include/net/sock.h
 @@ -62,7 +62,7 @@
   */
  
@@ -718,9 +751,10 @@
  					  const gfp_t priority);
  
  extern struct sk_buff		*sock_wmalloc(struct sock *sk,
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/include/net/tcp.h linux-910/include/net/tcp.h
---- linux-905/include/net/tcp.h
-+++ linux-910/include/net/tcp.h
+Index: latest/include/net/tcp.h
+===================================================================
+--- latest.orig/include/net/tcp.h
++++ latest/include/net/tcp.h
 @@ -271,6 +271,8 @@ extern void			tcp_shutdown (struct sock 
  
  extern int			tcp_v4_rcv(struct sk_buff *skb);
@@ -738,9 +772,10 @@
  
  /* tcp_input.c */
  extern void tcp_cwnd_application_limited(struct sock *sk);
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/include/net/tux.h linux-910/include/net/tux.h
---- linux-905/include/net/tux.h
-+++ linux-910/include/net/tux.h
+Index: latest/include/net/tux.h
+===================================================================
+--- /dev/null
++++ latest/include/net/tux.h
 @@ -0,0 +1,803 @@
 +#ifndef _NET_TUX_H
 +#define _NET_TUX_H
@@ -1545,9 +1580,10 @@
 +extern void free_tux_request_slabs(void);
 +
 +#endif
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/include/net/tux_u.h linux-910/include/net/tux_u.h
---- linux-905/include/net/tux_u.h
-+++ linux-910/include/net/tux_u.h
+Index: latest/include/net/tux_u.h
+===================================================================
+--- /dev/null
++++ latest/include/net/tux_u.h
 @@ -0,0 +1,163 @@
 +#ifndef _NET_TUX_U_H
 +#define _NET_TUX_U_H
@@ -1712,9 +1748,10 @@
 +} ftp_command_t;
 +
 +#endif
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/kernel/exit.c linux-910/kernel/exit.c
---- linux-905/kernel/exit.c
-+++ linux-910/kernel/exit.c
+Index: latest/kernel/exit.c
+===================================================================
+--- latest.orig/kernel/exit.c
++++ latest/kernel/exit.c
 @@ -811,6 +811,15 @@ fastcall NORET_TYPE void do_exit(long co
   		hrtimer_cancel(&tsk->signal->real_timer);
  		exit_itimers(tsk->signal);
@@ -1731,9 +1768,10 @@
  	acct_collect(code, group_dead);
  	if (unlikely(tsk->robust_list))
  		exit_robust_list(tsk);
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/kernel/fork.c linux-910/kernel/fork.c
---- linux-905/kernel/fork.c
-+++ linux-910/kernel/fork.c
+Index: latest/kernel/fork.c
+===================================================================
+--- latest.orig/kernel/fork.c
++++ latest/kernel/fork.c
 @@ -974,6 +974,8 @@ static struct task_struct *copy_process(
  	if (!p)
  		goto fork_out;
@@ -1743,9 +1781,10 @@
  #ifdef CONFIG_TRACE_IRQFLAGS
  	DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
  	DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/kernel/kmod.c linux-910/kernel/kmod.c
---- linux-905/kernel/kmod.c
-+++ linux-910/kernel/kmod.c
+Index: latest/kernel/kmod.c
+===================================================================
+--- latest.orig/kernel/kmod.c
++++ latest/kernel/kmod.c
 @@ -127,14 +127,14 @@ struct subprocess_info {
  /*
   * This is the task which runs the usermode application
@@ -1796,9 +1835,10 @@
  
  	/* Exec failed? */
  	sub_info->retval = retval;
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/kernel/signal.c linux-910/kernel/signal.c
---- linux-905/kernel/signal.c
-+++ linux-910/kernel/signal.c
+Index: latest/kernel/signal.c
+===================================================================
+--- latest.orig/kernel/signal.c
++++ latest/kernel/signal.c
 @@ -335,6 +335,7 @@ flush_signal_handlers(struct task_struct
  	}
  }
@@ -1807,9 +1847,10 @@
  
  /* Notify the system that a driver wants to block all signals for this
   * process, and wants to be notified if any signals at all were to be
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/mm/filemap.c linux-910/mm/filemap.c
---- linux-905/mm/filemap.c
-+++ linux-910/mm/filemap.c
+Index: latest/mm/filemap.c
+===================================================================
+--- latest.orig/mm/filemap.c
++++ latest/mm/filemap.c
 @@ -874,7 +874,8 @@ void do_generic_mapping_read(struct addr
  			     struct file *filp,
  			     loff_t *ppos,
@@ -1861,9 +1902,10 @@
  	if (desc.written)
  		return desc.written;
  	return desc.error;
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/mm/truncate.c linux-910/mm/truncate.c
---- linux-905/mm/truncate.c
-+++ linux-910/mm/truncate.c
+Index: latest/mm/truncate.c
+===================================================================
+--- latest.orig/mm/truncate.c
++++ latest/mm/truncate.c
 @@ -266,6 +266,8 @@ unlock:
  	return ret;
  }
@@ -1873,9 +1915,10 @@
  unsigned long invalidate_inode_pages(struct address_space *mapping)
  {
  	return invalidate_mapping_pages(mapping, 0, ~0UL);
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/core/sock.c linux-910/net/core/sock.c
---- linux-905/net/core/sock.c
-+++ linux-910/net/core/sock.c
+Index: latest/net/core/sock.c
+===================================================================
+--- latest.orig/net/core/sock.c
++++ latest/net/core/sock.c
 @@ -904,7 +904,7 @@ void sk_free(struct sock *sk)
  	module_put(owner);
  }
@@ -1895,17 +1938,19 @@
  		if (unlikely(xfrm_sk_clone_policy(newsk))) {
  			/* It is still raw copy of parent, so invalidate
  			 * destructor and make plain sk_free() */
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/ipv4/tcp.c linux-910/net/ipv4/tcp.c
---- linux-905/net/ipv4/tcp.c
-+++ linux-910/net/ipv4/tcp.c
+Index: latest/net/ipv4/tcp.c
+===================================================================
+--- latest.orig/net/ipv4/tcp.c
++++ latest/net/ipv4/tcp.c
 @@ -2349,3 +2349,4 @@ EXPORT_SYMBOL(tcp_sendpage);
  EXPORT_SYMBOL(tcp_setsockopt);
  EXPORT_SYMBOL(tcp_shutdown);
  EXPORT_SYMBOL(tcp_statistics);
 +EXPORT_SYMBOL_GPL(tcp_cleanup_rbuf);
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/ipv4/tcp_input.c linux-910/net/ipv4/tcp_input.c
---- linux-905/net/ipv4/tcp_input.c
-+++ linux-910/net/ipv4/tcp_input.c
+Index: latest/net/ipv4/tcp_input.c
+===================================================================
+--- latest.orig/net/ipv4/tcp_input.c
++++ latest/net/ipv4/tcp_input.c
 @@ -3534,6 +3534,7 @@ static int tcp_prune_queue(struct sock *
  	return -1;
  }
@@ -1914,9 +1959,10 @@
  
  /* RFC2861, slow part. Adjust cwnd, after it was not full during one rto.
   * As additional protections, we do not touch cwnd in retransmission phases,
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/ipv4/tcp_output.c linux-910/net/ipv4/tcp_output.c
---- linux-905/net/ipv4/tcp_output.c
-+++ linux-910/net/ipv4/tcp_output.c
+Index: latest/net/ipv4/tcp_output.c
+===================================================================
+--- latest.orig/net/ipv4/tcp_output.c
++++ latest/net/ipv4/tcp_output.c
 @@ -858,6 +858,8 @@ unsigned int tcp_current_mss(struct sock
  	return mss_now;
  }
@@ -1934,9 +1980,10 @@
  
  /* Send _single_ skb sitting at the send head. This function requires
   * true push pending frames to setup probe timer etc.
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/Kconfig linux-910/net/Kconfig
---- linux-905/net/Kconfig
-+++ linux-910/net/Kconfig
+Index: latest/net/Kconfig
+===================================================================
+--- latest.orig/net/Kconfig
++++ latest/net/Kconfig
 @@ -245,6 +245,7 @@ source "net/ax25/Kconfig"
  source "net/irda/Kconfig"
  source "net/bluetooth/Kconfig"
@@ -1945,9 +1992,10 @@
  
  config WIRELESS_EXT
  	bool
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/Makefile linux-910/net/Makefile
---- linux-905/net/Makefile
-+++ linux-910/net/Makefile
+Index: latest/net/Makefile
+===================================================================
+--- latest.orig/net/Makefile
++++ latest/net/Makefile
 @@ -22,6 +22,7 @@ obj-$(CONFIG_UNIX)		+= unix/
  ifneq ($(CONFIG_IPV6),)
  obj-y				+= ipv6/
@@ -1956,9 +2004,10 @@
  obj-$(CONFIG_PACKET)		+= packet/
  obj-$(CONFIG_NET_KEY)		+= key/
  obj-$(CONFIG_NET_SCHED)		+= sched/
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/socket.c linux-910/net/socket.c
---- linux-905/net/socket.c
-+++ linux-910/net/socket.c
+Index: latest/net/socket.c
+===================================================================
+--- latest.orig/net/socket.c
++++ latest/net/socket.c
 @@ -67,6 +67,7 @@
  #include <linux/netdevice.h>
  #include <linux/proc_fs.h>
@@ -2055,9 +2104,10 @@
  #ifdef CONFIG_PROC_FS
  void socket_seq_show(struct seq_file *seq)
  {
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/tux/abuf.c linux-910/net/tux/abuf.c
---- linux-905/net/tux/abuf.c
-+++ linux-910/net/tux/abuf.c
+Index: latest/net/tux/abuf.c
+===================================================================
+--- /dev/null
++++ latest/net/tux/abuf.c
 @@ -0,0 +1,190 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -2249,9 +2299,10 @@
 +	send_abuf(req, size, flags);
 +	add_req_to_workqueue(req);
 +}
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/tux/accept.c linux-910/net/tux/accept.c
---- linux-905/net/tux/accept.c
-+++ linux-910/net/tux/accept.c
+Index: latest/net/tux/accept.c
+===================================================================
+--- /dev/null
++++ latest/net/tux/accept.c
 @@ -0,0 +1,863 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -3116,9 +3167,10 @@
 +	goto out;
 +}
 +
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/tux/cachemiss.c linux-910/net/tux/cachemiss.c
---- linux-905/net/tux/cachemiss.c
-+++ linux-910/net/tux/cachemiss.c
+Index: latest/net/tux/cachemiss.c
+===================================================================
+--- /dev/null
++++ latest/net/tux/cachemiss.c
 @@ -0,0 +1,265 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -3358,7 +3410,7 @@
 +	memset(iot, 0, sizeof(*iot));
 +
 +	iot->ti = ti;
-+	iot->async_lock = SPIN_LOCK_UNLOCKED;
++	spin_lock_init(&iot->async_lock);
 +	iot->nr_async_pending = 0;
 +	INIT_LIST_HEAD(&iot->async_queue);
 +	init_waitqueue_head(&iot->async_sleep);
@@ -3385,9 +3437,10 @@
 +	return 0;
 +}
 +
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/tux/cgi.c linux-910/net/tux/cgi.c
---- linux-905/net/tux/cgi.c
-+++ linux-910/net/tux/cgi.c
+Index: latest/net/tux/cgi.c
+===================================================================
+--- /dev/null
++++ latest/net/tux/cgi.c
 @@ -0,0 +1,171 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -3560,9 +3613,10 @@
 +	}
 +	return pid;
 +}
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/tux/directory.c linux-910/net/tux/directory.c
---- linux-905/net/tux/directory.c
-+++ linux-910/net/tux/directory.c
+Index: latest/net/tux/directory.c
+===================================================================
+--- /dev/null
++++ latest/net/tux/directory.c
 @@ -0,0 +1,302 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -3866,9 +3920,10 @@
 +	add_req_to_workqueue(req);
 +}
 +
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/tux/extcgi.c linux-910/net/tux/extcgi.c
---- linux-905/net/tux/extcgi.c
-+++ linux-910/net/tux/extcgi.c
+Index: latest/net/tux/extcgi.c
+===================================================================
+--- /dev/null
++++ latest/net/tux/extcgi.c
 @@ -0,0 +1,329 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -4199,9 +4254,10 @@
 +
 +#define EXTCGI_INVALID EXTCGI_INVALID_HEADER EXTCGI_INVALID_BODY
 +
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/tux/gzip.c linux-910/net/tux/gzip.c
---- linux-905/net/tux/gzip.c
-+++ linux-910/net/tux/gzip.c
+Index: latest/net/tux/gzip.c
+===================================================================
+--- /dev/null
++++ latest/net/tux/gzip.c
 @@ -0,0 +1,40 @@
 +/*	$Id$	*/
 +
@@ -4243,9 +4299,10 @@
 +	return left;
 +}
 +
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/tux/input.c linux-910/net/tux/input.c
---- linux-905/net/tux/input.c
-+++ linux-910/net/tux/input.c
+Index: latest/net/tux/input.c
+===================================================================
+--- /dev/null
++++ latest/net/tux/input.c
 @@ -0,0 +1,641 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -4888,9 +4945,10 @@
 +	return count;
 +}
 +
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/tux/Kconfig linux-910/net/tux/Kconfig
---- linux-905/net/tux/Kconfig
-+++ linux-910/net/tux/Kconfig
+Index: latest/net/tux/Kconfig
+===================================================================
+--- /dev/null
++++ latest/net/tux/Kconfig
 @@ -0,0 +1,25 @@
 +
 +config TUX
@@ -4917,9 +4975,10 @@
 +
 +endmenu
 +
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/tux/logger.c linux-910/net/tux/logger.c
---- linux-905/net/tux/logger.c
-+++ linux-910/net/tux/logger.c
+Index: latest/net/tux/logger.c
+===================================================================
+--- /dev/null
++++ latest/net/tux/logger.c
 @@ -0,0 +1,841 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -4952,7 +5011,7 @@
 + *
 + ****************************************************************/
 +
-+static spinlock_t log_lock = SPIN_LOCK_UNLOCKED;
++static DEFINE_SPINLOCK(log_lock);
 +static unsigned int log_head, log_tail;
 +static char * log_buffer = NULL;
 +static DECLARE_WAIT_QUEUE_HEAD(log_wait);
@@ -5762,9 +5821,10 @@
 +
 +	Dprintk("logger thread stopped!\n");
 +}
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/tux/main.c linux-910/net/tux/main.c
---- linux-905/net/tux/main.c
-+++ linux-910/net/tux/main.c
+Index: latest/net/tux/main.c
+===================================================================
+--- /dev/null
++++ latest/net/tux/main.c
 @@ -0,0 +1,1417 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -5938,10 +5998,10 @@
 +
 +		INIT_LIST_HEAD(&ti->all_requests);
 +
-+		ti->free_requests_lock = SPIN_LOCK_UNLOCKED;
++		spin_lock_init(&ti->free_requests_lock);
 +		INIT_LIST_HEAD(&ti->free_requests);
 +
-+		ti->work_lock = SPIN_LOCK_UNLOCKED;
++		spin_lock_init(&ti->work_lock);
 +		INIT_LIST_HEAD(&ti->work_pending);
 +		INIT_LIST_HEAD(&ti->lru);
 +
@@ -7183,9 +7243,10 @@
 +
 +MODULE_LICENSE("GPL");
 +
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/tux/Makefile linux-910/net/tux/Makefile
---- linux-905/net/tux/Makefile
-+++ linux-910/net/tux/Makefile
+Index: latest/net/tux/Makefile
+===================================================================
+--- /dev/null
++++ latest/net/tux/Makefile
 @@ -0,0 +1,12 @@
 +#
 +# Makefile for TUX
@@ -7199,9 +7260,10 @@
 +
 +tux-$(subst m,y,$(CONFIG_TUX_EXTCGI)) += cgi.o extcgi.o
 +
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/tux/mod.c linux-910/net/tux/mod.c
---- linux-905/net/tux/mod.c
-+++ linux-910/net/tux/mod.c
+Index: latest/net/tux/mod.c
+===================================================================
+--- /dev/null
++++ latest/net/tux/mod.c
 @@ -0,0 +1,262 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -7231,7 +7293,7 @@
 + *
 + ****************************************************************/
 +
-+spinlock_t tuxmodules_lock = SPIN_LOCK_UNLOCKED;
++DEFINE_SPINLOCK(tuxmodules_lock);
 +static LIST_HEAD(tuxmodules_list);
 +
 +tcapi_template_t * get_first_usermodule (void)
@@ -7465,9 +7527,10 @@
 +	return ret;
 +}
 +
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/tux/output.c linux-910/net/tux/output.c
---- linux-905/net/tux/output.c
-+++ linux-910/net/tux/output.c
+Index: latest/net/tux/output.c
+===================================================================
+--- /dev/null
++++ latest/net/tux/output.c
 @@ -0,0 +1,352 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -7821,9 +7884,10 @@
 +	return 0;
 +}
 +
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/tux/parser.h linux-910/net/tux/parser.h
---- linux-905/net/tux/parser.h
-+++ linux-910/net/tux/parser.h
+Index: latest/net/tux/parser.h
+===================================================================
+--- /dev/null
++++ latest/net/tux/parser.h
 @@ -0,0 +1,102 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -7927,9 +7991,10 @@
 +		GOTO_REDIR;			\
 +} while (0)
 +
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/tux/postpone.c linux-910/net/tux/postpone.c
---- linux-905/net/tux/postpone.c
-+++ linux-910/net/tux/postpone.c
+Index: latest/net/tux/postpone.c
+===================================================================
+--- /dev/null
++++ latest/net/tux/postpone.c
 @@ -0,0 +1,77 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -8008,9 +8073,10 @@
 +	return err;
 +}
 +
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/tux/proc.c linux-910/net/tux/proc.c
---- linux-905/net/tux/proc.c
-+++ linux-910/net/tux/proc.c
+Index: latest/net/tux/proc.c
+===================================================================
+--- /dev/null
++++ latest/net/tux/proc.c
 @@ -0,0 +1,1149 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -9161,9 +9227,10 @@
 +}
 +
 +
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/tux/proto_ftp.c linux-910/net/tux/proto_ftp.c
---- linux-905/net/tux/proto_ftp.c
-+++ linux-910/net/tux/proto_ftp.c
+Index: latest/net/tux/proto_ftp.c
+===================================================================
+--- /dev/null
++++ latest/net/tux/proto_ftp.c
 @@ -0,0 +1,1555 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -10720,9 +10787,10 @@
 +	.name = "ftp",
 +};
 +
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/tux/proto_http.c linux-910/net/tux/proto_http.c
---- linux-905/net/tux/proto_http.c
-+++ linux-910/net/tux/proto_http.c
+Index: latest/net/tux/proto_http.c
+===================================================================
+--- /dev/null
++++ latest/net/tux/proto_http.c
 @@ -0,0 +1,2197 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -11738,7 +11806,7 @@
 +	return 0;
 +}
 +
-+static spinlock_t mimetypes_lock = SPIN_LOCK_UNLOCKED;
++static DEFINE_SPINLOCK(mimetypes_lock);
 +
 +static LIST_HEAD(mimetypes_head);
 +
@@ -12921,9 +12989,10 @@
 +	.name = "http",
 +};
 +
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/tux/redirect.c linux-910/net/tux/redirect.c
---- linux-905/net/tux/redirect.c
-+++ linux-910/net/tux/redirect.c
+Index: latest/net/tux/redirect.c
+===================================================================
+--- /dev/null
++++ latest/net/tux/redirect.c
 @@ -0,0 +1,172 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -13097,9 +13166,10 @@
 +{
 +	kmem_cache_destroy(tux_req.slab);
 +}
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/tux/times.c linux-910/net/tux/times.c
---- linux-905/net/tux/times.c
-+++ linux-910/net/tux/times.c
+Index: latest/net/tux/times.c
+===================================================================
+--- /dev/null
++++ latest/net/tux/times.c
 @@ -0,0 +1,392 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -13493,9 +13563,10 @@
 +
 +	return mktime(year, mon, mday, hour, min, sec);
 +}
-diff -urNp --exclude-from=/home/davej/.exclude linux-905/net/tux/userspace.c linux-910/net/tux/userspace.c
---- linux-905/net/tux/userspace.c
-+++ linux-910/net/tux/userspace.c
+Index: latest/net/tux/userspace.c
+===================================================================
+--- /dev/null
++++ latest/net/tux/userspace.c
 @@ -0,0 +1,27 @@
 +/*
 + * TUX - Integrated Application Protocols Layer and Object Cache
@@ -13524,10 +13595,10 @@
 + *
 + ****************************************************************/
 +
-Index: linux-tux.q/net/tux/times.h
+Index: latest/net/tux/times.h
 ===================================================================
 --- /dev/null
-+++ linux-tux.q/net/tux/times.h
++++ latest/net/tux/times.h
 @@ -0,0 +1,26 @@
 +static time_t TimeDays[10][13] = {
 + { 852073200,	854751600,	857170800,	859849200,	862441200,	865119600,	867711600,	870390000,	873068400,	875660400,	878338800,	880930800,	883609200 } ,
@@ -13555,4 +13626,3 @@
 +};
 +#define TUX_YEAROFFSET   1997
 +#define TUX_NUMYEARS     10
-


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]