20 Feb, 2011

1 commit


19 Feb, 2011

3 commits

  • Signed-off-by: Alan Cox
    Signed-off-by: Dominik Brodowski

    Alan Cox
     
  • After 2.6.34 changes, __pxa2xx_drv_pcmcia_probe() was replaced by
    sa1111_pcmcia_add(). That unfortunately means that configure_sockets()
    is not called, leading to MECR not being set properly, leading to
    strange crashes.

    Tested on pxa255+sa1111, I do not have lubbock board nearby. Perhaps
    cleaner solution exists?

    Signed-off-by: Pavel Machek
    Signed-off-by: Dominik Brodowski

    Pavel Machek
     
  • Request_region should be used with release_region, not release_resource.

    This patch contains a number of changes, related to calls to request_region,
    request_mem_region, and the associated error handling code.

    1. For the call to request_region, the variable io_resource storing the
    result is dropped. The call to release_resource at the end of the function
    is changed to a call to release_region with the first two arguments of
    request_region as its arguments. The same call to release_region is also
    added to release_ipwireless.

    2. The first call to request_mem_region is now tested and ret is set to
    -EBUSY if the the call has failed. This call was associated with the
    initialization of ipw->attr_memory. But the error handling code was
    testing ipw->common_memory. The definition of release_ipwireless also
    suggests that this call should be associated with ipw->common_memory, not
    ipw->attr_memory.

    3. The second call to request_mem_region is now tested and ret is
    set to -EBUSY if the the call has failed.

    4. The various gotos to the error handling code is adjusted so that there
    is no need for ifs.

    5. Return the value stored in the ret variable rather than -1.

    The semantic match that finds this problem is as follows:
    (http://coccinelle.lip6.fr/)

    //
    @@
    expression x,E;
    @@
    (
    *x = request_region(...)
    |
    *x = request_mem_region(...)
    )
    ... when != release_region(x)
    when != x = E
    * release_resource(x);
    //

    Signed-off-by: Julia Lawall
    Signed-off-by: Jiri Kosina
    Signed-off-by: Dominik Brodowski

    Julia Lawall
     

16 Feb, 2011

23 commits

  • Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
    m68knommu: set flow handler for secondary interrupt controller of 5249
    m68knommu: remove use of IRQ_FLG_LOCK from 68360 platform support
    m68knommu: fix dereference of port.tty
    m68knommu: add missing linker __modver section
    m68knommu: fix mis-named variable int set_irq_chip loop
    m68knommu: add optimize memmove() function
    m68k: remove arch specific non-optimized memcmp()
    m68knommu: fix use of un-defined _TIF_WORK_MASK
    m68knommu: Rename m548x_wdt.c to m54xx_wdt.c
    m68knommu: fix m548x_wdt.c compilation after headers renaming
    m68knommu: Remove dependencies on nonexistent M68KNOMMU

    Linus Torvalds
     
  • The secondary interrupt controller of the ColdFire 5249 code is not
    setting the edge triggered flow handler. Set it.

    Signed-off-by: Greg Ungerer

    Greg Ungerer
     
  • The m68knommu arch does not define or use IRQ_FLG_LOCK in its irq
    subsystem. Remove obsolete use of it.

    Signed-off-by: Greg Ungerer

    Greg Ungerer
     
  • The struct_tty associated with a port is now a direct pointer
    from within the local private driver info struct. So fix all uses
    of it.

    Signed-off-by: Greg Ungerer

    Greg Ungerer
     
  • Add missing linker section __modver to fix:

    LD vmlinux
    /usr/local/bin/../m68k-uclinux/bin/ld.real: error: no memory region specified for loadable section `__modver'

    Signed-off-by: Greg Ungerer

    Greg Ungerer
     
  • Compiling for 68360 targets gives:

    CC arch/m68knommu/platform/68360/ints.o
    arch/m68knommu/platform/68360/ints.c: In function ‘init_IRQ’:
    arch/m68knommu/platform/68360/ints.c:135:16: error: ‘irq’ undeclared (first use in this function)
    arch/m68knommu/platform/68360/ints.c:135:16: note: each undeclared identifier is reported only once for each function it appears in

    Fix variable name used.

    Signed-off-by: Greg Ungerer

    Greg Ungerer
     
  • Add an m68k/coldfire optimized memmove() function for the m68knommu arch.
    This is the same function as used by m68k. Simple speed tests show this
    is faster once buffers are larger than 4 bytes, and significantly faster
    on much larger buffers (4 times faster above about 100 bytes).

    This also goes part of the way to fixing a regression caused by commit
    ea61bc461d09e8d331a307916530aaae808c72a2 ("m68k/m68knommu: merge MMU and
    non-MMU string.h"), which breaks non-coldfire non-mmu builds (which is
    the 68x328 and 68360 families). They currently have no memmove() fucntion
    defined, since there was none in the m68knommu/lib functions.

    Signed-off-by: Greg Ungerer

    Greg Ungerer
     
  • The m68k arch implements its own memcmp() function. It is not optimized
    in any way (it is the most strait forward coding of memcmp you can get).
    Remove it and use the kernels standard memcmp() implementation.

    This also goes part of the way to fixing a regression caused by commit
    ea61bc461d09e8d331a307916530aaae808c72a2 ("m68k/m68knommu: merge MMU and
    non-MMU string.h"), which breaks non-coldfire non-mmu builds (which is
    the 68x328 and 68360 families). They currently have no memcmp() function
    defined, since there is none in the m68knommu/lib functions.

    Signed-off-by: Greg Ungerer
    Acked-by: Geert Uytterhoeven

    Greg Ungerer
     
  • * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (27 commits)
    drm/radeon/kms: hopefully fix pll issues for real (v3)
    drm/radeon/kms: add bounds checking to avivo pll algo
    drm: fix wrong usages of drm_device in DRM Developer's Guide
    drm/radeon/kms: fix a few more atombios endian issues
    drm/radeon/kms: improve 6xx/7xx CS error output
    drm/radeon/kms: check AA resolve registers on r300
    drm/radeon/kms: fix tracking of BLENDCNTL, COLOR_CHANNEL_MASK, and GB_Z on r300
    drm/radeon/kms: use linear aligned for evergreen/ni bo blits
    drm/radeon/kms: use linear aligned for 6xx/7xx bo blits
    drm/radeon: fix race between GPU reset and TTM delayed delete thread.
    drm/radeon/kms: evergreen/ni big endian fixes (v2)
    drm/radeon/kms: 6xx/7xx big endian fixes
    drm/radeon/kms: atombios big endian fixes
    drm/radeon: 6xx/7xx non-kms endian fixes
    drm/radeon/kms: optimize CS state checking for r100->r500
    drm: do not leak kernel addresses via /proc/dri/*/vma
    drm/radeon/kms: add connector table for mac g5 9600
    radeon mkregtable: Add missing fclose() calls
    drm/radeon/kms: fix interlaced modes on dce4+
    drm/radeon: fix memory debugging since d961db75ce86a84f1f04e91ad1014653ed7d9f46
    ...

    Linus Torvalds
     
  • …s/security-testing-2.6

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
    pci: use security_capable() when checking capablities during config space read

    Linus Torvalds
     
  • Transparent hugepages can only be created if rmap is fully
    functional. So we must prevent hugepages to be created while
    is_vma_temporary_stack() is true.

    This also optmizes away some harmless but unnecessary setting of
    khugepaged_scan.address and it switches some BUG_ON to VM_BUG_ON.

    Signed-off-by: Andrea Arcangeli
    Acked-by: Rik van Riel
    Signed-off-by: Linus Torvalds

    Andrea Arcangeli
     
  • * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
    ACPI / Video: Probe for output switch method when searching video devices.
    ACPI / Wakeup: Enable button GPEs unconditionally during initialization
    ACPI / ACPICA: Avoid crashing if _PRW is defined for the root object
    ACPI: Fix acpi_os_read_memory() and acpi_os_write_memory() (v2)

    Linus Torvalds
     
  • * 'tools-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
    tools: turbostat: style updates
    tools: turbostat: fix bitwise and operand

    Linus Torvalds
     
  • Len Brown
     
  • * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (21 commits)
    dmaengine: add slave-dma maintainer
    dma: ipu_idmac: do not lose valid received data in the irq handler
    dmaengine: imx-sdma: fix up param for the last BD in sdma_prep_slave_sg()
    dmaengine: imx-sdma: correct sdmac->status in sdma_handle_channel_loop()
    dmaengine: imx-sdma: return sdmac->status in sdma_tx_status()
    dmaengine: imx-sdma: set sdmac->status to DMA_ERROR in err_out of sdma_prep_slave_sg()
    dmaengine: imx-sdma: remove IMX_DMA_SG_LOOP handling in sdma_prep_slave_sg()
    dmaengine i.MX dma: initialize dma capabilities outside channel loop
    dmaengine i.MX DMA: do not initialize chan_id field
    dmaengine i.MX dma: check sg entries for valid addresses and lengths
    dmaengine i.MX dma: set maximum segment size for our device
    dmaengine i.MX SDMA: reserve channel 0 by not registering it
    dmaengine i.MX SDMA: initialize dma capabilities outside channel loop
    dmaengine i.MX SDMA: do not initialize chan_id field
    dmaengine i.MX sdma: check sg entries for valid addresses and lengths
    dmaengine i.MX sdma: set maximum segment size for our device
    DMA: PL08x: fix channel pausing to timeout rather than lockup
    DMA: PL08x: fix infinite wait when terminating transfers
    dmaengine: imx-sdma: fix inconsistent naming in sdma_assign_cookie()
    dmaengine: imx-sdma: propagate error in sdma_probe() instead of returning 0
    ...

    Linus Torvalds
     
  • * 'for-2.6.38' of git://linux-nfs.org/~bfields/linux:
    nfsd: break lease on unlink due to rename
    nfsd4: acquire only one lease per file
    nfsd4: modify fi_delegations under recall_lock
    nfsd4: remove unused deleg dprintk's.
    nfsd4: split lease setting into separate function
    nfsd4: fix leak on allocation error
    nfsd4: add helper function for lease setup
    nfsd4: split up nfsd_break_deleg_cb
    NFSD: memory corruption due to writing beyond the stat array
    NFSD: use nfserr for status after decode_cb_op_status
    nfsd: don't leak dentry count on mnt_want_write failure

    Linus Torvalds
     
  • …kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

    * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    Revert "lockdep, timer: Fix del_timer_sync() annotation"

    * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    timer debug: Hide kernel addresses via %pK in /proc/timer_list

    Linus Torvalds
     
  • …/git/tip/linux-2.6-tip

    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: Fix text_poke_smp_batch() deadlock
    perf tools: Fix thread_map event synthesizing in top and record
    watchdog, nmi: Lower the severity of error messages
    ARM: oprofile: Fix backtraces in timer mode
    oprofile: Fix usage of CONFIG_HW_PERF_EVENTS for oprofile_perf_init and friends

    Linus Torvalds
     
  • …git/tip/linux-2.6-tip

    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, dmi, debug: Log board name (when present) in dmesg/oops output
    x86, ioapic: Don't warn about non-existing IOAPICs if we have none
    x86: Fix mwait_usable section mismatch
    x86: Readd missing irq_to_desc() in fixup_irq()
    x86: Fix section mismatch in LAPIC initialization

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
    Input: matrix_keypad - increase the limit of rows and columns
    Input: wacom - fix error path in wacom_probe()
    Input: ads7846 - check proper condition when freeing gpio
    Revert "Input: do not pass injected events back to the originating handler"
    Input: sysrq - rework re-inject logic
    Input: serio - clear pending rescans after sysfs driver rebind
    Input: rotary_encoder - use proper irqflags
    Input: wacom_w8001 - report resolution to userland

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
    get rid of nameidata_dentry_drop_rcu() calling nameidata_drop_rcu()
    drop out of RCU in return_reval
    split do_revalidate() into RCU and non-RCU cases
    in do_lookup() split RCU and non-RCU cases of need_revalidate
    nothing in do_follow_link() is going to see RCU

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
    Btrfs: check return value of alloc_extent_map()
    Btrfs - Fix memory leak in btrfs_init_new_device()
    btrfs: prevent heap corruption in btrfs_ioctl_space_info()
    Btrfs: Fix balance panic
    Btrfs: don't release pages when we can't clear the uptodate bits
    Btrfs: fix page->private races

    Linus Torvalds
     

15 Feb, 2011

13 commits

  • task_show_regs used to be a debugging aid in the early bringup days
    of Linux on s390. /proc//status is a world readable file, it
    is not a good idea to show the registers of a process. The only
    correct fix is to remove task_show_regs.

    Reported-by: Al Viro
    Signed-off-by: Martin Schwidefsky
    Signed-off-by: Linus Torvalds

    Martin Schwidefsky
     
  • This reintroduces commit 47970b1b which was subsequently reverted
    as f00eaeea. The original change was broken and caused X startup
    failures and generally made privileged processes incapable of reading
    device dependent config space. The normal capable() interface returns
    true on success, but the LSM interface returns 0 on success. This thinko
    is now fixed in this patch, and has been confirmed to work properly.

    So, once again...Eric Paris noted that commit de139a3 ("pci: check caps
    from sysfs file open to read device dependent config space") caused the
    capability check to bypass security modules and potentially auditing.
    Rectify this by calling security_capable() when checking the open file's
    capabilities for config space reads.

    Reported-by: Eric Paris
    Tested-by: Dave Young
    Acked-by: James Morris
    Cc: Dave Airlie
    Cc: Alex Riesen
    Cc: Sedat Dilek
    Cc: Linus Torvalds
    Signed-off-by: Chris Wright
    Signed-off-by: James Morris

    Chris Wright
     
  • can't happen anymore and didn't work right anyway

    Signed-off-by: Al Viro

    Al Viro
     
  • ... thus killing the need to handle drop-from-RCU in d_revalidate()

    Signed-off-by: Al Viro

    Al Viro
     
  • fixing oopsen in lookup_one_len()

    Signed-off-by: Al Viro

    Al Viro
     
  • and use unlikely() instead of gotos, for fsck sake...

    Signed-off-by: Al Viro

    Al Viro
     
  • Signed-off-by: Al Viro

    Al Viro
     
  • The "Type 2" SMBIOS record that contains Board Name is not
    strictly required and may be absent in the SMBIOS on some
    platforms.

    ( Please note that Type 2 is not listed in Table 3 in Sec 6.2
    ("Required Structures and Data") of the SMBIOS v2.7
    Specification. )

    Use the Manufacturer Name (aka System Vendor) name.
    Print Board Name only when it is present.

    Before the fix:
    (i) dmesg output: DMI: /ProLiant DL380 G6, BIOS P62 01/29/2011
    (ii) oops output: Pid: 2170, comm: bash Not tainted 2.6.38-rc4+ #3 /ProLiant DL380 G6

    After the fix:
    (i) dmesg output: DMI: HP ProLiant DL380 G6, BIOS P62 01/29/2011
    (ii) oops output: Pid: 2278, comm: bash Not tainted 2.6.38-rc4+ #4 HP ProLiant DL380 G6

    Signed-off-by: Naga Chumbalkar
    Reviewed-by: Bjorn Helgaas
    Cc: # .3x - good for debugging, please apply as far back as it applies cleanly
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Naga Chumbalkar
     
  • mp_find_ioapic() prints errors like:

    ERROR: Unable to locate IOAPIC for GSI 13

    if it can't find the IOAPIC that manages that specific GSI. I
    see errors like that at every boot of a laptop that apparently
    doesn't have any IOAPICs.

    But if there are no IOAPICs it doesn't seem to be an error that
    none can be found. A solution that gets rid of this message is
    to directly return if nr_ioapics (still) is zero. (But keep
    returning -1 in that case, so nothing breaks from this change.)

    The call chain that generates this error is:

    pnpacpi_allocated_resource()
    case ACPI_RESOURCE_TYPE_IRQ:
    pnpacpi_parse_allocated_irqresource()
    acpi_get_override_irq()
    mp_find_ioapic()

    Signed-off-by: Paul Bolle
    Signed-off-by: Ingo Molnar

    Paul Bolle
     
  • …file into perf/urgent

    Ingo Molnar
     
  • The problematic boards have a recommended reference divider
    to be used when spread spectrum is enabled on the laptop panel.
    Enable the use of the recommended reference divider along with
    the new pll algo.

    v2: testing options

    v3: When using the fixed reference divider with LVDS, prefer
    min m to max p and use fractional feedback dividers.

    Fixes:
    https://bugzilla.kernel.org/show_bug.cgi?id=28852
    https://bugzilla.kernel.org/show_bug.cgi?id=24462
    https://bugzilla.kernel.org/show_bug.cgi?id=26552
    MacbookPro issues reported by Justin Mattock

    Signed-off-by: Alex Deucher
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie

    Alex Deucher
     
  • Prevent divider overflow.
    Fixes:
    https://bugzilla.kernel.org/show_bug.cgi?id=28932

    Signed-off-by: Alex Deucher
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie

    Alex Deucher
     
  • A few wrong usages of drm_device, which should be drm_driver.

    Signed-off-by: Xiao Jiang
    Signed-off-by: Dave Airlie

    Xiao Jiang