Messages in this thread Patch in this message | | | Date | Sun, 13 Sep 98 20:54 BST | From | (Alan Cox) | Subject | Patch: Whoops wrong thing posted |
| |
I posted the debugging version of the patches not the final one. This diff goes from one to the other for the dayna and the sysvfs.
Alan
--- fs/sysv/fsync.cB Sun Sep 13 17:51:57 1998 +++ fs/sysv/fsync.c Sun Sep 13 19:21:54 1998 @@ -126,7 +126,7 @@ return err; } -static int sync_dindirect(struct inode *inode, unsigned long *diblockp, int convert, +static int sync_dindirect(struct inode *inode, u32 *diblockp, int convert, int wait) { int i; --- fs/sysv/inode.cB Sun Sep 13 19:36:02 1998 +++ fs/sysv/inode.c Sun Sep 13 19:36:19 1998 @@ -656,7 +656,6 @@ p = inode->u.sysv_i.i_data + nr; repeat: tmp = *p; - printk("getblk(%x)\n", tmp); if (tmp) { result = sv_getblk(sb, inode->i_dev, tmp); if (tmp == *p) --- drivers/net/daynaport.cB Sun Sep 13 18:07:44 1998 +++ drivers/net/daynaport.c Sun Sep 13 19:45:14 1998 @@ -158,35 +158,35 @@ * 3. Check all previous blocks are unaffected */ - for(i=0;i<8;i++) + for(i=0;i<2;i++) { volatile unsigned short *m=p+4096*i; /* Unwriteable - we have a fully decoded card and the RAM end located */ if(hwreg_present(m)==0) - return 8192*(i-1); + return 8192*i; *m=0xA5A0|i; for(j=0;j<i;j++) { /* Partial decode and wrap ? */ - if(p[4096*j]!=0xA5A0|j) + if(p[4096*j]!=(0xA5A0|j)) { /* This is the first misdecode, so it had one less page than we tried */ - return 8192*(i-1); + return 8192*i; } j++; } /* Ok it still decodes.. move on 8K */ } /* - * We don't look past 64K. That should cover all cards - * and above 64K there isnt really any gain. + * We don't look past 16K. That should cover most cards + * and above 16K there isnt really any gain. */ - return 65536; + return 16384; } /* @@ -676,7 +676,6 @@ { unsigned short *to = tp; const volatile unsigned short *from = fp; - volatile int p; count++; count/=2; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/faq.html
| |