2.6.0-test1-lkml.patch

   1 diff -puN include/linux/namespace.h~vfsmount_lock-fix include/linux/namespace.h
   2 --- linux-2.6.0-test1/include/linux/namespace.h~vfsmount_lock-fix       2003-07-14 12:24:33.000000000 +0530
   3 +++ linux-2.6.0-test1-maneesh/include/linux/namespace.h 2003-07-14 12:24:33.000000000 +0530
   4 @@ -2,7 +2,7 @@
   5  #define _NAMESPACE_H_
   6  #ifdef __KERNEL__
   7
   8 -#include <linux/dcache.h>
   9 +#include <linux/mount.h>
  10  #include <linux/sched.h>
  11
  12  struct namespace {
  13 @@ -19,9 +19,9 @@ static inline void put_namespace(struct
  14  {
  15         if (atomic_dec_and_test(&namespace->count)) {
  16                 down_write(&namespace->sem);
  17 -               spin_lock(&dcache_lock);
  18 +               spin_lock(&vfsmount_lock);
  19                 umount_tree(namespace->root);
  20 -               spin_unlock(&dcache_lock);
  21 +               spin_unlock(&vfsmount_lock);
  22                 up_write(&namespace->sem);
  23                 kfree(namespace);
  24         }
  25
  26 --- linux-2.5-ppc/arch/ppc/kernel/time.c~       2003-07-14 13:15:17.000000000 +0200
  27 +++ linux-2.5-ppc/arch/ppc/kernel/time.c        2003-07-14 13:18:02.000000000 +0200
  28 @@ -244,7 +244,7 @@
  29         time_t wtm_sec, new_sec = tv->tv_sec;
  30         long wtm_nsec, new_nsec = tv->tv_nsec;
  31         unsigned long flags;
  32 -       int tb_delta, new_nsec, new_sec;
  33 +       int tb_delta;
  34
  35         if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
  36                 return -EINVAL;
  37
  38 --- linux-2.6.0/drivers/block/Kconfig.old       2003-07-14 18:41:20.000000000 +1000
  39 +++ linux-2.6.0/drivers/block/Kconfig   2003-07-14 18:41:48.000000000 +1000
  40 @@ -264,6 +264,7 @@
  41
  42  config BLK_DEV_CRYPTOLOOP
  43         tristate "Cryptoloop Support"
  44 +       select CRYPTO
  45         depends on BLK_DEV_LOOP
  46         ---help---
  47           Say Y here if you want to be able to use the ciphers that are
  48 --- linux-2.6.0-test1/Documentation/pnp.txt.jh  2003-07-14 18:23:36.000000000 +0200
  49 +++ linux-2.6.0-test1/Documentation/pnp.txt     2003-07-14 18:24:09.000000000 +0200
  50 @@ -22,7 +22,7 @@
  51  In addition to the standard driverfs file the following are created in each
  52  device's directory:
  53  id - displays a list of support EISA IDs
  54 -possible - displays possible resource configurations
  55 +options - displays possible resource configurations
  56  resources - displays currently allocated resources and allows resource changes
  57
  58  -activating a device
  59 @@ -60,7 +60,7 @@
  60  - Notice the string "DISABLED".  THis means the device is not active.
  61
  62  3.) check the device's possible configurations (optional)
  63 -# cat possible
  64 +# cat options
  65  Dependent: 01 - Priority acceptable
  66      port 0x3f0-0x3f0, align 0x7, size 0x6, 16-bit address decoding
  67      port 0x3f7-0x3f7, align 0x0, size 0x1, 16-bit address decoding
  68 --- 2.5/mm/slab.c       2003-07-10 23:27:00.000000000 +0200
  69 +++ build-2.5/mm/slab.c 2003-07-14 19:36:26.000000000 +0200
  70 @@ -1628,7 +1628,13 @@
  71         kfree_debugcheck(objp);
  72         page = virt_to_page(objp);
  73
  74 -       BUG_ON(GET_PAGE_CACHE(page) != cachep);
  75 +       if (GET_PAGE_CACHE(page) != cachep) {
  76 +               printk(KERN_ERR "mismatch in kmem_cache_free: expected cache %p, got %p\n",
  77 +                               GET_PAGE_CACHE(page),cachep);
  78 +               printk(KERN_ERR "%p is %s.\n", cachep, cachep->name);
  79 +               printk(KERN_ERR "%p is %s.\n", GET_PAGE_CACHE(page), GET_PAGE_CACHE(page)->name);
  80 +               WARN_ON(1);
  81 +       }
  82         slabp = GET_PAGE_SLAB(page);
  83
  84         if (cachep->flags & SLAB_STORE_USER) {