1. 01 2月, 2011 13 次提交
    • N
      sh: sh7750: Fix incompatible pointer type · 0ce08870
      Nobuhiro Iwamatsu 提交于
      It is necessary to set array of struct platform_device in
      early_platform_add_devices().
      
      arch/sh/kernel/cpu/sh4/setup-sh7750.c: In function ‘plat_early_device_setup’:
      arch/sh/kernel/cpu/sh4/setup-sh7750.c:260: warning: passing argument 1 of ‘early_platform_add_devices’ from incompatible pointer type
      include/linux/platform_device.h:159: note: expected ‘struct platform_device **’ but argument is of type ‘struct platform_device *’
      arch/sh/kernel/cpu/sh4/setup-sh7750.c:262: warning: passing argument 1 of ‘early_platform_add_devices’ from incompatible pointer type
      include/linux/platform_device.h:159: note: expected ‘struct platform_device **’ but argument is of type ‘struct platform_device *’
      arch/sh/kernel/cpu/sh4/setup-sh7750.c:263: warning: passing argument 1 of ‘early_platform_add_devices’ from incompatible pointer type
      include/linux/platform_device.h:159: note: expected ‘struct platform_device **’ but argument is of type ‘struct platform_device *’
      Signed-off-by: NNobuhiro Iwamatsu <iwamatsu@nigauri.org>
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      0ce08870
    • N
      sh: sh7750: move machtypes.h to include/generated · 5939d25f
      Nobuhiro Iwamatsu 提交于
      By commit 3252b11f,
      machtypes.h moved to include/generated.
      However, this forgot kernel/cpu/sh4/setup-sh7750.
      Signed-off-by: NNobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
      Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
      5939d25f
    • L
      Linux 2.6.38-rc3 · ebf53826
      Linus Torvalds 提交于
      ebf53826
    • L
      Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · 0fd08c55
      Linus Torvalds 提交于
      * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
        NFS: NFSv4 readdir loses entries
        NFS: Micro-optimize nfs4_decode_dirent()
        NFS: Fix an NFS client lockdep issue
        NFS construct consistent co_ownerid for v4.1
        NFS: nfs_wcc_update_inode() should set nfsi->attr_gencount
        NFS improve pnfs_put_deviceid_cache debug print
        NFS fix cb_sequence error processing
        NFS do not find client in NFSv4 pg_authenticate
        NLM: Fix "kernel BUG at fs/lockd/host.c:417!" or ".../host.c:283!"
        NFS: Prevent memory allocation failure in nfsacl_encode()
        NFS: nfsacl_{encode,decode} should return signed integer
        NFS: Fix "kernel BUG at fs/nfs/nfs3xdr.c:1338!"
        NFS: Fix "kernel BUG at fs/aio.c:554!"
        NFS4: Avoid potential NULL pointer dereference in decode_and_add_ds().
        NFS: fix handling of malloc failure during nfs_flush_multi()
      0fd08c55
    • L
      Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm · 7921127e
      Linus Torvalds 提交于
      * 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
        ARM: smp_on_up: allow non-ARM SMP processors
        ARM: io: ensure inb/outb() et.al. are properly ordered on ARMv6+
        ARM: initrd: disable initrd if passed address overlaps reserved region
        ARM: footbridge: fix debug macros
        ARM: mmci: round down the bytes transferred on error
        ARM: mmci: complete the transaction on error
        ARM: 6642/1: mmci: calculate remaining bytes at error correctly
      7921127e
    • L
      Merge branch 'omap-fixes-for-linus' of... · 35a8524f
      Linus Torvalds 提交于
      Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
      
      * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
        arch/arm/mach-omap2/dma.c: Convert IS_ERR result to PTR_ERR
        arm: omap2: mux: fix compile warning
        omap1: Simplify use of omap_irq_flags
        omap2+: Fix unused variable warning for omap_irq_base
      35a8524f
    • R
      kernel.h: fix kernel-doc warning · ffbbf2da
      Randy Dunlap 提交于
      Fix kernel-doc warning in kernel.h from commit 7ef88ad5
      ("BUILD_BUG_ON: make it handle more cases"):
      
        Warning(include/linux/kernel.h:605): No description found for parameter 'condition'
        Warning(include/linux/kernel.h:605): Excess function parameter 'cond' description in 'BUILD_BUG_ON'
      Signed-off-by: NRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ffbbf2da
    • L
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · fb9f1f17
      Linus Torvalds 提交于
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        xfs: xfs_bmap_add_extent_delay_real should init br_startblock
        xfs: fix dquot shaker deadlock
        xfs: handle CIl transaction commit failures correctly
        xfs: limit extsize to size of AGs and/or MAXEXTLEN
        xfs: prevent extsize alignment from exceeding maximum extent size
        xfs: limit extent length for allocation to AG size
        xfs: speculative delayed allocation uses rounddown_power_of_2 badly
        xfs: fix efi item leak on forced shutdown
        xfs: fix log ticket leak on forced shutdown.
      fb9f1f17
    • M
      virtio: update MAINTAINERS · 2426ec8f
      Michael S. Tsirkin 提交于
      Patches should keep coming through Rusty but it helps if I'm Cc'd as
      well.
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      Signed-off-by: NRusty Russell <rusty@rustcorp.com.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      2426ec8f
    • L
      Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · cbae4873
      Linus Torvalds 提交于
      * 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (42 commits)
        usb: gadget: composite: avoid access beyond array max length
        USB: serial: handle Data Carrier Detect changes
        USB: gadget: Fix endpoint representation in ci13xxx_udc
        USB: gadget: Fix error path in ci13xxx_udc gadget probe function
        usb: pch_udc: Fix the worning log issue at gadget driver remove
        USB: serial: Updated support for ICOM devices
        USB: ehci-mxc: add work-around for efika mx/sb bug
        USB: unbreak ehci-mxc on otg port of i.MX27
        drivers: update to pl2303 usb-serial to support Motorola cables
        USB: adding USB support for Cinterion's HC2x, EU3 and PH8 products
        USB serial: add missing .usb_driver field in serial drivers
        USB: ehci-fsl: Fix 'have_sysif_regs' detection
        USB: g_printer: fix bug in module parameter definitions
        USB: g_printer: fix bug in unregistration
        USB: uss720: remove duplicate USB device
        MAINTAINERS: add ueagle-atm entry
        USB: EHCI: fix DMA deallocation bug
        USB: pch_udc: support new device ML7213 IOH
        usb: pch_udc: Fixed issue which does not work with g_serial
        usb: set ep_dev async suspend should be later than device_initialize
        ...
      cbae4873
    • L
      Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · fb1c6348
      Linus Torvalds 提交于
      * 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (26 commits)
        staging: r8712u: Add new device IDs
        staging: brcm80211: fix suspend/resume issue in brcmsmac
        staging: brcm80211: remove assert to avoid panic since 2.6.37 kernel
        Staging: iio: Aditional fixpoint formatted output bugfix
        staging: usbip: vhci: use urb->dev->portnum to find port
        staging: usbip: vhci: handle EAGAIN from SO_RCVTIMEO
        staging: usbip: vhci: friendly log messages for connection errors
        staging: usbip: vhci: refuse to enqueue for dead connections
        staging: usbip: vhci: give back URBs from in-flight unlink requests
        staging: usbip: vhci: update reference count for usb_device
        staging: usbip: stub: update refcounts for devices and interfaces
        staging: tidspbridge: replace mbox callback with notifier_call
        staging: comedi: ni_labpc: Use shared IRQ for PCMCIA card
        Staging: speakup: &&/|| confusion in silent_store()
        iio: Fixpoint formatted output bugfix
        staging: rt2860: Fix incorrect netif_stop_queue usage warning
        staging: r8712u: Fix memory leak in firmware loading
        staging: tidspbridge: configure full L1 MMU range
        staging: rt2870sta: Add ID for Linksys WUSB100v2
        Staging: xgfib: put parenthesis in the right place
        ...
      fb1c6348
    • L
      Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 · abfa44b5
      Linus Torvalds 提交于
      * 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
        tty/serial: fix apbuart build
        n_hdlc: fix read and write locking
        serial: unbreak billionton CF card
        tty: use for_each_console() and WARN() on sysfs failures
        vt: fix issue when fbcon wants to takeover a second time.
      
      Fix up trivial conflict in drivers/tty/tty_io.c
      abfa44b5
    • R
      ARM: smp_on_up: allow non-ARM SMP processors · e98ff0f5
      Russell King 提交于
      Allow non-ARM SMP processors to use the SMP_ON_UP feature.  CPUs
      supporting SMP must have the new CPU ID format, so check for this first.
      Then check for ARM11MPCore, which fails the MPIDR check.  Lastly check
      the MPIDR reports multiprocessing extensions and that the CPU is part of
      a multiprocessing system.
      
      Cc: <stable@kernel.org>
      Reported-and-Tested-by: NStephen Boyd <sboyd@codeaurora.org>
      Acked-by: NWill Deacon <will.deacon@arm.com>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      e98ff0f5
  2. 31 1月, 2011 17 次提交
  3. 30 1月, 2011 1 次提交
  4. 29 1月, 2011 7 次提交
  5. 28 1月, 2011 2 次提交
    • B
      xfs: xfs_bmap_add_extent_delay_real should init br_startblock · 24446fc6
      bpm@sgi.com 提交于
      When filling in the middle of a previous delayed allocation in
      xfs_bmap_add_extent_delay_real, set br_startblock of the new delay
      extent to the right to nullstartblock instead of 0 before inserting
      the extent into the ifork (xfs_iext_insert), rather than setting
      br_startblock afterward.
      
      Adding the extent into the ifork with br_startblock=0 can lead to
      the extent being copied into the btree by xfs_bmap_extent_to_btree
      if we happen to convert from extents format to btree format before
      updating br_startblock with the correct value.  The unexpected
      addition of this delay extent to the btree can cause subsequent
      XFS_WANT_CORRUPTED_GOTO filesystem shutdown in several
      xfs_bmap_add_extent_delay_real cases where we are converting a delay
      extent to real and unexpectedly find an extent already inserted.
      For example:
      
      911         case BMAP_LEFT_FILLING:
      912                 /*
      913                  * Filling in the first part of a previous delayed allocation.
      914                  * The left neighbor is not contiguous.
      915                  */
      916                 trace_xfs_bmap_pre_update(ip, idx, state, _THIS_IP_);
      917                 xfs_bmbt_set_startoff(ep, new_endoff);
      918                 temp = PREV.br_blockcount - new->br_blockcount;
      919                 xfs_bmbt_set_blockcount(ep, temp);
      920                 xfs_iext_insert(ip, idx, 1, new, state);
      921                 ip->i_df.if_lastex = idx;
      922                 ip->i_d.di_nextents++;
      923                 if (cur == NULL)
      924                         rval = XFS_ILOG_CORE | XFS_ILOG_DEXT;
      925                 else {
      926                         rval = XFS_ILOG_CORE;
      927                         if ((error = xfs_bmbt_lookup_eq(cur, new->br_startoff,
      928                                         new->br_startblock, new->br_blockcount,
      929                                         &i)))
      930                                 goto done;
      931                         XFS_WANT_CORRUPTED_GOTO(i == 0, done);
      
      With the bogus extent in the btree we shutdown the filesystem at
      931.  The conversion from extents to btree format happens when the
      number of extents in the inode increases above ip->i_df.if_ext_max.
      xfs_bmap_extent_to_btree copies extents from the ifork into the
      btree, ignoring all delalloc extents which are denoted by
      br_startblock having some value of nullstartblock.
      
      SGI-PV: 1013221
      Signed-off-by: NBen Myers <bpm@sgi.com>
      Reviewed-by: NDave Chinner <dchinner@redhat.com>
      Signed-off-by: NAlex Elder <aelder@sgi.com>
      24446fc6
    • D
      xfs: fix dquot shaker deadlock · 0fbca4d1
      Dave Chinner 提交于
      Commit 368e1361 ("xfs: remove duplicate code from dquot reclaim") fails
      to unlock the dquot freelist when the number of loop restarts is
      exceeded in xfs_qm_dqreclaim_one(). This causes hangs in memory
      reclaim.
      
      Rework the loop control logic into an unwind stack that all the
      different cases jump into. This means there is only one set of code
      that processes the loop exit criteria, and simplifies the unlocking
      of all the items from different points in the loop. It also fixes a
      double increment of the restart counter from the qi_dqlist_lock
      case.
      Reported-by: NMalcolm Scott <lkml@malc.org.uk>
      Signed-off-by: NDave Chinner <dchinner@redhat.com>
      Reviewed-by: NAlex Elder <aelder@sgi.com>
      0fbca4d1