16 Jun, 2011

6 commits

  • Follow other MCi register defines. Plus define MCI_MISC_ADDR_LSB() and
    MCI_MISC_ADDR_MODE().

    Signed-off-by: Hidetoshi Seto
    Acked-by: Tony Luck
    Link: http://lkml.kernel.org/r/4DEED6E8.9090509@jp.fujitsu.com
    Signed-off-by: Borislav Petkov

    Hidetoshi Seto
     
  • The MCE handler uses a special vector for self IPI to invoke
    post-emergency processing in an interrupt context, e.g. call an
    NMI-unsafe function, wakeup loggers, schedule time-consuming work for
    recovery, etc.

    This mechanism is now generalized by the following commit:

    > e360adbe29241a0194e10e20595360dd7b98a2b3
    > Author: Peter Zijlstra
    > Date: Thu Oct 14 14:01:34 2010 +0800
    >
    > irq_work: Add generic hardirq context callbacks
    >
    > Provide a mechanism that allows running code in IRQ context. It is
    > most useful for NMI code that needs to interact with the rest of the
    > system -- like wakeup a task to drain buffers.
    :

    So change to use provided generic mechanism.

    Signed-off-by: Hidetoshi Seto
    Acked-by: Tony Luck
    Link: http://lkml.kernel.org/r/4DEED6B2.6080005@jp.fujitsu.com
    Signed-off-by: Borislav Petkov

    Hidetoshi Seto
     
  • More specifically:

    - sort bits in the macros
    - use BITCLR/BITSET
    - coordinate message pattern
    - use m for struct mce
    - cleanup for severities_debugfs_init()

    No functional change.

    Signed-off-by: Hidetoshi Seto
    Acked-by: Tony Luck
    Link: http://lkml.kernel.org/r/4DEED679.9090503@jp.fujitsu.com
    Signed-off-by: Borislav Petkov

    Hidetoshi Seto
     
  • The current format of an item in this table is:
    condition(param, ..., level, message [, condition2 ...])

    So we have to check both an item's head and tail to find the conditions
    which match the item.

    Format them in a more straight forward manner:
    item(level, message, condition [, condition2 ...])

    Signed-off-by: Hidetoshi Seto
    Acked-by: Tony Luck
    Link: http://lkml.kernel.org/r/4DEED61F.5010502@jp.fujitsu.com
    Signed-off-by: Borislav Petkov

    Hidetoshi Seto
     
  • The table looks very complicated and hard to read for people other than
    skilled developers. So let's clean it up a bit. At first, change format
    to ease reading elements in the table.

    Signed-off-by: Hidetoshi Seto
    Acked-by: Tony Luck
    Link: http://lkml.kernel.org/r/4DEED5EB.6050400@jp.fujitsu.com
    Signed-off-by: Borislav Petkov

    Hidetoshi Seto
     
  • The "Spurious not enabled" entry is redundant: the "Not enabled" entry
    earlier in the table will cover this case.

    The "Action required; unknown MCACOD" entry shouldn't specify MCACOD in
    the .mask field. Current code will only match for mcacod==0 rather than
    all AR=1 entries.

    Signed-off-by: Tony Luck
    Signed-off-by: Hidetoshi Seto
    Link: http://lkml.kernel.org/r/4DEED5BC.8030703@jp.fujitsu.com
    Signed-off-by: Borislav Petkov

    Tony Luck
     

15 Jun, 2011

