]> git.pld-linux.org Git - packages/kernel.git/commitdiff
projects / packages / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b7f0b88)
- updated for 2.4.33.4
authorJakub Bogusz <qboosh@pld-linux.org>
Thu, 23 Nov 2006 09:22:59 +0000 (09:22 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    linux-2.4.20-EXPORT_SYMBOL.patch -> 1.25
    patch-cryptoloop-jari-2.4.22-rc2.0 -> 1.7

linux-2.4.20-EXPORT_SYMBOL.patch patch | blob | blame | history
patch-cryptoloop-jari-2.4.22-rc2.0 patch | blob | blame | history

diff --git a/linux-2.4.20-EXPORT_SYMBOL.patch b/linux-2.4.20-EXPORT_SYMBOL.patch
index 82af70a0a1fc52398200b6f23d2f38b76a7995a5..0953f97aec652e97332d5346f3b033998ecedc5e 100644 (file)
--- a/linux-2.4.20-EXPORT_SYMBOL.patch
+++ b/linux-2.4.20-EXPORT_SYMBOL.patch
@@ -30,15 +30,7 @@
 diff -urN linux-2.4.22.org/arch/sparc/kernel/sparc_ksyms.c linux-2.4.22/arch/sparc/kernel/sparc_ksyms.c
 --- linux-2.4.22.org/arch/sparc/kernel/sparc_ksyms.c   2003-11-21 20:40:44.000000000 +0100
 +++ linux-2.4.22/arch/sparc/kernel/sparc_ksyms.c       2003-11-21 20:41:45.000000000 +0100
-@@ -265,6 +265,7 @@
- EXPORT_SYMBOL(strpbrk);
- EXPORT_SYMBOL(strtok);
- EXPORT_SYMBOL(strstr);
-+EXPORT_SYMBOL(memchr);
- EXPORT_SYMBOL(page_kernel);
- 
- /* Special internal versions of library functions. */
-@@ -282,6 +283,7 @@
+@@ -283,6 +283,7 @@
  /* Moving data to/from userspace. */
  EXPORT_SYMBOL(__copy_user);
  EXPORT_SYMBOL(__strncpy_from_user);
@@ -65,15 +57,7 @@ diff -urN linux-2.4.22.org/arch/sparc/kernel/sparc_ksyms.c linux-2.4.22/arch/spa
  extern void *__memscan_zero(void *, size_t);
  extern void *__memscan_generic(void *, int, size_t);
  extern int __memcmp(const void *, const void *, __kernel_size_t);
-@@ -305,6 +306,7 @@
- EXPORT_SYMBOL(strpbrk);
- EXPORT_SYMBOL(strtok);
- EXPORT_SYMBOL(strstr);
-+EXPORT_SYMBOL(memchr);
- 
- #ifdef CONFIG_SOLARIS_EMUL_MODULE
- EXPORT_SYMBOL(linux_sparc_syscall);
-@@ -351,6 +353,8 @@
+@@ -352,6 +353,8 @@
  EXPORT_SYMBOL(phys_base);
  EXPORT_SYMBOL(sparc64_valid_addr_bitmap);
  
diff --git a/patch-cryptoloop-jari-2.4.22-rc2.0 b/patch-cryptoloop-jari-2.4.22-rc2.0
index 00913f600c54f8ac92df97366d16648cfe57391f..54d4a68ef17a220e5b3f336590092079a814bbaa 100644 (file)
--- a/patch-cryptoloop-jari-2.4.22-rc2.0
+++ b/patch-cryptoloop-jari-2.4.22-rc2.0
@@ -206,9 +206,8 @@ diff -ruN linux-2.4/drivers/block/cryptoloop.c linux-2.4-cl/drivers/block/crypto
 +
 +module_init(init_cryptoloop);
 +module_exit(cleanup_cryptoloop);
-diff -ruN linux-2.4/drivers/block/loop.c linux-2.4-cl/drivers/block/loop.c
---- linux-2.4/drivers/block/loop.c     2003-08-16 19:11:44.513638284 +0200
-+++ linux-2.4-cl/drivers/block/loop.c  2003-08-16 19:38:49.487870443 +0200
+--- linux-2.4.33.4/drivers/block/loop.c.orig   2006-11-23 09:50:27.259505000 +0100
++++ linux-2.4.33.4/drivers/block/loop.c        2006-11-23 09:59:35.719505000 +0100
 @@ -52,6 +52,18 @@
   *   problem above. Encryption modules that used to rely on the old scheme
   *   should just call ->i_mapping->bmap() to calculate the physical block
@@ -1255,10 +1254,10 @@ diff -ruN linux-2.4/drivers/block/loop.c linux-2.4-cl/drivers/block/loop.c
 +      loop_set_softblksz(lo, dev);
  
 -      lo->lo_bh = lo->lo_bhtail = NULL;
-       kernel_thread(loop_thread, lo, CLONE_FS | CLONE_FILES | CLONE_SIGHAND);
-       down(&lo->lo_sem);
- 
-@@ -751,11 +927,12 @@
+       error = kernel_thread(loop_thread, lo,
+           CLONE_FS | CLONE_FILES | CLONE_SIGHAND);
+       if (error < 0)
+@@ -762,11 +938,12 @@
        spin_lock_irq(&lo->lo_lock);
        lo->lo_state = Lo_rundown;
        if (atomic_dec_and_test(&lo->lo_pending))
@@ -1272,7 +1271,7 @@ diff -ruN linux-2.4/drivers/block/loop.c linux-2.4-cl/drivers/block/loop.c
        lo->lo_backing_file = NULL;
  
        loop_release_xfer(lo);
-@@ -770,14 +947,15 @@
+@@ -781,14 +958,15 @@
        memset(lo->lo_name, 0, LO_NAME_SIZE);
        loop_sizes[lo->lo_number] = 0;
        invalidate_bdev(bdev, 0);
@@ -1290,7 +1289,7 @@ diff -ruN linux-2.4/drivers/block/loop.c linux-2.4-cl/drivers/block/loop.c
  {
        struct loop_info info; 
        int err;
-@@ -817,6 +995,7 @@
+@@ -828,6 +1006,7 @@
                lo->lo_key_owner = current->uid; 
        }       
        figure_loop_size(lo);
@@ -1298,7 +1297,7 @@ diff -ruN linux-2.4/drivers/block/loop.c linux-2.4-cl/drivers/block/loop.c
        return 0;
  }
  
