From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun, 26 Mar 2006 17:41:18 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
X-Git-Tag: v2.6.17-rc1~480
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=9ae21d1bb376436285cd5346d3e4b3655d6dd1b9;p=karo-tx-linux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
  drivers/char/ftape/lowlevel/fdc-io.c: Correct a comment
  Kconfig help: MTD_JEDECPROBE already supports Intel
  Remove ugly debugging stuff
  do_mounts.c: Minor ROOT_DEV comment cleanup
  BUG_ON() Conversion in drivers/s390/block/dasd_devmap.c
  BUG_ON() Conversion in mm/mempool.c
  BUG_ON() Conversion in mm/memory.c
  BUG_ON() Conversion in kernel/fork.c
  BUG_ON() Conversion in ipc/sem.c
  BUG_ON() Conversion in fs/ext2/
  BUG_ON() Conversion in fs/hfs/
  BUG_ON() Conversion in fs/dcache.c
  BUG_ON() Conversion in fs/buffer.c
  BUG_ON() Conversion in input/serio/hp_sdc_mlc.c
  BUG_ON() Conversion in md/dm-table.c
  BUG_ON() Conversion in md/dm-path-selector.c
  BUG_ON() Conversion in drivers/isdn
  BUG_ON() Conversion in drivers/char
  BUG_ON() Conversion in drivers/mtd/
---

9ae21d1bb376436285cd5346d3e4b3655d6dd1b9
diff --cc fs/dcache.c
index aaca5e7970bc,0778f49f993b..19458d399502
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@@ -34,9 -34,8 +34,8 @@@
  #include <linux/swap.h>
  #include <linux/bootmem.h>
  
- /* #define DCACHE_DEBUG 1 */
  
 -int sysctl_vfs_cache_pressure = 100;
 +int sysctl_vfs_cache_pressure __read_mostly = 100;
  EXPORT_SYMBOL_GPL(sysctl_vfs_cache_pressure);
  
   __cacheline_aligned_in_smp DEFINE_SPINLOCK(dcache_lock);