1. 27 6月, 2011 12 次提交
  2. 23 6月, 2011 14 次提交
  3. 20 6月, 2011 4 次提交
  4. 17 6月, 2011 2 次提交
  5. 09 6月, 2011 8 次提交
    • L
      Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 · 06e86849
      Linus Torvalds 提交于
      * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
        PM / Runtime: Fix loops in pm_runtime_clk_notify()
        PM / Intel IOMMU: Fix init_iommu_pm_ops() for CONFIG_PM unset
      06e86849
    • L
      vfs: reorganize 'struct inode' layout a bit · 13e12d14
      Linus Torvalds 提交于
      This tries to make the 'struct inode' accesses denser in the data cache
      by moving a commonly accessed field (i_security) closer to other fields
      that are accessed often.
      
      It also makes 'i_state' just an 'unsigned int' rather than 'unsigned
      long', since we only use a few bits of that field, and moves it next to
      the existing 'i_flags' so that we potentially get better structure
      layout (although depending on config options, i_flags may already have
      packed in the same word as i_lock, so this improves packing only for the
      case of spinlock debugging)
      
      Out 'struct inode' is still way too big, and we should probably move
      some other fields around too (the acl fields in particular) for better
      data cache access density.  Other fields (like the inode hash) are
      likely to be entirely irrelevant under most loads.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      13e12d14
    • L
      selinux: simplify and clean up inode_has_perm() · 95f4efb2
      Linus Torvalds 提交于
      This is a rather hot function that is called with a potentially NULL
      "struct common_audit_data" pointer argument.  And in that case it has to
      provide and initialize its own dummy common_audit_data structure.
      
      However, all the _common_ cases already pass it a real audit-data
      structure, so that uncommon NULL case not only creates a silly run-time
      test, more importantly it causes that function to have a big stack frame
      for the dummy variable that isn't even used in the common case!
      
      So get rid of that stupid run-time behavior, and make the (few)
      functions that currently call with a NULL pointer just call a new helper
      function instead (naturally called inode_has_perm_noapd(), since it has
      no adp argument).
      
      This makes the run-time test be a static code generation issue instead,
      and allows for a much denser stack since none of the common callers need
      the dummy structure.  And a denser stack not only means less stack space
      usage, it means better cache behavior.  So we have a win-win-win from
      this simplification: less code executed, smaller stack footprint, and
      better cache behavior.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      95f4efb2
    • L
      Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 4c1f683a
      Linus Torvalds 提交于
      * 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (28 commits)
        MAINTAINERS: add a maintainer to Gadget Framework
        USB: serial: add another 4N-GALAXY.DE PID to ftdi_sio driver
        Revert "USB: option: add ID for ZTE MF 330"
        drivers/usb/host/ohci-pxa27x.c: add missing clk_put
        USB: CONFIG_USB_GADGET_DUALSPEED is not user-configurable
        USB: dummy-hcd needs the has_tt flag
        usb-storage: redo incorrect reads
        usb/renesas_usbhs: free uep on removal
        usb/s3c-hsudc: fix error path
        usb/pxa25x_udc: cleanup the LUBBOCK err path
        usb/mv_udc_core: fix compile
        usb: gadget: include <linux/prefetch.h> to fix compiling error
        USB: s3c-hsotg: Tone down debugging
        usb: remove bad dput after dentry_unhash
        USB: core: Tolerate protocol stall during hub and port status read
        musb: fix prefetch build failure
        USB: cdc-acm: Adding second ACM channel support for Nokia E7 and C7
        usb-gadget: unlock data->lock mutex on error path in ep_write()
        USB: option Add blacklist for ZTE K3765-Z (19d2:2002)
        option: add Prolink PH300 modem IDs
        ...
      4c1f683a
    • F
      MAINTAINERS: add a maintainer to Gadget Framework · d6d0f665
      Felipe Balbi 提交于
      I'll be continuing the amazing work Dave has
      done with the Gadget Framework.
      Signed-off-by: NFelipe Balbi <balbi@ti.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      d6d0f665
    • L
      Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6 · 365a13a5
      Linus Torvalds 提交于
      * 'spi/merge' of git://git.secretlab.ca/git/linux-2.6:
        spi/rtc-m41t93: Use spi_get_drvdata() for SPI devices
        spi/omap2: fix uninitialized variable
      365a13a5
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · d21131bb
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        cifs: trivial: add space in fsc error message
        cifs: silence printk when establishing first session on socket
        CIFS ACL support needs CONFIG_KEYS, so depend on it
        possible memory corruption in cifs_parse_mount_options()
        cifs: make CIFS depend on CRYPTO_ECB
        cifs: fix the kernel release version in the default security warning message
      d21131bb
    • G
      Merge 3.0-rc2 + Linus's latest into usb-linus · 7e24cf43
      Greg Kroah-Hartman 提交于
      This is needed to get the following MAINTAINERS patch to apply properly.
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      7e24cf43