1. 23 Jun, 2006 31 commits
  2. 22 Jun, 2006 9 commits
    • Francois Romieu's avatar
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 · d588fcbe
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6: (44 commits)
        [PATCH] I2C: I2C controllers go into right place on sysfs
        [PATCH] hwmon-vid: Add support for Intel Core and Conroe
        [PATCH] lm70: New hardware monitoring driver
        [PATCH] hwmon: Fix the Kconfig header
        [PATCH] i2c-i801: Merge setup function
        [PATCH] i2c-i801: Better pci subsystem integration
        [PATCH] i2c-i801: Cleanups
        [PATCH] i2c-i801: Remove PCI function check
        [PATCH] i2c-i801: Remove force_addr parameter
        [PATCH] i2c-i801: Fix block transaction poll loops
        [PATCH] scx200_acb: Documentation update
        [PATCH] scx200_acb: Mark scx200_acb_probe __init
        [PATCH] scx200_acb: Use PCI I/O resource when appropriate
        [PATCH] i2c: Mark block write buffers as const
        [PATCH] i2c-ocores: Minor cleanups
        [PATCH] abituguru: Fix fan detection
        [PATCH] abituguru: Review fixes
        [PATCH] abituguru: New hardware monitoring driver
        [PATCH] w83792d: Add missing data access locks
        [PATCH] w83792d: Fix setting the PWM value
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6 · eaa85689
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6:
        [PATCH] w1: warning fix
        [PATCH] w1: clean up W1_CON dependency.
        [PATCH] drivers/w1/w1.c: fix a compile error
        [PATCH] W1: fix dependencies of W1_SLAVE_DS2433_CRC
        [PATCH] W1: possible cleanups
        [PATCH] W1: cleanups
        [PATCH] w1 exports
        [PATCH] w1: Use mutexes instead of semaphores.
        [PATCH] w1: Make w1 connector notifications depend on connector.
        [PATCH] w1: netlink: Mark netlink group 1 as unused.
        [PATCH] w1: Move w1-connector definitions into linux/include/connector.h
        [PATCH] w1: Userspace communication protocol over connector.
        [PATCH] w1: Replace dscore and ds_w1_bridge with ds2490 driver.
        [PATCH] w1: Added default generic read/write operations.
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 · 6c763eb9
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (27 commits)
        [PATCH] PCI: nVidia quirk to make AER PCI-E extended capability visible
        [PATCH] PCI: fix issues with extended conf space when MMCONFIG disabled because of e820
        [PATCH] PCI: Bus Parity Status sysfs interface
        [PATCH] PCI: fix memory leak in MMCONFIG error path
        [PATCH] PCI: fix error with pci_get_device() call in the mpc85xx driver
        [PATCH] PCI: MSI-K8T-Neo2-Fir: run only where needed
        [PATCH] PCI: fix race with pci_walk_bus and pci_destroy_dev
        [PATCH] PCI: clean up pci documentation to be more specific
        [PATCH] PCI: remove unneeded msi code
        [PATCH] PCI: don't move ioapics below PCI bridge
        [PATCH] PCI: cleanup unused variable about msi driver
        [PATCH] PCI: disable msi mode in pci_disable_device
        [PATCH] PCI: Allow MSI to work on kexec kernel
        [PATCH] PCI: AMD 8131 MSI quirk called too late, bus_flags not inherited ?
        [PATCH] PCI: Move various PCI IDs to header file
        [PATCH] PCI Bus Parity Status-broken hardware attribute, EDAC foundation
        [PATCH] PCI: i386/x86_84: disable PCI resource decode on device disable
        [PATCH] PCI ACPI: Rename the functions to avoid multiple instances.
        [PATCH] PCI: don't enable device if already enabled
        [PATCH] PCI: Add a "enable" sysfs attribute to the pci devices to allow userspace (Xorg) to enable devices without doing foul direct access
    • Roman Zippel's avatar
      [PATCH] x86_64: use select for GART_IOMMU to enable AGP · dcc1a66a
      Roman Zippel authored
      The AGP default doesn't work well with other selects, so use a select for
      GART_IOMMU as well.  Remove a redundant default for SWIOTLB as well.
      Signed-off-by: default avatarRoman Zippel <zippel@linux-m68k.org>
      Signed-off-by: default avatarAndi Kleen <ak@suse.de>
      Cc: Andi Kleen <ak@muc.de>
      Cc: Dave Jones <davej@codemonkey.org.uk>
      Cc: Dave Airlie <airlied@linux.ie>
      Cc: Jeff Garzik <jeff@garzik.org>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
    • Richard Purdie's avatar
      [PATCH] zlib_inflate: Upgrade library code to a recent version · 4f3865fb
      Richard Purdie authored
      Upgrade the zlib_inflate implementation in the kernel from a patched
      version 1.1.3/4 to a patched 1.2.3.
      The code in the kernel is about seven years old and I noticed that the
      external zlib library's inflate performance was significantly faster (~50%)
      than the code in the kernel on ARM (and faster again on x86_32).
      For comparison the newer deflate code is 20% slower on ARM and 50% slower
      on x86_32 but gives an approx 1% compression ratio improvement.  I don't
      consider this to be an improvement for kernel use so have no plans to
      change the zlib_deflate code.
      Various changes have been made to the zlib code in the kernel, the most
      significant being the extra functions/flush option used by ppp_deflate.
      This update reimplements the features PPP needs to ensure it continues to
      This code has been tested on ARM under both JFFS2 (with zlib compression
      enabled) and ppp_deflate and on x86_32.  JFFS2 sees an approx.  10% real
      world file read speed improvement.
      This patch also removes ZLIB_VERSION as it no longer has a correct value.
      We don't need version checks anyway as the kernel's module handling will
      take care of that for us.  This removal is also more in keeping with the
      zlib author's wishes (http://www.zlib.net/zlib_faq.html#faq24
      ) and I've
      added something to the zlib.h header to note its a modified version.
      Signed-off-by: default avatarRichard Purdie <rpurdie@rpsys.net>
      Acked-by: default avatarJoern Engel <joern@wh.fh-wedel.de>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
    • Bjorn Helgaas's avatar
      [PATCH] vgacon: make VGA_MAP_MEM take size, remove extra use · 4f1bcaf0
      Bjorn Helgaas authored
      VGA_MAP_MEM translates to ioremap() on some architectures.  It makes sense
      to do this to vga_vram_base, because we're going to access memory between
      vga_vram_base and vga_vram_end.
      But it doesn't really make sense to map starting at vga_vram_end, because
      we aren't going to access memory starting there.  On ia64, which always has
      to be different, ioremapping vga_vram_end gives you something completely
      incompatible with ioremapped vga_vram_start, so vga_vram_size ends up being
      As a bonus, we often know the size up front, so we can use ioremap()
      correctly, rather than giving it a zero size.
      Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
      Cc: "Antonino A. Daplas" <adaplas@pol.net>
      Cc: "Luck, Tony" <tony.luck@intel.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
    • Andrew Morton's avatar
      [PATCH] prune_one_dentry() tweaks · d702ccb3
      Andrew Morton authored
      - Add description of d_lock handling to comments over prune_one_dentry().
      - It has three callsites - uninline it, saving 200 bytes of text.
      Cc: Jan Blunck <jblunck@suse.de>
      Cc: Kirill Korotaev <dev@openvz.org>
      Cc: Olaf Hering <olh@suse.de>
      Cc: Balbir Singh <balbir@in.ibm.com>
      Cc: Neil Brown <neilb@suse.de>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
    • NeilBrown's avatar
      [PATCH] Fix dcache race during umount · 0feae5c4
      NeilBrown authored
      The race is that the shrink_dcache_memory shrinker could get called while a
      filesystem is being unmounted, and could try to prune a dentry belonging to
      that filesystem.
      If it does, then it will call in to iput on the inode while the dentry is
      no longer able to be found by the umounting process.  If iput takes a
      while, generic_shutdown_super could get all the way though
      shrink_dcache_parent and shrink_dcache_anon and invalidate_inodes without
      ever waiting on this particular inode.
      Eventually the superblock gets freed anyway and if the iput tried to touch
      it (which some filesystems certainly do), it will lose.  The promised
      "Self-destruct in 5 seconds" doesn't lead to a nice day.
      The race is closed by holding s_umount while calling prune_one_dentry on
      someone else's dentry.  As a down_read_trylock is used,
      shrink_dcache_memory will no longer try to prune the dentry of a filesystem
      that is being unmounted, and unmount will not be able to start until any
      such active prune_one_dentry completes.
      This requires that prune_dcache *knows* which filesystem (if any) it is
      doing the prune on behalf of so that it can be careful of other
      filesystems.  shrink_dcache_memory isn't called it on behalf of any
      filesystem, and so is careful of everything.
      shrink_dcache_anon is now passed a super_block rather than the s_anon list
      out of the superblock, so it can get the s_anon list itself, and can pass
      the superblock down to prune_dcache.
      If prune_dcache finds a dentry that it cannot free, it leaves it where it
      is (at the tail of the list) and exits, on the assumption that some other
      thread will be removing that dentry soon.  To try to make sure that some
      work gets done, a limited number of dnetries which are untouchable are
      skipped over while choosing the dentry to work on.
      I believe this race was first found by Kirill Korotaev.
      Cc: Jan Blunck <jblunck@suse.de>
      Acked-by: default avatarKirill Korotaev <dev@openvz.org>
      Cc: Olaf Hering <olh@suse.de>
      Acked-by: default avatarBalbir Singh <balbir@in.ibm.com>
      Signed-off-by: default avatarNeil Brown <neilb@suse.de>
      Signed-off-by: default avatarBalbir Singh <balbir@in.ibm.com>
      Acked-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>