1. 24 1月, 2011 1 次提交
  2. 18 1月, 2011 1 次提交
    • C
      Subject: [PATCH] Smack: mmap controls for library containment · 7898e1f8
      Casey Schaufler 提交于
        In the embedded world there are often situations
        where libraries are updated from a variety of sources,
        for a variety of reasons, and with any number of
        security characteristics. These differences
        might include privilege required for a given library
        provided interface to function properly, as occurs
        from time to time in graphics libraries. There are
        also cases where it is important to limit use of
        libraries based on the provider of the library and
        the security aware application may make choices
        based on that criteria.
      
        These issues are addressed by providing an additional
        Smack label that may optionally be assigned to an object,
        the SMACK64MMAP attribute. An mmap operation is allowed
        if there is no such attribute.
      
        If there is a SMACK64MMAP attribute the mmap is permitted
        only if a subject with that label has all of the access
        permitted a subject with the current task label.
      
        Security aware applications may from time to time
        wish to reduce their "privilege" to avoid accidental use
        of privilege. One case where this arises is the
        environment in which multiple sources provide libraries
        to perform the same functions. An application may know
        that it should eschew services made available from a
        particular vendor, or of a particular version.
      
        In support of this a secondary list of Smack rules has
        been added that is local to the task. This list is
        consulted only in the case where the global list has
        approved access. It can only further restrict access.
        Unlike the global last, if no entry is found on the
        local list access is granted. An application can add
        entries to its own list by writing to /smack/load-self.
      
        The changes appear large as they involve refactoring
        the list handling to accomodate there being more
        than one rule list.
      Signed-off-by: NCasey Schaufler <casey@schaufler-ca.com>
      7898e1f8
  3. 10 1月, 2011 2 次提交
  4. 08 1月, 2011 18 次提交
    • L
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus · 0c21e3aa
      Linus Torvalds 提交于
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus:
        hfsplus: %L-to-%ll, macro correction, and remove unneeded braces
        hfsplus: spaces/indentation clean-up
        hfsplus: C99 comments clean-up
        hfsplus: over 80 character lines clean-up
        hfsplus: fix an artifact in ioctl flag checking
        hfsplus: flush disk caches in sync and fsync
        hfsplus: optimize fsync
        hfsplus: split up inode flags
        hfsplus: write up fsync for directories
        hfsplus: simplify fsync
        hfsplus: avoid useless work in hfsplus_sync_fs
        hfsplus: make sure sync writes out all metadata
        hfsplus: use raw bio access for partition tables
        hfsplus: use raw bio access for the volume headers
        hfsplus: always use hfsplus_sync_fs to write the volume header
        hfsplus: silence a few debug printks
        hfsplus: fix option parsing during remount
      
      Fix up conflicts due to VFS changes in fs/hfsplus/{hfsplus_fs.h,unicode.c}
      0c21e3aa
    • L
      Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 · 021db8e2
      Linus Torvalds 提交于
      * 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (77 commits)
        spi/omap: Fix DMA API usage in OMAP MCSPI driver
        spi/imx: correct the test on platform_get_irq() return value
        spi/topcliff: Typo fix threhold to threshold
        spi/dw_spi Typo change diable to disable.
        spi/fsl_espi: change the read behaviour of the SPIRF
        spi/mpc52xx-psc-spi: move probe/remove to proper sections
        spi/dw_spi: add DMA support
        spi/dw_spi: change to EXPORT_SYMBOL_GPL for exported APIs
        spi/dw_spi: Fix too short timeout in spi polling loop
        spi/pl022: convert running variable
        spi/pl022: convert busy flag to a bool
        spi/pl022: pass the returned sglen to the DMA engine
        spi/pl022: map the buffers on the DMA engine
        spi/topcliff_pch: Fix data transfer issue
        spi/imx: remove autodetection
        spi/pxa2xx: pass of_node to spi device and set a parent device
        spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes.
        spi/pxa2xx: Add chipselect support for Sodaville
        spi/pxa2xx: Consider CE4100's FIFO depth
        spi/pxa2xx: Add CE4100 support
        ...
      021db8e2
    • L
      Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · 72eb6a79
      Linus Torvalds 提交于
      * 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (30 commits)
        gameport: use this_cpu_read instead of lookup
        x86: udelay: Use this_cpu_read to avoid address calculation
        x86: Use this_cpu_inc_return for nmi counter
        x86: Replace uses of current_cpu_data with this_cpu ops
        x86: Use this_cpu_ops to optimize code
        vmstat: User per cpu atomics to avoid interrupt disable / enable
        irq_work: Use per cpu atomics instead of regular atomics
        cpuops: Use cmpxchg for xchg to avoid lock semantics
        x86: this_cpu_cmpxchg and this_cpu_xchg operations
        percpu: Generic this_cpu_cmpxchg() and this_cpu_xchg support
        percpu,x86: relocate this_cpu_add_return() and friends
        connector: Use this_cpu operations
        xen: Use this_cpu_inc_return
        taskstats: Use this_cpu_ops
        random: Use this_cpu_inc_return
        fs: Use this_cpu_inc_return in buffer.c
        highmem: Use this_cpu_xx_return() operations
        vmstat: Use this_cpu_inc_return for vm statistics
        x86: Support for this_cpu_add, sub, dec, inc_return
        percpu: Generic support for this_cpu_add, sub, dec, inc_return
        ...
      
      Fixed up conflicts: in arch/x86/kernel/{apic/nmi.c, apic/x2apic_uv_x.c, process.c}
      as per Tejun.
      72eb6a79
    • L
      Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · 23d69b09
      Linus Torvalds 提交于
      * 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (33 commits)
        usb: don't use flush_scheduled_work()
        speedtch: don't abuse struct delayed_work
        media/video: don't use flush_scheduled_work()
        media/video: explicitly flush request_module work
        ioc4: use static work_struct for ioc4_load_modules()
        init: don't call flush_scheduled_work() from do_initcalls()
        s390: don't use flush_scheduled_work()
        rtc: don't use flush_scheduled_work()
        mmc: update workqueue usages
        mfd: update workqueue usages
        dvb: don't use flush_scheduled_work()
        leds-wm8350: don't use flush_scheduled_work()
        mISDN: don't use flush_scheduled_work()
        macintosh/ams: don't use flush_scheduled_work()
        vmwgfx: don't use flush_scheduled_work()
        tpm: don't use flush_scheduled_work()
        sonypi: don't use flush_scheduled_work()
        hvsi: don't use flush_scheduled_work()
        xen: don't use flush_scheduled_work()
        gdrom: don't use flush_scheduled_work()
        ...
      
      Fixed up trivial conflict in drivers/media/video/bt8xx/bttv-input.c
      as per Tejun.
      23d69b09
    • L
      Merge branch 'sched-fixes-for-linus' of... · e744070f
      Linus Torvalds 提交于
      Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        sched: Constify function scope static struct sched_param usage
        sched: Fix strncmp operation
        sched: Move sched_autogroup_exit() to free_signal_struct()
        sched: Fix struct autogroup memory leak
        sched: Mark autogroup_init() __init
        sched: Consolidate the name of root_task_group and init_task_group
      e744070f
    • L
      Merge branch 'x86-apic-cleanups-for-linus' of... · d004e4d3
      Linus Torvalds 提交于
      Merge branch 'x86-apic-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-apic-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: apic: Cleanup and simplify setup_local_APIC()
        x86: Further simplify mp_irq info handling
        x86: Unify 3 similar ways of saving mp_irqs info
        x86, ioapic: Avoid writing io_apic id if already correct
        x86, x2apic: Don't map lapic addr for preenabled x2apic systems
        x86, sfi: Use register_lapic_address()
        x86, apic: Use register_lapic_address() in init_apic_mapping()
        x86, apic: Remove early_init_lapic_mapping()
        x86, apic: Unify identical register_lapic_address() functions
      d004e4d3
    • L
      Merge branch 'mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 128283a4
      Linus Torvalds 提交于
      * 'mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        EDAC, MCE: Fix NB error formatting
        EDAC, MCE: Use BIT_64() to eliminate warnings on 32-bit
        EDAC, MCE: Enable MCE decoding on F15h
        EDAC, MCE: Allow F15h bank 6 MCE injection
        EDAC, MCE: Shorten error report formatting
        EDAC, MCE: Overhaul error fields extraction macros
        EDAC, MCE: Add F15h FP MCE decoder
        EDAC, MCE: Add F15 EX MCE decoder
        EDAC, MCE: Add an F15h NB MCE decoder
        EDAC, MCE: No F15h LS MCE decoder
        EDAC, MCE: Add F15h CU MCE decoder
        EDAC, MCE: Add F15h IC MCE decoder
        EDAC, MCE: Add F15h DC MCE decoder
        EDAC, MCE: Select extended error code mask
      128283a4
    • L
      Merge branch 'edac-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 442d1ba2
      Linus Torvalds 提交于
      * 'edac-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        amd64_edac: Disable DRAM ECC injection on K8
        EDAC: Fixup scrubrate manipulation
        amd64_edac: Remove two-stage initialization
        amd64_edac: Check ECC capabilities initially
        amd64_edac: Carve out ECC-related hw settings
        amd64_edac: Remove PCI ECS enabling functions
        amd64_edac: Remove explicit Kconfig PCI dependency
        amd64_edac: Allocate driver instances dynamically
        amd64_edac: Rework printk macros
        amd64_edac: Rename CPU PCI devices
        amd64_edac: Concentrate per-family init even more
        amd64_edac: Cleanup the CPU PCI device reservation
        amd64_edac: Simplify CPU family detection
        amd64_edac: Add per-family init function
        amd64_edac: Use cached extended CPU model
        amd64_edac: Remove F11h support
      442d1ba2
    • L
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · fb5131e1
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (65 commits)
        [S390] prevent unneccesary loops_per_jiffy recalculation
        [S390] cpuinfo: use get_online_cpus() instead of preempt_disable()
        [S390] smp: remove cpu hotplug messages
        [S390] mutex: enable spinning mutex on s390
        [S390] mutex: Introduce arch_mutex_cpu_relax()
        [S390] cio: fix ccwgroup unregistration race condition
        [S390] perf: add DWARF register lookup for s390
        [S390] cleanup ftrace backend functions
        [S390] ptrace cleanup
        [S390] smp/idle: call init_idle() before starting a new cpu
        [S390] smp: delay idle task creation
        [S390] dasd: Correct retry counter for terminated I/O.
        [S390] dasd: Add support for raw ECKD access.
        [S390] dasd: Prevent deadlock during suspend/resume.
        [S390] dasd: Improve handling of stolen DASD reservation
        [S390] dasd: do path verification for paths added at runtime
        [S390] dasd: add High Performance FICON multitrack support
        [S390] cio: reduce memory consumption of itcw structures
        [S390] nmi: enable machine checks early
        [S390] qeth: buffer count imbalance
        ...
      fb5131e1
    • L
      Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · d074b104
      Linus Torvalds 提交于
      * 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (67 commits)
        ARM: mach-shmobile: update for SMP changes.
        ARM: mach-shmobile: update for GIC changes.
        ARM: mach-shmobile: Fix up clkdev fallout for SH73A0.
        dma: shdma: don't register the global die notifier multiple times
        ARM: mach-shmobile: Rely on run-time IRQ handlers
        ARM: mach-shmobile: Run-time IRQ handler for GIC
        ARM: mach-shmobile: Run-time IRQ handler for INTCA
        ARM: mach-shmobile: Enable CONFIG_MULTI_IRQ_HANDLER
        ARM: mach-shmobile: Use shared GIC entry macros
        ARM: mach-shmobile: mackerel: Add zboot support
        ARM: mach-shmobile: mackerel: Add HDMI sound support
        ARM: mach-shmobile: mackerel: add HDMI video support
        ARM: mach-shmobile: ap4evb: fixup clk_put timing of fsib_clk
        ARM: mach-shmobile: sh73a0: fix div4 table
        ARM: mach-shmobile: ap4/mackerel: modify wrong comment out of USB
        ARM: mach-shmobile: Mackerel VGA camera support
        mmc: sh_mmcif: make DMA support by the driver unconditional
        ARM: mach-shmobile: Add eMMC support through MMCIF on AG5EVM
        ARM: mach-shmobile: Use pullups for AG5EVM KEYSC pins
        ARM: mach-shmobile: sh73a0 GPIO pullup improvement
        ...
      d074b104
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 31b6ca0a
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (58 commits)
        Input: wacom_w8001 - support pen or touch only devices
        Input: wacom_w8001 - use __set_bit to set keybits
        Input: bu21013_ts - fix misuse of logical operation in place of bitop
        Input: i8042 - add Acer Aspire 5100 to the Dritek list
        Input: wacom - add support for digitizer in Lenovo W700
        Input: psmouse - disable the synaptics extension on OLPC machines
        Input: psmouse - fix up Synaptics comment
        Input: synaptics - ignore bogus mt packet
        Input: synaptics - add multi-finger and semi-mt support
        Input: synaptics - report clickpad property
        input: mt: Document interface updates
        Input: fix double equality sign in uevent
        Input: introduce device properties
        hid: egalax: Add support for Wetab (726b)
        Input: include MT library as source for kerneldoc
        MAINTAINERS: Update input-mt entry
        hid: egalax: Add support for Samsung NB30 netbook
        hid: egalax: Document the new devices in Kconfig
        hid: egalax: Add support for Wetab
        hid: egalax: Convert to MT slots
        ...
      
      Fixed up trivial conflict in drivers/input/keyboard/Kconfig
      31b6ca0a
    • L
      Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 · 56b85f32
      Linus Torvalds 提交于
      * 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (36 commits)
        serial: apbuart: Fixup apbuart_console_init()
        TTY: Add tty ioctl to figure device node of the system console.
        tty: add 'active' sysfs attribute to tty0 and console device
        drivers: serial: apbuart: Handle OF failures gracefully
        Serial: Avoid unbalanced IRQ wake disable during resume
        tty: fix typos/errors in tty_driver.h comments
        pch_uart : fix warnings for 64bit compile
        8250: fix uninitialized FIFOs
        ip2: fix compiler warning on ip2main_pci_tbl
        specialix: fix compiler warning on specialix_pci_tbl
        rocket: fix compiler warning on rocket_pci_ids
        8250: add a UPIO_DWAPB32 for 32 bit accesses
        8250: use container_of() instead of casting
        serial: omap-serial: Add support for kernel debugger
        serial: fix pch_uart kconfig & build
        drivers: char: hvc: add arm JTAG DCC console support
        RS485 documentation: add 16C950 UART description
        serial: ifx6x60: fix memory leak
        serial: ifx6x60: free IRQ on error
        Serial: EG20T: add PCH_UART driver
        ...
      
      Fixed up conflicts in drivers/serial/apbuart.c with evil merge that
      makes the code look fairly sane (unlike either side).
      56b85f32
    • L
      Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 3e5b08cb
      Linus Torvalds 提交于
      * 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (144 commits)
        USB: add support for Dream Cheeky DL100B Webmail Notifier (1d34:0004)
        USB: serial: ftdi_sio: add support for TIOCSERGETLSR
        USB: ehci-mxc: Setup portsc register prior to accessing OTG viewport
        USB: atmel_usba_udc: fix freeing irq in usba_udc_remove()
        usb: ehci-omap: fix tll channel enable mask
        usb: ohci-omap3: fix trivial typo
        USB: gadget: ci13xxx: don't assume that PAGE_SIZE is 4096
        USB: gadget: ci13xxx: fix complete() callback for no_interrupt rq's
        USB: gadget: update ci13xxx to work with g_ether
        USB: gadgets: ci13xxx: fix probing of compiled-in gadget drivers
        Revert "USB: musb: pm: don't rely fully on clock support"
        Revert "USB: musb: blackfin: pm: make it work"
        USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path
        USB: uas: Ensure we only bind to a UAS interface
        USB: uas: Rename sense pipe and sense urb to status pipe and status urb
        USB: uas: Use kzalloc instead of kmalloc
        USB: uas: Fix up the Sense IU
        usb: musb: core: kill unneeded #include's
        DA8xx: assign name to MUSB IRQ resource
        usb: gadget: g_ncm added
        ...
      
      Manually fix up trivial conflicts in USB Kconfig changes in:
      	arch/arm/mach-omap2/Kconfig
      	arch/sh/Kconfig
      	drivers/usb/Kconfig
      	drivers/usb/host/ehci-hcd.c
      and annoying chip clock data conflicts in:
      	arch/arm/mach-omap2/clock3xxx_data.c
      	arch/arm/mach-omap2/clock44xx_data.c
      3e5b08cb
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · da40d036
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (147 commits)
        [SCSI] arcmsr: fix write to device check
        [SCSI] lpfc: lower stack use in lpfc_fc_frame_check
        [SCSI] eliminate an unnecessary local variable from scsi_remove_target()
        [SCSI] libiscsi: use bh locking instead of irq with session lock
        [SCSI] libiscsi: do not take host lock in queuecommand
        [SCSI] be2iscsi: fix null ptr when accessing task hdr
        [SCSI] be2iscsi: fix gfp use in alloc_pdu
        [SCSI] libiscsi: add more informative failure message during iscsi scsi eh
        [SCSI] gdth: Add missing call to gdth_ioctl_free
        [SCSI] bfa: remove unused defintions and misc cleanups
        [SCSI] bfa: remove inactive functions
        [SCSI] bfa: replace bfa_assert with WARN_ON
        [SCSI] qla2xxx: Use sg_next to fetch next sg element while walking sg list.
        [SCSI] qla2xxx: Fix to avoid recursive lock failure during BSG timeout.
        [SCSI] qla2xxx: Remove code to not reset ISP82xx on failure.
        [SCSI] qla2xxx: Display mailbox register 4 during 8012 AEN for ISP82XX parts.
        [SCSI] qla2xxx: Don't perform a BIG_HAMMER if Get-ID (0x20) mailbox command fails on CNAs.
        [SCSI] qla2xxx: Remove redundant module parameter permission bits
        [SCSI] qla2xxx: Add sysfs node for displaying board temperature.
        [SCSI] qla2xxx: Code cleanup to remove unwanted comments and code.
        ...
      da40d036
    • D
      input/tc3589x: fix compile error · aa58abc2
      Dan Carpenter 提交于
      There was a semi-colon missing and it broke the compile.
      Signed-off-by: NDan Carpenter <error27@gmail.com>
      Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
      Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      aa58abc2
    • R
      spi/omap: Fix DMA API usage in OMAP MCSPI driver · 07fe0351
      Russell King - ARM Linux 提交于
      Running the latest kernel on the 4430SDP board with DMA API debugging
      enabled results in this:
      
      WARNING: at lib/dma-debug.c:803 check_unmap+0x19c/0x6f0()
      NULL NULL: DMA-API: device driver tries to free DMA memory it has not allocated
      [device address=0x000000008129901a] [size=260 bytes]
      Modules linked in:
      Backtrace:
      [<c003cbe0>] (dump_backtrace+0x0/0x10c) from [<c0278da8>] (dump_stack+0x18/0x1c)
       r7:c1839dc0 r6:c0198578 r5:c0304b17 r4:00000323
      [<c0278d90>] (dump_stack+0x0/0x1c) from [<c005b158>] (warn_slowpath_common+0x58/0x70)
      [<c005b100>] (warn_slowpath_common+0x0/0x70) from [<c005b214>] (warn_slowpath_fmt+0x38/0x40)
       r8:c1839e40 r7:00000000 r6:00000104 r5:00000000 r4:8129901a
      [<c005b1dc>] (warn_slowpath_fmt+0x0/0x40) from [<c0198578>] (check_unmap+0x19c/0x6f0)
       r3:c03110de r2:c0304e6b
      [<c01983dc>] (check_unmap+0x0/0x6f0) from [<c0198cd8>] (debug_dma_unmap_page+0x74/0x80)
      [<c0198c64>] (debug_dma_unmap_page+0x0/0x80) from [<c01d5ad8>] (omap2_mcspi_work+0x514/0xbf0)
      [<c01d55c4>] (omap2_mcspi_work+0x0/0xbf0) from [<c006dfb0>] (process_one_work+0x294/0x400)
      [<c006dd1c>] (process_one_work+0x0/0x400) from [<c006e50c>] (worker_thread+0x220/0x3f8)
      [<c006e2ec>] (worker_thread+0x0/0x3f8) from [<c00738d0>] (kthread+0x88/0x90)
      [<c0073848>] (kthread+0x0/0x90) from [<c005e924>] (do_exit+0x0/0x5fc)
       r7:00000013 r6:c005e924 r5:c0073848 r4:c1829ee0
      ---[ end trace 1b75b31a2719ed20 ]---
      
      I've no idea why this driver uses NULL for dma_unmap_single instead of
      the &spi->dev that is laying around just waiting to be used in that
      function - but it's an easy fix.
      
      Also replace this comment with a FIXME comment:
                      /* Do DMA mapping "early" for better error reporting and
                       * dcache use.  Note that if dma_unmap_single() ever starts
                       * to do real work on ARM, we'd need to clean up mappings
                       * for previous transfers on *ALL* exits of this loop...
                       */
      as the comment is not true - we do work in dma_unmap() functions,
      particularly on ARMv6 and above.  I've corrected the existing unmap
      functions but if any others are required they must be added ASAP.
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      Acked-by: NTony Lindgren <tony@atomide.com>
      Signed-off-by: NGrant Likely <grant.likely@secretlab.ca>
      07fe0351
    • R
      spi/imx: correct the test on platform_get_irq() return value · 73575938
      Richard Genoud 提交于
      The test "if (spi_imx->irq <= 0)" is not testing the IRQ value, but
      the return value of platform_get_irq().  As platform_get_irq() can
      return an error (-ENXIO) or the IRQ value it found, the test should be
      "if (spi_imx->irq < 0)"
      
      [grant.likely: Note: In general, Linux irq number 0 should also mean
      no irq, but arm still allows devices to be assigned 0, and the imx
      platform uses 0 for one of the spi devices, so this patch is needed
      for the device to work]
      Signed-off-by: NRichard Genoud <richard.genoud@gmail.com>
      Signed-off-by: NGrant Likely <grant.likely@secretlab.ca>
      73575938
    • L
      Merge branch 'vfs-scale-working' of... · b4a45f5f
      Linus Torvalds 提交于
      Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin
      
      * 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin: (57 commits)
        fs: scale mntget/mntput
        fs: rename vfsmount counter helpers
        fs: implement faster dentry memcmp
        fs: prefetch inode data in dcache lookup
        fs: improve scalability of pseudo filesystems
        fs: dcache per-inode inode alias locking
        fs: dcache per-bucket dcache hash locking
        bit_spinlock: add required includes
        kernel: add bl_list
        xfs: provide simple rcu-walk ACL implementation
        btrfs: provide simple rcu-walk ACL implementation
        ext2,3,4: provide simple rcu-walk ACL implementation
        fs: provide simple rcu-walk generic_check_acl implementation
        fs: provide rcu-walk aware permission i_ops
        fs: rcu-walk aware d_revalidate method
        fs: cache optimise dentry and inode for rcu-walk
        fs: dcache reduce branches in lookup path
        fs: dcache remove d_mounted
        fs: fs_struct use seqlock
        fs: rcu-walk for path lookup
        ...
      b4a45f5f
  5. 07 1月, 2011 18 次提交