-@@ -872,7 +1051,7 @@
+@@ -883,7 +1062,7 @@
                err = loop_clr_fd(lo, inode->i_bdev);
                break;
        case LOOP_SET_STATUS:
@@ -1307,7 +1306,7 @@ diff -ruN linux-2.4/drivers/block/loop.c linux-2.4-cl/drivers/block/loop.c
                break;
        case LOOP_GET_STATUS:
                err = loop_get_status(lo, (struct loop_info *) arg);
-@@ -905,7 +1084,7 @@
+@@ -917,7 +1096,7 @@
  static int lo_open(struct inode *inode, struct file *file)
  {
        struct loop_device *lo;
@@ -1316,7 +1315,7 @@ diff -ruN linux-2.4/drivers/block/loop.c linux-2.4-cl/drivers/block/loop.c
  
        if (!inode)
                return -EINVAL;
-@@ -920,10 +1099,6 @@
+@@ -932,10 +1111,6 @@
        lo = &loop_dev[dev];
        MOD_INC_USE_COUNT;
        down(&lo->lo_ctl_mutex);
@@ -1327,7 +1326,7 @@ diff -ruN linux-2.4/drivers/block/loop.c linux-2.4-cl/drivers/block/loop.c
        lo->lo_refcnt++;
        up(&lo->lo_ctl_mutex);
        return 0;
-@@ -932,7 +1107,7 @@
+@@ -944,7 +1119,7 @@
  static int lo_release(struct inode *inode, struct file *file)
  {
        struct loop_device *lo;
@@ -1336,7 +1335,7 @@ diff -ruN linux-2.4/drivers/block/loop.c linux-2.4-cl/drivers/block/loop.c
  
        if (!inode)
                return 0;
-@@ -947,11 +1122,7 @@
+@@ -959,11 +1134,7 @@
  
        lo = &loop_dev[dev];
        down(&lo->lo_ctl_mutex);
@@ -1348,7 +1347,7 @@ diff -ruN linux-2.4/drivers/block/loop.c linux-2.4-cl/drivers/block/loop.c
        up(&lo->lo_ctl_mutex);
        MOD_DEC_USE_COUNT;
        return 0;
-@@ -1016,10 +1187,9 @@
+@@ -1028,10 +1199,9 @@
                return -EIO;
        }
  
@@ -1360,7 +1359,7 @@ diff -ruN linux-2.4/drivers/block/loop.c linux-2.4-cl/drivers/block/loop.c
  
        loop_sizes = kmalloc(max_loop * sizeof(int), GFP_KERNEL);
        if (!loop_sizes)
-@@ -1029,6 +1199,10 @@
+@@ -1041,6 +1211,10 @@
        if (!loop_blksizes)
                goto out_blksizes;
  
@@ -1371,7 +1370,7 @@ diff -ruN linux-2.4/drivers/block/loop.c linux-2.4-cl/drivers/block/loop.c
        blk_queue_make_request(BLK_DEFAULT_QUEUE(MAJOR_NR), loop_make_request);
  
        for (i = 0; i < max_loop; i++) {
-@@ -1036,18 +1210,28 @@
+@@ -1048,18 +1222,28 @@
                memset(lo, 0, sizeof(struct loop_device));
                init_MUTEX(&lo->lo_ctl_mutex);
                init_MUTEX_LOCKED(&lo->lo_sem);
@@ -1401,7 +1400,7 @@ diff -ruN linux-2.4/drivers/block/loop.c linux-2.4-cl/drivers/block/loop.c
        devfs_handle = devfs_mk_dir(NULL, "loop", NULL);
        devfs_register_series(devfs_handle, "%u", max_loop, DEVFS_FL_DEFAULT,
                              MAJOR_NR, 0,
-@@ -1057,10 +1241,13 @@
+@@ -1069,10 +1253,13 @@
        printk(KERN_INFO "loop: loaded (max %d devices)\n", max_loop);
        return 0;
  
@@ -1415,7 +1414,7 @@ diff -ruN linux-2.4/drivers/block/loop.c linux-2.4-cl/drivers/block/loop.c
        if (devfs_unregister_blkdev(MAJOR_NR, "loop"))
                printk(KERN_WARNING "loop: cannot unregister blkdev\n");
        printk(KERN_ERR "loop: ran out of memory\n");
-@@ -1072,9 +1259,14 @@
+@@ -1084,9 +1271,14 @@
        devfs_unregister(devfs_handle);
        if (devfs_unregister_blkdev(MAJOR_NR, "loop"))
                printk(KERN_WARNING "loop: cannot unregister blkdev\n");
The Linux kernel (the core of the Linux operating system)
This page took 1.957415 seconds and 4 git commands to generate.