1. 24 May, 2010 13 commits
  2. 22 May, 2010 24 commits
    • Venkateswararao Jujjuri's avatar
      9p: Optimize TCREATE by eliminating a redundant fid clone. · 6d27e64d
      Venkateswararao Jujjuri authored
      This patch removes a redundant fid clone on the directory fid and hence
      reduces a server transaction while creating new filesystem object.
      Signed-off-by: default avatarVenkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
      6d27e64d
    • Dan Carpenter's avatar
      9p: cleanup: remove unneeded assignment · fe5bd073
      Dan Carpenter authored
      We never use "v9ses" and so we can remove it.
      Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
      fe5bd073
    • Venkateswararao Jujjuri's avatar
      9p: Add mksock support · 75cc5c9b
      Venkateswararao Jujjuri authored
      Without this patch, an attempt to mksock will get an EINVAL.
      
      Before this patch:
      [root@localhost 1dir]# mksock mysock
      mksock: error making mysock: Invalid argument
      
      With this patch:
      [root@localhost 1dir]# mksock mysock
      [root@localhost 1dir]# ls    -l mysock
      s--------- 1 root root 0 2010-03-31 17:44 mysock
      Signed-off-by: default avatarVenkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
      75cc5c9b
    • Aneesh Kumar K.V's avatar
      fs/9p: Make sure we properly instantiate dentry. · 85e0df24
      Aneesh Kumar K.V authored
      For lookup if we get ENOENT error from the server we still
      instantiate the dentry. We need to make sure we have dentry
      operations set in that case so that a later dput on the dentry
      does the expected. Without the patch we get the below error
      
      #ln  -sf abc abclink
      ln: creating symbolic link `abclink': No such file or directory
      
      Now on the host do
      $ touch abclink
      
      Guest now gives ENOENT error.
      # ls
      ls: cannot access abclink: No such file or directory
      Debugged-by: default avatarGautham R Shenoy <ego@in.ibm.com>
      Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
      85e0df24
    • Pekka Enberg's avatar
      Merge branches 'slab/align', 'slab/cleanups', 'slab/fixes', 'slab/memhotadd'... · bb4f6b0c
      Pekka Enberg authored
      Merge branches 'slab/align', 'slab/cleanups', 'slab/fixes', 'slab/memhotadd' and 'slub/fixes' into slab-for-linus
      bb4f6b0c
    • Minchan Kim's avatar
      slub: Use alloc_pages_exact_node() for page allocation · 6b65aaf3
      Minchan Kim authored
      The alloc_slab_page() in SLUB uses alloc_pages() if node is '-1'.  This means
      that node validity check in alloc_pages_node is unnecessary and we can use
      alloc_pages_exact_node() to avoid comparison and branch as commit
      6484eb3e ("page allocator: do not check NUMA node ID when the caller
      knows the node is valid") did for the page allocator.
      
      Cc: Christoph Lameter <cl@linux-foundation.org>
      Reviewed-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
      Reviewed-by: default avatarMel Gorman <mel@csn.ul.ie>
      Signed-off-by: default avatarMinchan Kim <minchan.kim@gmail.com>
      Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
      6b65aaf3
    • Xiaotian Feng's avatar
      slub: __kmalloc_node_track_caller should trace kmalloc_large_node case · d3e14aa3
      Xiaotian Feng authored
      commit 94b528d0 (kmemtrace: SLUB hooks for caller-tracking functions)
      missed tracing kmalloc_large_node in __kmalloc_node_track_caller. We
      should trace it same as __kmalloc_node.
      Acked-by: default avatarDavid Rientjes <rientjes@google.com>
      Cc: Matt Mackall <mpm@selenic.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Vegard Nossum <vegard.nossum@gmail.com>
      Signed-off-by: default avatarXiaotian Feng <dfeng@redhat.com>
      Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
      d3e14aa3
    • Eric Dumazet's avatar
      slub: Potential stack overflow · bbd7d57b
      Eric Dumazet authored
      I discovered that we can overflow stack if CONFIG_SLUB_DEBUG=y and use slabs
      with many objects, since list_slab_objects() and process_slab() use
      DECLARE_BITMAP(map, page->objects).
      
      With 65535 bits, we use 8192 bytes of stack ...
      
      Switch these allocations to dynamic allocations.
      Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: default avatarChristoph Lameter <cl@linux-foundation.org>
      Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
      bbd7d57b
    • Grant Likely's avatar
      Merge remote branch 'origin' into secretlab/next-devicetree · cf9b59e9
      Grant Likely authored
      Merging in current state of Linus' tree to deal with merge conflicts and
      build failures in vio.c after merge.
      
      Conflicts:
      	drivers/i2c/busses/i2c-cpm.c
      	drivers/i2c/busses/i2c-mpc.c
      	drivers/net/gianfar.c
      
      Also fixed up one line in arch/powerpc/kernel/vio.c to use the
      correct node pointer.
      Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      cf9b59e9
    • Grant Likely's avatar
      of: change of_match_device to work with struct device · 44504b2b
      Grant Likely authored
      The of_node pointer is now stored directly in struct device, so
      of_match_device() should work with any device, not just struct of_device.
      
      This patch changes the interface to of_match_device() to accept a
      struct device instead of struct of_device.
      Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      44504b2b
    • Grant Likely's avatar
      of: Remove duplicate fields from of_platform_driver · 4018294b
      Grant Likely authored
      .name, .match_table and .owner are duplicated in both of_platform_driver
      and device_driver.  This patch is a removes the extra copies from struct
      of_platform_driver and converts all users to the device_driver members.
      
      This patch is a pretty mechanical change.  The usage model doesn't change
      and if any drivers have been missed, or if anything has been fixed up
      incorrectly, then it will fail with a compile time error, and the fixup
      will be trivial.  This patch looks big and scary because it touches so
      many files, but it should be pretty safe.
      Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      Acked-by: default avatarSean MacLennan <smaclennan@pikatech.com>
      4018294b
    • Grant Likely's avatar
      drivercore: Add of_match_table to the common device drivers · 597b9d1e
      Grant Likely authored
      OF-style matching can be available to any device, on any type of bus.
      This patch allows any driver to provide an OF match table when CONFIG_OF
      is enabled so that drivers can be bound against devices described in
      the device tree.
      Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      597b9d1e
    • Grant Likely's avatar
      arch/microblaze: Move dma_mask from of_device into pdev_archdata · 173b3a7a
      Grant Likely authored
      By moving dma_mask into pdev_archdata, and adding archdata to
      struct of_device, it makes it possible to substitute of_device
      with struct platform_device, which is a stepping stone to
      removing the of_platform bus entirely.
      Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      173b3a7a
    • Grant Likely's avatar
      arch/powerpc: Move dma_mask from of_device into pdev_archdata · cb6dc512
      Grant Likely authored
      By moving dma_mask into pdev_archdata, and adding archdata to
      struct of_device, it makes it possible to substitute of_device
      with struct platform_device, which is a stepping stone to
      removing the of_platform bus entirely.
      Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      cb6dc512
    • Randy Dunlap's avatar
      fbmem: avoid printk format warning with 32-bit resources · f4b87dee
      Randy Dunlap authored
      Fix printk formats:
      
        drivers/video/fbmem.c: In function 'fb_do_apertures_overlap':
        drivers/video/fbmem.c:1494: warning: format '%llx' expects type 'long long unsigned int', but argument 2 has type 'resource_size_t'
        drivers/video/fbmem.c:1494: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'resource_size_t'
        drivers/video/fbmem.c:1494: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'resource_size_t'
        drivers/video/fbmem.c:1494: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'resource_size_t'
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      f4b87dee
    • Roland McGrath's avatar
      linux/elfcore.h: hide kernel functions · 2faa4cf7
      Roland McGrath authored
      The declarations for elf_core_extra_phdrs() et al got added on the
      wrong side of #ifdef __KERNEL__ in linux/elfcore.h so they leak into
      the user header copy and we get a warning at build time about it.
      Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2faa4cf7
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 · e8bebe2f
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (69 commits)
        fix handling of offsets in cris eeprom.c, get rid of fake on-stack files
        get rid of home-grown mutex in cris eeprom.c
        switch ecryptfs_write() to struct inode *, kill on-stack fake files
        switch ecryptfs_get_locked_page() to struct inode *
        simplify access to ecryptfs inodes in ->readpage() and friends
        AFS: Don't put struct file on the stack
        Ban ecryptfs over ecryptfs
        logfs: replace inode uid,gid,mode initialization with helper function
        ufs: replace inode uid,gid,mode initialization with helper function
        udf: replace inode uid,gid,mode init with helper
        ubifs: replace inode uid,gid,mode initialization with helper function
        sysv: replace inode uid,gid,mode initialization with helper function
        reiserfs: replace inode uid,gid,mode initialization with helper function
        ramfs: replace inode uid,gid,mode initialization with helper function
        omfs: replace inode uid,gid,mode initialization with helper function
        bfs: replace inode uid,gid,mode initialization with helper function
        ocfs2: replace inode uid,gid,mode initialization with helper function
        nilfs2: replace inode uid,gid,mode initialization with helper function
        minix: replace inode uid,gid,mode init with helper
        ext4: replace inode uid,gid,mode init with helper
        ...
      
      Trivial conflict in fs/fs-writeback.c (mark bitfields unsigned)
      e8bebe2f
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 · 6109e2ce
      Linus Torvalds authored
      * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (36 commits)
        PCI: hotplug: pciehp: Removed check for hotplug of display devices
        PCI: read memory ranges out of Broadcom CNB20LE host bridge
        PCI: Allow manual resource allocation for PCI hotplug bridges
        x86/PCI: make ACPI MCFG reserved error messages ACPI specific
        PCI hotplug: Use kmemdup
        PM/PCI: Update PCI power management documentation
        PCI: output FW warning in pci_read/write_vpd
        PCI: fix typos pci_device_dis/enable to pci_dis/enable_device in comments
        PCI quirks: disable msi on AMD rs4xx internal gfx bridges
        PCI: Disable MSI for MCP55 on P5N32-E SLI
        x86/PCI: irq and pci_ids patch for additional Intel Cougar Point DeviceIDs
        PCI: aerdrv: trivial cleanup for aerdrv_core.c
        PCI: aerdrv: trivial cleanup for aerdrv.c
        PCI: aerdrv: introduce default_downstream_reset_link
        PCI: aerdrv: rework find_aer_service
        PCI: aerdrv: remove is_downstream
        PCI: aerdrv: remove magical ROOT_ERR_STATUS_MASKS
        PCI: aerdrv: redefine PCI_ERR_ROOT_*_SRC
        PCI: aerdrv: rework do_recovery
        PCI: aerdrv: rework get_e_source()
        ...
      6109e2ce
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/iommu-2.6 · 0961d658
      Linus Torvalds authored
      * git://git.infradead.org/iommu-2.6:
        intel-iommu: Set a more specific taint flag for invalid BIOS DMAR tables
        intel-iommu: Combine the BIOS DMAR table warning messages
        panic: Add taint flag TAINT_FIRMWARE_WORKAROUND ('I')
        panic: Allow warnings to set different taint flags
        intel-iommu: intel_iommu_map_range failed at very end of address space
        intel-iommu: errors with smaller iommu widths
        intel-iommu: Fix boot inside 64bit virtualbox with io-apic disabled
        intel-iommu: use physfn to search drhd for VF
        intel-iommu: Print out iommu seq_id
        intel-iommu: Don't complain that ACPI_DMAR_SCOPE_TYPE_IOAPIC is not supported
        intel-iommu: Avoid global flushes with caching mode.
        intel-iommu: Use correct domain ID when caching mode is enabled
        intel-iommu mistakenly uses offset_pfn when caching mode is enabled
        intel-iommu: use for_each_set_bit()
        intel-iommu: Fix section mismatch dmar_ir_support() uses dmar_tbl.
      0961d658
    • Linus Torvalds's avatar
      Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus · 1756ac3d
      Linus Torvalds authored
      * 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: (27 commits)
        drivers/char: Eliminate use after free
        virtio: console: Accept console size along with resize control message
        virtio: console: Store each console's size in the console structure
        virtio: console: Resize console port 0 on config intr only if multiport is off
        virtio: console: Add support for nonblocking write()s
        virtio: console: Rename wait_is_over() to will_read_block()
        virtio: console: Don't always create a port 0 if using multiport
        virtio: console: Use a control message to add ports
        virtio: console: Move code around for future patches
        virtio: console: Remove config work handler
        virtio: console: Don't call hvc_remove() on unplugging console ports
        virtio: console: Return -EPIPE to hvc_console if we lost the connection
        virtio: console: Let host know of port or device add failures
        virtio: console: Add a __send_control_msg() that can send messages without a valid port
        virtio: Revert "virtio: disable multiport console support."
        virtio: add_buf_gfp
        trans_virtio: use virtqueue_xxx wrappers
        virtio-rng: use virtqueue_xxx wrappers
        virtio_ring: remove a level of indirection
        virtio_net: use virtqueue_xxx wrappers
        ...
      
      Fix up conflicts in drivers/net/virtio_net.c due to new virtqueue_xxx
      wrappers changes conflicting with some other cleanups.
      1756ac3d
    • Linus Torvalds's avatar
      Merge branch 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 98edb6ca
      Linus Torvalds authored
      * 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (269 commits)
        KVM: x86: Add missing locking to arch specific vcpu ioctls
        KVM: PPC: Add missing vcpu_load()/vcpu_put() in vcpu ioctls
        KVM: MMU: Segregate shadow pages with different cr0.wp
        KVM: x86: Check LMA bit before set_efer
        KVM: Don't allow lmsw to clear cr0.pe
        KVM: Add cpuid.txt file
        KVM: x86: Tell the guest we'll warn it about tsc stability
        x86, paravirt: don't compute pvclock adjustments if we trust the tsc
        x86: KVM guest: Try using new kvm clock msrs
        KVM: x86: export paravirtual cpuid flags in KVM_GET_SUPPORTED_CPUID
        KVM: x86: add new KVMCLOCK cpuid feature
        KVM: x86: change msr numbers for kvmclock
        x86, paravirt: Add a global synchronization point for pvclock
        x86, paravirt: Enable pvclock flags in vcpu_time_info structure
        KVM: x86: Inject #GP with the right rip on efer writes
        KVM: SVM: Don't allow nested guest to VMMCALL into host
        KVM: x86: Fix exception reinjection forced to true
        KVM: Fix wallclock version writing race
        KVM: MMU: Don't read pdptrs with mmu spinlock held in mmu_alloc_roots
        KVM: VMX: enable VMXON check with SMX enabled (Intel TXT)
        ...
      98edb6ca
    • Linus Torvalds's avatar
      Merge branch 'modules' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus · a8251096
      Linus Torvalds authored
      * 'modules' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
        module: drop the lock while waiting for module to complete initialization.
        MODULE_DEVICE_TABLE(isapnp, ...) does nothing
        hisax_fcpcipnp: fix broken isapnp device table.
        isapnp: move definitions to mod_devicetable.h so file2alias can reach them.
      a8251096
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of... · 27a3353a
      Linus Torvalds authored
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (32 commits)
        Move N014, N051 and CR620 dmi information to load scm dmi table
        drivers/platform/x86/eeepc-wmi.c: fix build warning
        X86 platfrom wmi: Add debug facility to dump WMI data in a readable way
        X86 platform wmi: Also log GUID string when an event happens and debug is set
        X86 platform wmi: Introduce debug param to log all WMI events
        Clean up all objects used by scm model when driver initial fail or exit
        msi-laptop: fix up some coding style issues found by checkpatch
        msi-laptop: Add i8042 filter to sync sw state with BIOS when function key pressed
        msi-laptop: Set rfkill init state when msi-laptop intiial
        msi-laptop: Add MSI CR620 notebook dmi information to scm models table
        msi-laptop: Add N014 N051 dmi information to scm models table
        drivers/platform/x86: Use kmemdup
        drivers/platform/x86: Use kzalloc
        drivers/platform/x86: Clarify the MRST IPC driver description slightly
        eeepc-wmi: depends on BACKLIGHT_CLASS_DEVICE
        IPC driver for Intel Mobile Internet Device (MID) platforms
        classmate-laptop: Add RFKILL support.
        thinkpad-acpi: document backlight level writeback at driver init
        thinkpad-acpi: clean up ACPI handles handling
        thinkpad-acpi: don't depend on led_path for led firmware type (v2)
        ...
      27a3353a
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx · 6f68fbaa
      Linus Torvalds authored
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
        DMAENGINE: extend the control command to include an arg
        async_tx: trim dma_async_tx_descriptor in 'no channel switch' case
        DMAENGINE: DMA40 fix for allocation of logical channel 0
        DMAENGINE: DMA40 support paused channel status
        dmaengine: mpc512x: Use resource_size
        DMA ENGINE: Do not reset 'private' of channel
        ioat: Remove duplicated devm_kzalloc() calls for ioatdma_device
        ioat3: disable cacheline-unaligned transfers for raid operations
        ioat2,3: convert to producer/consumer locking
        ioat: convert to circ_buf
        DMAENGINE: Support for ST-Ericssons DMA40 block v3
        async_tx: use of kzalloc/kfree requires the include of slab.h
        dmaengine: provide helper for setting txstate
        DMAENGINE: generic channel status v2
        DMAENGINE: generic slave control v2
        dma: timb-dma: Update comment and fix compiler warning
        dma: Add timb-dma
        DMAENGINE: COH 901 318 fix bytesleft
        DMAENGINE: COH 901 318 rename confusing vars
      6f68fbaa
  3. 21 May, 2010 3 commits
    • Sage Weil's avatar
      ceph: reuse mon subscribe message instead of allocated anew · 240ed68e
      Sage Weil authored
      Use the same message, allocated during startup.  No need to reallocate a
      new one each time around (and potentially ENOMEM).
      Signed-off-by: default avatarSage Weil <sage@newdream.net>
      240ed68e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://neil.brown.name/md · 6e451397
      Linus Torvalds authored
      * 'for-linus' of git://neil.brown.name/md: (45 commits)
        md: don't insist on valid event count for spare devices.
        md: simplify updating of event count to sometimes avoid updating spares.
        md/raid6: Fix raid-6 read-error correction in degraded state
        md: restore ability of spare drives to spin down.
        md: Fix read balancing in RAID1 and RAID10 on drives > 2TB
        md/linear: standardise all printk messages
        md/raid0: tidy up printk messages.
        md/raid10: tidy up printk messages.
        md/raid1: improve printk messages
        md/raid5: improve consistency of error messages.
        md: remove EXPERIMENTAL designation from RAID10
        md: allow integers to be passed to md/level
        md: notify mdstat waiters of level change
        md/raid4: permit raid0 takeover
        md/raid1: delay reads that could overtake behind-writes.
        md/raid1: fix confusing 'redirect sector' message.
        md: don't unregister the thread in mddev_suspend
        md: factor out init code for an mddev
        md: pass mddev to make_request functions rather than request_queue
        md: call md_stop_writes from md_stop
        ...
      6e451397
    • NeilBrown's avatar
      Merge commit '3ff195b0' into for-linus · 19fdb9ee
      NeilBrown authored
      Conflicts:
      	drivers/md/md.c
      
      - Resolved conflict in md_update_sb
      - Added extra 'NULL' arg to new instance of sysfs_get_dirent.
      Signed-off-by: default avatarNeilBrown <neilb@suse.de>
      19fdb9ee