10 commits

  • Fix kernel-doc warnings in signal.c:

    Warning(kernel/signal.c:2374): No description found for parameter 'nset'
    Warning(kernel/signal.c:2374): Excess function parameter 'set' description in 'sys_rt_sigprocmask'

    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • [ Also from Ben Hutchings and Vitaliy Ivanov
    ]

    Commit 06ae40ce073d ("x86 idle: EXPORT_SYMBOL(default_idle, pm_idle)
    only when APM demands it") removed the export for pm_idle/default_idle
    unless the apm module was modularised and CONFIG_APM_CPU_IDLE was set.

    But the apm module uses pm_idle/default_idle unconditionally,
    CONFIG_APM_CPU_IDLE only affects the bios idle threshold. Adjust the
    export accordingly.

    [ Used #ifdef instead of #if defined() as it's shorter, and what both
    Ben and Vitaliy used.. Andy, you're out-voted ;) - Linus ]

    Reported-by: Randy Dunlap
    Acked-by: Jiri Kosina
    Acked-by: Ingo Molnar
    Acked-by: Len Brown
    Signed-off-by: Andy Whitcroft
    Signed-off-by: Vitaliy Ivanov
    Signed-off-by: Ben Hutchings
    Signed-off-by: Linus Torvalds

    Andy Whitcroft
     
  • * 'for-linus-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
    m68k: use kernel processor defines for conditional optimizations
    m68knommu: create config options for CPU classes
    m68knommu: fix linker script exported name sections

    Linus Torvalds
     
  • …s/security-testing-2.6

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
    TOMOYO: Fix oops in tomoyo_mount_acl().

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6:
    avr32, exec: remove redundant set_fs(USER_DS)
    avr32: make intc_resume() return void to conform to syscore_ops
    avr32: add some more at91 to cpu.h definition
    avr32: set CONFIG_CC_OPTIMIZE_FOR_SIZE=y for all defconfigs
    avr32/at32ap: fix mapping of platform device id for USART
    avr32: fix use of non-existing portnr variable in at32_map_usart()

    Linus Torvalds
     
  • * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
    drm: Compare only lower 32 bits of framebuffer map offsets
    drm/i915: Don't leak in i915_gem_shmem_pread_slow()
    drm/radeon/kms: do bounds checking for 3D_LOAD_VBPNTR and bump array limit
    drm/radeon/kms: fix mac g5 quirk
    x86/uv/x2apic: update for change in pci bridge handling.
    alpha, drm: Remove obsolete Alpha support in MGA DRM code
    alpha/drm: Cleanup Alpha support in DRM generic code
    savage: remove unnecessary if statement
    drm/radeon: fix GUI idle IH debug statements
    drm/radeon/kms: check modes against max pixel clock
    drm: fix fbs in DRM_IOCTL_MODE_GETRESOURCES ioctl

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
    [CIFS] update cifs version to 1.73
    [CIFS] trivial cleanup fscache cFYI and cERROR messages
    cifs: correctly handle NULL tcon pointer in CIFSTCon
    cifs: show sec= option in /proc/mounts
    cifs: don't allow cifs_reconnect to exit with NULL socket pointer
    CIFS: Fix sparse error

    Linus Torvalds
     
  • * 'for-linus' of git://neil.brown.name/md:
    md/raid5: remove unusual use of bio_iovec_idx()
    md/raid5: fix FUA request handling in ops_run_io()
    md/raid5: fix raid5_set_bi_hw_segments
    md:Documentation/md.txt - fix typo
    md/bitmap: remove unused fields from struct bitmap
    md/bitmap: use proper accessor macro
    md: check ->hot_remove_disk when removing disk
    md: Using poll /proc/mdstat can monitor the events of adding a spare disks
    MD: use is_power_of_2 macro
    MD: raid5 do not set fullsync
    MD: support initial bitmap creation in-kernel
    MD: add sync_super to mddev_t struct
    MD: raid1 changes to allow use by device mapper
    MD: move thread wakeups into resume
    MD: possible typo
    MD: no sync IO while suspended
    MD: no integrity register if no gendisk

    Linus Torvalds
     
  • * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
    [CPUFREQ] Remove cpufreq_stats sysfs entries on module unload.
    MAINTAINERS: Update CPU FREQUENCY patterns

    Linus Torvalds
     
  • Signed-off-by: Steve French

    Steve French
     

14 Jun, 2011

24 commits

  • ... for uniformity and cleaner debug logs.

    Signed-off-by: Suresh Jayaraman
    Signed-off-by: Steve French

    Steve French
     
  • The address limit is already set in flush_old_exec() so this
    set_fs(USER_DS) is redundant.

    Signed-off-by: Mathias Krause
    Signed-off-by: Hans-Christian Egtvedt

    Mathias Krause
     
  • This patch removes the unneeded, and now wrong, return 0 from intc_resume() and
    lets the function return void instead. This matches the resume callback in
    struct syscore_ops.

    Signed-off-by: Hans-Christian Egtvedt

    Hans-Christian Egtvedt
     
  • Somme common drivers will need those at91 cpu_is_xxx() definitions.
    Those definitions are already in Linus' tree so if we want to use them
    in common drivers, we will need them in AVR32 cpu.h file.

    Signed-off-by: Nicolas Ferre
    Acked-by: Hans-Christian Egtvedt

    Nicolas Ferre
     
  • This patch makes sure the kconfig option CC_OPTIMIZE_FOR_SIZE is set to yes for
    all default configuration files. This ensures the kernel is optimized for size,
    and avoids potential relocation truncated to fit problems.

    Signed-off-by: Hans-Christian Egtvedt

    Hans-Christian Egtvedt
     
  • This patch will fix the mapping of the platform device id when mapping USART
    peripheral ID to UART platform device id. Not setting the platform device id
    will in most cases (when you map USART > 0 to UART 0) make the console not
    available.

    Signed-off-by: Hans-Christian Egtvedt

    Hans-Christian Egtvedt
     
  • This patch fixes the use of the non-existing portnr variable in
    at32_map_usart() to use the provided line number instead. Typo was introduced
    in commit 2b348e2f82f532e3aff8e0ce9293033b3294c1e0.

    Signed-off-by: Hans-Christian Egtvedt

    Hans-Christian Egtvedt
     
  • In tomoyo_mount_acl() since 2.6.36, kern_path() was called without checking
    dev_name != NULL. As a result, an unprivileged user can trigger oops by issuing
    mount(NULL, "/", "ext3", 0, NULL) request.
    Fix this by checking dev_name != NULL before calling kern_path(dev_name).

    Signed-off-by: Tetsuo Handa
    Cc: stable@kernel.org
    Signed-off-by: James Morris

    Tetsuo Handa
     
  • In the bio_for_each_segment loop, bvl always points current
    bio_vec, so the same as bio_iovec_idx(, i). Let's get rid of
    it.

    Cc: Dan Williams
    Signed-off-by: Namhyung Kim
    Signed-off-by: NeilBrown

    Namhyung Kim
     
  • Commit e9c7469bb4f5 ("md: implment REQ_FLUSH/FUA support")
    introduced R5_WantFUA flag and set rw to WRITE_FUA in that case.
    However remaining code still checks whether rw is exactly same
    as WRITE or not, so FUAed-write ends up with being treated as
    READ. Fix it.

    This bug has been present since 2.6.37 and the fix is suitable for any
    -stable kernel since then. It is not clear why this has not caused
    more problems.

    Cc: Tejun Heo
    Cc: stable@kernel.org
    Signed-off-by: Namhyung Kim
    Signed-off-by: NeilBrown

    Namhyung Kim
     
  • The @bio->bi_phys_segments consists of active stripes count in the
    lower 16 bits and processed stripes count in the upper 16 bits. So
    logical-OR operator should be bitwise one.

    This bug has been present since 2.6.27 and the fix is suitable for any
    -stable kernel since then. Fortunately the bad code is only used on
    error paths and is relatively unlikely to be hit.

    Cc: stable@kernel.org
    Signed-off-by: Namhyung Kim
    Signed-off-by: NeilBrown

    Namhyung Kim
     
  • Older m68k-linux compilers will include pre-defined symbols that
    confuse what processor it is being targeted for. For example gcc-4.1.2
    will pre-define __mc68020__ even if you specify the target processor
    as -m68000 on the gcc command line. Newer versions of gcc have this
    corrected.

    In a few places the m68k code uses defined(__mc68020__) for optimizations
    that include instructions that are specific to the CPU 68020 and above.
    When compiling with older compilers this will be true even when we have
    selected to compile for the older 68000 processors.

    Switch to using the kernel processor defines, CONFIG_M68020 and friends.

    Signed-off-by: Greg Ungerer

    Greg Ungerer
     
  • There are 3 families of CPU core types that we support in the m68knommu
    architecture branch. They are

    . traditional 68000
    . CPU32 (a 68020 core derivative without MMU or bitfield instructions)
    . ColdFire

    It will be useful going forward to have a CONFIG_ option defined for
    each type. We already have one for ColdFire (CONFIG_COLDFIRE), so add
    for the other 2 families, CONFIG_M68000 and CONFIG_MCPU32.

    Signed-off-by: Greg Ungerer

    Greg Ungerer
     
  • The recent commit titled "module: Sort exported symbols" (f02e8a65)
    changed the exported symbol name sections. Bring the m68knommu linker
    script into line with those changes - including the sorting of the
    symbol names.

    Signed-off-by: Greg Ungerer

    Greg Ungerer
     
  • Drivers using multiple framebuffers got broken by commit
    41c2e75e60200a860a74b7c84a6375c105e7437f which ignored the framebuffer
    (or register) map offset when looking for existing maps. The rationale
    was that the kernel-userspace ABI is fixed at a 32-bit offset, so the
    real offsets could not always be handed over for comparison.

    Instead of ignoring the offset we will compare the lower 32 bit. Drivers
    using multiple framebuffers should just make sure that the lower 32 bit
    are different. The existing drivers in question are practically limited
    to 32-bit systems so that should be fine for them.

    It is assumed that current drivers always specify a correct framebuffer
    map offset, even if this offset was ignored since above commit. So this
    patch should not change anything for drivers using only one framebuffer.

    Drivers needing multiple framebuffers with 64-bit map offsets will need
    to cook up something, for instance keeping an ID in the lower bit which
    is to be aligned away when it comes to using the offset.

    All of above applies to _DRM_REGISTERS as well.

    Signed-off-by: Tormod Volden
    Signed-off-by: Dave Airlie

    Tormod Volden
     
  • It seems to me that we are leaking 'user_pages' in
    drivers/gpu/drm/i915/i915_gem.c::i915_gem_shmem_pread_slow() if
    read_cache_page_gfp() fails.

    Signed-off-by: Jesper Juhl
    Signed-off-by: Chris Wilson
    Signed-off-by: Dave Airlie

    Jesper Juhl
     
  • To my knowledge, the limit is 16 on r300.
    (the docs don't say what the limit is)

    The lack of bounds checking can be abused to do all sorts of things
    (from bypassing parts of the CS checker to crashing the kernel).

    Bugzilla:
    https://bugs.freedesktop.org/show_bug.cgi?id=36745

    Cc: stable@kernel.org
    Signed-off-by: Marek Olšák
    Signed-off-by: Dave Airlie

    Marek Olšák
     
  • Apple uses the same subsystem pci ids for lots of
    hardware much of which is wired up differently. In
    this case, the G5 imac and the G5 tower.

    Only apply the quirk configuration to G5 towers.

    Reported-by: Joachim Henke
    Signed-off-by: Alex Deucher
    Cc: Joachim Henke
    Cc: Michel Dänzer
    Signed-off-by: Dave Airlie

    Alex Deucher
     
  • When I added 3448a19da479b6bd1e28e2a2be9fa16c6a6feb39
    I forgot about the special uv handling code for this, so this
    patch fixes it up.

    Acked-by: Jesse Barnes
    Acked-by: Ingo Molnar
    Signed-off-by: Dave Airlie

    Dave Airlie
     
  • Remove an obsolete Alpha adjustment in the drm for MGA on Alpha.

    Signed-off-by: Jay Estabrook
    Tested-by: Matt Turner
    Signed-off-by: Dave Airlie

    Jay Estabrook
     
  • Remove an obsolete Alpha adjustment, and modify another,
    to go with the current Alpha architecture support.

    Signed-off-by: Jay Estabrook
    Tested-by: Matt Turner
    Signed-off-by: Dave Airlie

    Jay Estabrook
     
  • the code always returns ret regardless, so if(ret) check is unnecessary.

    v2: fixed up the spelling.

    Signed-off-by: Greg Dietsche
    Reviewed-by: Nicolas Kaiser
    Signed-off-by: Dave Airlie

    Greg Dietsche
     
  • Linus Torvalds
     
  • Long ago (in commit 00e485b0), I added some code to handle share-level
    passwords in CIFSTCon. That code ignored the fact that it's legit to
    pass in a NULL tcon pointer when connecting to the IPC$ share on the
    server.

    This wasn't really a problem until recently as we only called CIFSTCon
    this way when the server returned -EREMOTE. With the introduction of
    commit c1508ca2 however, it gets called this way on every mount, causing
    an oops when share-level security is in effect.

    Fix this by simply treating a NULL tcon pointer as if user-level
    security were in effect. I'm not aware of any servers that protect the
    IPC$ share with a specific password anyway. Also, add a comment to the
    top of CIFSTCon to ensure that we don't make the same mistake again.

    Cc:
    Reported-by: Martijn Uffing
    Signed-off-by: Jeff Layton
    Signed-off-by: Steve French

    Jeff Layton