1 --- linux-2.2.25-ow1/linux-2.2.25-ow1.diff~ Fri Feb 27 21:37:43 2004
2 +++ linux-2.2.25-ow1/linux-2.2.25-ow1.diff Fri Feb 27 21:40:55 2004
4 current->tss.error_code = error_code;
5 current->tss.trap_no = 13;
6 force_sig(SIGSEGV, current);
11 -- /* Mast out spurious debug traps due to lazy DR7 setting */
12 -+ /* Mask out spurious debug traps due to lazy DR7 setting */
13 - if (condition & (DR_TRAP0|DR_TRAP1|DR_TRAP2|DR_TRAP3)) {
14 - if (!tsk->tss.debugreg[7])
16 diff -urPX nopatch linux-2.2.25/arch/m68k/config.in linux/arch/m68k/config.in
17 --- linux-2.2.25/arch/m68k/config.in Sun Mar 25 20:31:50 2001
18 +++ linux/arch/m68k/config.in Thu Mar 20 14:07:47 2003
20 bprm.p = PAGE_SIZE*MAX_ARG_PAGES-sizeof(void *);
21 for (i=0 ; i<MAX_ARG_PAGES ; i++) /* clear page-table */
23 -diff -urPX nopatch linux-2.2.25/drivers/sgi/char/graphics.c linux/drivers/sgi/char/graphics.c
24 ---- linux-2.2.25/drivers/sgi/char/graphics.c Sun Mar 25 20:31:41 2001
25 -+++ linux/drivers/sgi/char/graphics.c Thu Mar 20 14:07:47 2003
28 - if (board >= boards)
30 -- if (max_len < sizeof (struct gfx_getboardinfo_args))
31 -+ if (max_len < (int)sizeof (struct gfx_getboardinfo_args))
33 - if (max_len > cards [board].g_board_info_len)
34 - max_len = cards [boards].g_board_info_len;
35 diff -urPX nopatch linux-2.2.25/fs/binfmt_aout.c linux/fs/binfmt_aout.c
36 --- linux-2.2.25/fs/binfmt_aout.c Fri Nov 2 19:39:08 2001
37 +++ linux/fs/binfmt_aout.c Thu Mar 20 14:07:47 2003
38 @@ -1380,30 +1359,6 @@
40 current->dumpable = was_dumpable;
42 -diff -urPX nopatch linux-2.2.25/fs/fat/inode.c linux/fs/fat/inode.c
43 ---- linux-2.2.25/fs/fat/inode.c Tue May 21 03:32:35 2002
44 -+++ linux/fs/fat/inode.c Thu Mar 20 14:07:47 2003
46 - i_pos = MSDOS_I(inode)->i_location;
47 - if (inode->i_ino == MSDOS_ROOT_INO || !i_pos) return;
48 - if (!(bh = fat_bread(sb, ((unsigned long long) i_pos) >> MSDOS_DPB_BITS))) {
49 -- printk("dev = %s, ino = %ld\n", kdevname(inode->i_dev), i_pos);
50 -+ printk("dev = %s, ino = %ld\n",
51 -+ kdevname(inode->i_dev), (long)i_pos);
52 - fat_fs_panic(sb, "msdos_write_inode: unable to read i-node block");
55 -diff -urPX nopatch linux-2.2.25/fs/inode.c linux/fs/inode.c
56 ---- linux-2.2.25/fs/inode.c Sun Mar 25 20:37:38 2001
57 -+++ linux/fs/inode.c Thu Mar 20 14:07:47 2003
60 - void update_atime (struct inode *inode)
62 -+ if ( inode->i_atime == CURRENT_TIME ) return;
63 - if ( IS_NOATIME (inode) ) return;
64 - if ( IS_NODIRATIME (inode) && S_ISDIR (inode->i_mode) ) return;
65 - if ( IS_RDONLY (inode) ) return;
66 diff -urPX nopatch linux-2.2.25/fs/namei.c linux/fs/namei.c
67 --- linux-2.2.25/fs/namei.c Fri Nov 2 19:39:08 2001
68 +++ linux/fs/namei.c Thu Mar 20 14:07:47 2003
69 @@ -1568,11 +1523,20 @@
71 dp = (struct proc_dir_entry *) inode->u.generic_ip;
73 -- if (pid && process_unauthorized(type, pid))
74 -+ if (pid && process_unauthorized(type, pid, inode))
76 +- if (pid && process_unauthorized(type, pid)) {
77 ++ if (pid && process_unauthorized(type, pid, inode)) {
81 +@@ -1555,7 +1567,7 @@
85 +- if (pid && process_unauthorized(type, pid)) {
86 ++ if (pid && process_unauthorized(type, pid, inode)) {
90 diff -urPX nopatch linux-2.2.25/fs/proc/base.c linux/fs/proc/base.c
91 --- linux-2.2.25/fs/proc/base.c Sun Mar 25 20:30:58 2001
92 +++ linux/fs/proc/base.c Thu Mar 20 14:07:47 2003
93 @@ -1678,41 +1642,6 @@
94 proc_scsi = create_proc_entry("scsi", S_IFDIR, 0);
96 proc_register(&proc_root, &proc_sys_root);
97 -diff -urPX nopatch linux-2.2.25/fs/select.c linux/fs/select.c
98 ---- linux-2.2.25/fs/select.c Mon Sep 16 20:26:32 2002
99 -+++ linux/fs/select.c Thu Mar 20 14:07:47 2003
105 -+ int ret, size, max_fdset;
107 - timeout = MAX_SCHEDULE_TIMEOUT;
109 -@@ -299,8 +299,11 @@
113 -- if (n > current->files->max_fdset)
114 -- n = current->files->max_fdset;
115 -+ max_fdset = current->files->max_fdset;
116 -+ if (n > max_fdset)
122 - * We need 6 bitmaps (in/out/ex for both incoming and outgoing),
125 - /* Do a sanity check on nfds ... */
127 -- if (nfds > current->files->max_fds || nfds > 0x100000)
128 -+ if (nfds > current->files->max_fds || nfds > NR_OPEN)
132 diff -urPX nopatch linux-2.2.25/include/asm-i386/a.out.h linux/include/asm-i386/a.out.h
133 --- linux-2.2.25/include/asm-i386/a.out.h Sun Mar 25 20:31:05 2001
134 +++ linux/include/asm-i386/a.out.h Thu Mar 20 14:07:47 2003
135 @@ -2028,29 +1957,6 @@
136 addr = PAGE_ALIGN(addr);
138 for (vmm = find_vma(current->mm, addr); ; vmm = vmm->vm_next) {
139 -diff -urPX nopatch linux-2.2.25/mm/swapfile.c linux/mm/swapfile.c
140 ---- linux-2.2.25/mm/swapfile.c Fri Nov 2 19:39:16 2001
141 -+++ linux/mm/swapfile.c Thu Mar 20 14:07:47 2003
142 -@@ -367,14 +367,11 @@
143 - for (type = swap_list.head; type >= 0; type = swap_info[type].next) {
144 - p = swap_info + type;
145 - if ((p->flags & SWP_WRITEOK) == SWP_WRITEOK) {
146 -- if (p->swap_file) {
147 -- if (p->swap_file == dentry)
150 -- if (S_ISBLK(dentry->d_inode->i_mode)
151 -- && (p->swap_device == dentry->d_inode->i_rdev))
154 -+ if (p->swap_file == dentry)
156 -+ if (S_ISBLK(dentry->d_inode->i_mode) &&
157 -+ p->swap_device == dentry->d_inode->i_rdev)
162 diff -urPX nopatch linux-2.2.25/security/Common.in linux/security/Common.in
163 --- linux-2.2.25/security/Common.in Thu Jan 1 03:00:00 1970
164 +++ linux/security/Common.in Thu Mar 20 14:07:47 2003