r1018 - trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches
Joshua Kwan
joshk@haydn.debian.org
Wed, 11 Aug 2004 16:01:17 -0600
Author: joshk
Date: 2004-08-11 16:01:02 -0600 (Wed, 11 Aug 2004)
New Revision: 1018
Added:
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/032_cramfs_initrd.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/033_umsdos_oops.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/034_modules_seq.diff
Modified:
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/patch-2.4.26-1
Log:
more splits
Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/032_cramfs_initrd.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/032_cramfs_initrd.diff 2004-08-11 21:35:31 UTC (rev 1017)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/032_cramfs_initrd.diff 2004-08-11 22:01:02 UTC (rev 1018)
@@ -0,0 +1,25 @@
+diff -urN kernel-source-2.4.22-2.4.22.orig/fs/block_dev.c kernel-source-2.4.22-2.4.22/fs/block_dev.c
+--- kernel-source-2.4.22-2.4.22.orig/fs/block_dev.c 2003-06-01 13:06:32.000000000 +1000
++++ kernel-source-2.4.22-2.4.22/fs/block_dev.c 2003-06-01 20:43:53.000000000 +1000
+@@ -95,7 +95,7 @@
+ sync_buffers(dev, 2);
+ blksize_size[MAJOR(dev)][MINOR(dev)] = size;
+ bdev->bd_inode->i_blkbits = blksize_bits(size);
+- kill_bdev(bdev);
++ invalidate_bdev(bdev, 1);
+ bdput(bdev);
+ return 0;
+ }
+diff -urN kernel-source-2.4.22-2.4.22.orig/fs/cramfs/inode.c kernel-source-2.4.22-2.4.22/fs/cramfs/inode.c
+--- kernel-source-2.4.22-2.4.22.orig/fs/cramfs/inode.c 2002-08-03 10:39:45.000000000 +1000
++++ kernel-source-2.4.22-2.4.22/fs/cramfs/inode.c 2002-08-30 20:40:16.000000000 +1000
+@@ -54,6 +54,9 @@
+ inode->i_blksize = PAGE_CACHE_SIZE;
+ inode->i_gid = cramfs_inode->gid;
+ inode->i_ino = CRAMINO(cramfs_inode);
++ inode->i_atime = 0;
++ inode->i_mtime = 0;
++ inode->i_ctime = 0;
+ /* inode->i_nlink is left 1 - arguably wrong for directories,
+ but it's the best we can do without reading the directory
+ contents. 1 yields the right result in GNU find, even
Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/033_umsdos_oops.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/033_umsdos_oops.diff 2004-08-11 21:35:31 UTC (rev 1017)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/033_umsdos_oops.diff 2004-08-11 22:01:02 UTC (rev 1018)
@@ -0,0 +1,19 @@
+diff -urN kernel-source-2.4.26/fs/umsdos/dir.c kernel-source-2.4.26-1/fs/umsdos/dir.c
+--- kernel-source-2.4.26/fs/umsdos/dir.c 2003-06-14 00:51:37.000000000 +1000
++++ kernel-source-2.4.26-1/fs/umsdos/dir.c 2003-06-01 20:43:54.000000000 +1000
+@@ -688,9 +688,14 @@
+ struct dentry *dentry_dst;
+ char *path, *pt;
+ int len;
+- struct address_space *mapping = hlink->d_inode->i_mapping;
++ struct address_space *mapping;
+ struct page *page;
+
++ dentry_dst = ERR_PTR(-ENOENT);
++ if (!hlink->d_inode)
++ goto out;
++
++ mapping = hlink->d_inode->i_mapping;
+ page=read_cache_page(mapping,0,(filler_t *)mapping->a_ops->readpage,NULL);
+ dentry_dst=(struct dentry *)page;
+ if (IS_ERR(page))
Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/034_modules_seq.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/034_modules_seq.diff 2004-08-11 21:35:31 UTC (rev 1017)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/034_modules_seq.diff 2004-08-11 22:01:02 UTC (rev 1018)
@@ -0,0 +1,147 @@
+diff -urN kernel-source-2.4.26/fs/proc/proc_misc.c kernel-source-2.4.26-1/fs/proc/proc_misc.c
+--- kernel-source-2.4.26/fs/proc/proc_misc.c 2003-11-29 05:26:21.000000000 +1100
++++ kernel-source-2.4.26-1/fs/proc/proc_misc.c 2003-11-29 20:53:47.000000000 +1100
+@@ -52,9 +52,6 @@
+ */
+ extern int get_hardware_list(char *);
+ extern int get_stram_list(char *);
+-#ifdef CONFIG_MODULES
+-extern int get_module_list(char *);
+-#endif
+ extern int get_device_list(char *);
+ extern int get_filesystem_list(char *);
+ extern int get_exec_domain_list(char *);
+@@ -269,12 +266,17 @@
+ };
+
+ #ifdef CONFIG_MODULES
+-static int modules_read_proc(char *page, char **start, off_t off,
+- int count, int *eof, void *data)
++extern struct seq_operations modules_op;
++static int modules_open(struct inode *inode, struct file *file)
+ {
+- int len = get_module_list(page);
+- return proc_calc_metrics(page, start, off, count, eof, len);
++ return seq_open(file, &modules_op);
+ }
++static struct file_operations proc_modules_operations = {
++ open: modules_open,
++ read: seq_read,
++ llseek: seq_lseek,
++ release: seq_release,
++};
+
+ extern struct seq_operations ksyms_op;
+ static int ksyms_open(struct inode *inode, struct file *file)
+@@ -604,9 +606,6 @@
+ #ifdef CONFIG_STRAM_PROC
+ {"stram", stram_read_proc},
+ #endif
+-#ifdef CONFIG_MODULES
+- {"modules", modules_read_proc},
+-#endif
+ {"stat", kstat_read_proc},
+ {"devices", devices_read_proc},
+ #if !defined(CONFIG_ARCH_S390) && !defined(CONFIG_X86)
+@@ -642,6 +641,7 @@
+ create_seq_entry("slabinfo",S_IWUSR|S_IRUGO,&proc_slabinfo_operations);
+ #ifdef CONFIG_MODULES
+ create_seq_entry("ksyms", 0, &proc_ksyms_operations);
++ create_seq_entry("modules", 0, &proc_modules_operations);
+ #endif
+ proc_root_kcore = create_proc_entry("kcore", S_IRUSR, NULL);
+ if (proc_root_kcore) {
+diff -urN kernel-source-2.4.26/kernel/module.c kernel-source-2.4.26-1/kernel/module.c
+--- kernel-source-2.4.26/kernel/module.c 2003-08-25 21:44:44.000000000 +1000
++++ kernel-source-2.4.26-1/kernel/module.c 2003-09-03 20:27:20.000000000 +1000
+@@ -1166,6 +1166,89 @@
+ return PAGE_SIZE - left;
+ }
+
++static void *s_modules_start(struct seq_file *m, loff_t *pos)
++{
++ struct module *v;
++ loff_t n = *pos;
++
++ lock_kernel();
++ for (v = module_list, n = *pos; v != &kernel_module; n--, v = v->next) {
++ if (n == 0)
++ return v;
++ }
++ unlock_kernel();
++ return NULL;
++}
++
++static void *s_modules_next(struct seq_file *m, void *p, loff_t *pos)
++{
++ struct module *v = p;
++ (*pos)++;
++ v = v->next;
++ if (v == &kernel_module) {
++ unlock_kernel();
++ return NULL;
++ }
++ return v;
++}
++
++static void s_modules_stop(struct seq_file *m, void *p)
++{
++ if (p)
++ unlock_kernel();
++}
++
++static int s_modules_show(struct seq_file *m, void *p)
++{
++ struct module *v = p;
++ struct module_ref *ref;
++
++ seq_printf(m, "%-20s%8lu", v->name, v->size);
++
++ if (v->flags & MOD_RUNNING)
++ seq_printf(m, "%4ld",
++ (mod_member_present(v, can_unload)
++ && v->can_unload
++ ? -1L : (long)atomic_read(&v->uc.usecount)));
++
++ if (v->flags & MOD_DELETED)
++ seq_puts(m, " (deleted)");
++ else if (v->flags & MOD_RUNNING) {
++ if (v->flags & MOD_AUTOCLEAN)
++ seq_puts(m, " (autoclean)");
++ if (!(v->flags & MOD_USED_ONCE))
++ seq_puts(m, " (unused)");
++ }
++ else if (v->flags & MOD_INITIALIZING)
++ seq_puts(m, " (initializing)");
++ else
++ seq_puts(m, " (uninitialized)");
++
++ if ((ref = v->refs) != NULL) {
++ seq_puts(m, " [");
++ while (1) {
++ seq_puts(m, ref->ref->name);
++
++ if ((ref = ref->next_ref) != NULL)
++ seq_putc(m, ' ');
++ else
++ break;
++ }
++ seq_putc(m, ']');
++ }
++
++ seq_putc(m, '\n');
++
++ return 0;
++}
++
++struct seq_operations modules_op = {
++ start: s_modules_start,
++ next: s_modules_next,
++ stop: s_modules_stop,
++ show: s_modules_show
++};
++
+ /*
+ * Called by the /proc file system to return a current list of ksyms.
+ */
+
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/patch-2.4.26-1
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/patch-2.4.26-1 2004-08-11 21:35:31 UTC (rev 1017)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/patch-2.4.26-1 2004-08-11 22:01:02 UTC (rev 1018)
@@ -388,9 +388,6 @@
+* Added asm/io.h for in*/out* to drivers/net/wan/farsync.c.
+* Corrected AdvWriteDWordLramNoSwap in drivers/scsi/advansys.c.
+* Always call complete after unlinking an urb in drivers/usb/host/usb-ohci.c.
-+* Fixed boundary checks for GUSAGE/SUSAGE in drivers/usb/hiddev.c.
-+* Fixed copy_to_user usage in drivers/usb/hiddev.c.
-+* Fixed handling of HIDs with product strings bug no manufacturer.
+* Set time fields to zero in fs/cramfs/inode.c.
+* Fixed umsdos_solve_hlink oops in fs/umsdos/dir.c.
+* Made CONFIG_PARIDE_EPATC8 into a runtime option.
@@ -487,43 +484,6 @@
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
# CONFIG_IP_ADVANCED_ROUTER is not set
-diff -urN kernel-source-2.4.26/arch/alpha/kernel/core_cia.c kernel-source-2.4.26-1/arch/alpha/kernel/core_cia.c
---- kernel-source-2.4.26/arch/alpha/kernel/core_cia.c 2003-08-25 21:44:39.000000000 +1000
-+++ kernel-source-2.4.26-1/arch/alpha/kernel/core_cia.c 2003-09-03 20:26:49.000000000 +1000
-@@ -775,9 +775,22 @@
- *(vip)CIA_IOC_PCI_W0_MASK = (hose->sg_isa->size - 1) & 0xfff00000;
- *(vip)CIA_IOC_PCI_T0_BASE = virt_to_phys(hose->sg_isa->ptes) >> 2;
-
-- *(vip)CIA_IOC_PCI_W2_BASE = __direct_map_base | 1;
-- *(vip)CIA_IOC_PCI_W2_MASK = (__direct_map_size - 1) & 0xfff00000;
-- *(vip)CIA_IOC_PCI_T2_BASE = 0 >> 2;
-+ if (cia_rev == 1) {
-+ __direct_map_base = 0x40000000;
-+
-+ *(vip)CIA_IOC_PCI_W1_BASE = 0x40000000 | 1;
-+ *(vip)CIA_IOC_PCI_W1_MASK = (0x40000000 - 1) & 0xfff00000;
-+ *(vip)CIA_IOC_PCI_T1_BASE = 0 >> 2;
-+
-+ *(vip)CIA_IOC_PCI_W2_BASE = 0x80000000 | 1;
-+ *(vip)CIA_IOC_PCI_W2_MASK = (0x40000000 - 1) & 0xfff00000;
-+ *(vip)CIA_IOC_PCI_T2_BASE = 0x40000000 >> 2;
-+ } else {
-+ *(vip)CIA_IOC_PCI_W2_BASE = __direct_map_base | 1;
-+ *(vip)CIA_IOC_PCI_W2_MASK =
-+ (__direct_map_size - 1) & 0xfff00000;
-+ *(vip)CIA_IOC_PCI_T2_BASE = 0 >> 2;
-+ }
-
- /* On PYXIS we have the monster window, selected by bit 40, so
- there is no need for window3 to be enabled.
-@@ -797,7 +810,6 @@
- if (is_pyxis) {
- *(vip)CIA_IOC_PCI_W3_BASE = 0;
- } else if (cia_rev == 1) {
-- *(vip)CIA_IOC_PCI_W1_BASE = 0;
- tbia_window = 3;
- } else if (max_low_pfn > (0x100000000UL >> PAGE_SHIFT)) {
- *(vip)CIA_IOC_PCI_W3_BASE = 0;
diff -urN kernel-source-2.4.26/arch/alpha/kernel/entry.S kernel-source-2.4.26-1/arch/alpha/kernel/entry.S
--- kernel-source-2.4.26/arch/alpha/kernel/entry.S 2003-06-14 00:51:29.000000000 +1000
+++ kernel-source-2.4.26-1/arch/alpha/kernel/entry.S 2004-02-22 20:27:59.000000000 +1100
@@ -6536,32 +6496,6 @@
{
return 0;
}
-diff -urN kernel-source-2.4.26/fs/block_dev.c kernel-source-2.4.26-1/fs/block_dev.c
---- kernel-source-2.4.26/fs/block_dev.c 2003-06-14 00:51:37.000000000 +1000
-+++ kernel-source-2.4.26-1/fs/block_dev.c 2003-06-01 20:43:53.000000000 +1000
-@@ -95,7 +95,7 @@
- sync_buffers(dev, 2);
- blksize_size[MAJOR(dev)][MINOR(dev)] = size;
- bdev->bd_inode->i_blkbits = blksize_bits(size);
-- kill_bdev(bdev);
-+ invalidate_bdev(bdev, 1);
- bdput(bdev);
- return 0;
- }
-
-diff -urN kernel-source-2.4.26/fs/cramfs/inode.c kernel-source-2.4.26-1/fs/cramfs/inode.c
---- kernel-source-2.4.26/fs/cramfs/inode.c 2002-08-03 10:39:45.000000000 +1000
-+++ kernel-source-2.4.26-1/fs/cramfs/inode.c 2002-08-30 20:40:16.000000000 +1000
-@@ -54,6 +54,9 @@
- inode->i_blksize = PAGE_CACHE_SIZE;
- inode->i_gid = cramfs_inode->gid;
- inode->i_ino = CRAMINO(cramfs_inode);
-+ inode->i_atime = 0;
-+ inode->i_mtime = 0;
-+ inode->i_ctime = 0;
- /* inode->i_nlink is left 1 - arguably wrong for directories,
- but it's the best we can do without reading the directory
- contents. 1 yields the right result in GNU find, even
diff -urN kernel-source-2.4.26/fs/ext2/Makefile kernel-source-2.4.26-1/fs/ext2/Makefile
--- kernel-source-2.4.26/fs/ext2/Makefile 2001-10-12 01:05:18.000000000 +1000
+++ kernel-source-2.4.26-1/fs/ext2/Makefile 2004-04-17 13:32:34.000000000 +1000
@@ -13118,59 +13052,7 @@
+
+ return 0;
+}
-diff -urN kernel-source-2.4.26/fs/proc/proc_misc.c kernel-source-2.4.26-1/fs/proc/proc_misc.c
---- kernel-source-2.4.26/fs/proc/proc_misc.c 2003-11-29 05:26:21.000000000 +1100
-+++ kernel-source-2.4.26-1/fs/proc/proc_misc.c 2003-11-29 20:53:47.000000000 +1100
-@@ -52,9 +52,6 @@
- */
- extern int get_hardware_list(char *);
- extern int get_stram_list(char *);
--#ifdef CONFIG_MODULES
--extern int get_module_list(char *);
--#endif
- extern int get_device_list(char *);
- extern int get_filesystem_list(char *);
- extern int get_exec_domain_list(char *);
-@@ -269,12 +266,17 @@
- };
-
- #ifdef CONFIG_MODULES
--static int modules_read_proc(char *page, char **start, off_t off,
-- int count, int *eof, void *data)
-+extern struct seq_operations modules_op;
-+static int modules_open(struct inode *inode, struct file *file)
- {
-- int len = get_module_list(page);
-- return proc_calc_metrics(page, start, off, count, eof, len);
-+ return seq_open(file, &modules_op);
- }
-+static struct file_operations proc_modules_operations = {
-+ open: modules_open,
-+ read: seq_read,
-+ llseek: seq_lseek,
-+ release: seq_release,
-+};
-
- extern struct seq_operations ksyms_op;
- static int ksyms_open(struct inode *inode, struct file *file)
-@@ -604,9 +606,6 @@
- #ifdef CONFIG_STRAM_PROC
- {"stram", stram_read_proc},
- #endif
--#ifdef CONFIG_MODULES
-- {"modules", modules_read_proc},
--#endif
- {"stat", kstat_read_proc},
- {"devices", devices_read_proc},
- #if !defined(CONFIG_ARCH_S390) && !defined(CONFIG_X86)
-@@ -642,6 +641,7 @@
- create_seq_entry("slabinfo",S_IWUSR|S_IRUGO,&proc_slabinfo_operations);
- #ifdef CONFIG_MODULES
- create_seq_entry("ksyms", 0, &proc_ksyms_operations);
-+ create_seq_entry("modules", 0, &proc_modules_operations);
- #endif
- proc_root_kcore = create_proc_entry("kcore", S_IRUSR, NULL);
- if (proc_root_kcore) {
+
diff -urN kernel-source-2.4.26/fs/proc/root.c kernel-source-2.4.26-1/fs/proc/root.c
--- kernel-source-2.4.26/fs/proc/root.c 2002-08-03 10:39:45.000000000 +1000
+++ kernel-source-2.4.26-1/fs/proc/root.c 2002-08-05 21:23:29.000000000 +1000
@@ -13192,25 +13074,7 @@
copy_to_user(&lastdirent->d_off, &d.d_off, sizeof(d.d_off));
error = count - buf.count;
}
-diff -urN kernel-source-2.4.26/fs/umsdos/dir.c kernel-source-2.4.26-1/fs/umsdos/dir.c
---- kernel-source-2.4.26/fs/umsdos/dir.c 2003-06-14 00:51:37.000000000 +1000
-+++ kernel-source-2.4.26-1/fs/umsdos/dir.c 2003-06-01 20:43:54.000000000 +1000
-@@ -688,9 +688,14 @@
- struct dentry *dentry_dst;
- char *path, *pt;
- int len;
-- struct address_space *mapping = hlink->d_inode->i_mapping;
-+ struct address_space *mapping;
- struct page *page;
-
-+ dentry_dst = ERR_PTR(-ENOENT);
-+ if (!hlink->d_inode)
-+ goto out;
-+
-+ mapping = hlink->d_inode->i_mapping;
- page=read_cache_page(mapping,0,(filler_t *)mapping->a_ops->readpage,NULL);
- dentry_dst=(struct dentry *)page;
- if (IS_ERR(page))
+
diff -urN kernel-source-2.4.26/fs/xattr.c kernel-source-2.4.26-1/fs/xattr.c
--- kernel-source-2.4.26/fs/xattr.c 2002-11-29 10:53:15.000000000 +1100
+++ kernel-source-2.4.26-1/fs/xattr.c 2004-04-17 13:32:30.000000000 +1000
@@ -19125,100 +18989,6 @@
EXPORT_SYMBOL(remap_page_range);
EXPORT_SYMBOL(max_mapnr);
-diff -urN kernel-source-2.4.26/kernel/module.c kernel-source-2.4.26-1/kernel/module.c
---- kernel-source-2.4.26/kernel/module.c 2003-08-25 21:44:44.000000000 +1000
-+++ kernel-source-2.4.26-1/kernel/module.c 2003-09-03 20:27:20.000000000 +1000
-@@ -1166,6 +1166,89 @@
- return PAGE_SIZE - left;
- }
-
-+static void *s_modules_start(struct seq_file *m, loff_t *pos)
-+{
-+ struct module *v;
-+ loff_t n = *pos;
-+
-+ lock_kernel();
-+ for (v = module_list, n = *pos; v != &kernel_module; n--, v = v->next) {
-+ if (n == 0)
-+ return v;
-+ }
-+ unlock_kernel();
-+ return NULL;
-+}
-+
-+static void *s_modules_next(struct seq_file *m, void *p, loff_t *pos)
-+{
-+ struct module *v = p;
-+ (*pos)++;
-+ v = v->next;
-+ if (v == &kernel_module) {
-+ unlock_kernel();
-+ return NULL;
-+ }
-+ return v;
-+}
-+
-+static void s_modules_stop(struct seq_file *m, void *p)
-+{
-+ if (p)
-+ unlock_kernel();
-+}
-+
-+static int s_modules_show(struct seq_file *m, void *p)
-+{
-+ struct module *v = p;
-+ struct module_ref *ref;
-+
-+ seq_printf(m, "%-20s%8lu", v->name, v->size);
-+
-+ if (v->flags & MOD_RUNNING)
-+ seq_printf(m, "%4ld",
-+ (mod_member_present(v, can_unload)
-+ && v->can_unload
-+ ? -1L : (long)atomic_read(&v->uc.usecount)));
-+
-+ if (v->flags & MOD_DELETED)
-+ seq_puts(m, " (deleted)");
-+ else if (v->flags & MOD_RUNNING) {
-+ if (v->flags & MOD_AUTOCLEAN)
-+ seq_puts(m, " (autoclean)");
-+ if (!(v->flags & MOD_USED_ONCE))
-+ seq_puts(m, " (unused)");
-+ }
-+ else if (v->flags & MOD_INITIALIZING)
-+ seq_puts(m, " (initializing)");
-+ else
-+ seq_puts(m, " (uninitialized)");
-+
-+ if ((ref = v->refs) != NULL) {
-+ seq_puts(m, " [");
-+ while (1) {
-+ seq_puts(m, ref->ref->name);
-+
-+ if ((ref = ref->next_ref) != NULL)
-+ seq_putc(m, ' ');
-+ else
-+ break;
-+ }
-+ seq_putc(m, ']');
-+ }
-+
-+ seq_putc(m, '\n');
-+
-+ return 0;
-+}
-+
-+struct seq_operations modules_op = {
-+ start: s_modules_start,
-+ next: s_modules_next,
-+ stop: s_modules_stop,
-+ show: s_modules_show
-+};
-+
- /*
- * Called by the /proc file system to return a current list of ksyms.
- */
-
############ NEEDS MANUAL REDIFF ##############
diff -urN kernel-source-2.4.26/mm/Makefile kernel-source-2.4.26-1/mm/Makefile
--- kernel-source-2.4.26/mm/Makefile 2002-08-03 10:39:46.000000000 +1000