03 Jun, 2014

18 commits

  • abx500_dump_all_banks() has no callers in the kernel, so it's probably
    safe to remove it.

    Cc: Linus Walleij
    Signed-off-by: Lee Jones

    Lee Jones
     
  • Update the addresses and names to match current silicon.
    The WM8997 regmap tables have been adjusted to match the new
    names.
    Missing registers have been added to WM5110 default value table.

    Signed-off-by: Richard Fitzgerald
    Signed-off-by: Lee Jones

    Richard Fitzgerald
     
  • This just updates include/linux/mfd/cros_ec_commands.h to match the
    latest EC version (which is the One True Source for such things). See

    [dianders: took today's ToT version from the Chromium OS EC; deleted
    references to cros_ec_dev and cros_ec_lpc since those aren't upstream
    yet]

    Signed-off-by: Bill Richardson
    Signed-off-by: Doug Anderson
    Reviewed-by: Simon Glass
    Tested-by: Andrew Bresticker
    Tested-by: Stephen Warren
    Signed-off-by: Lee Jones

    Bill Richardson
     
  • This adds a driver for the Atmel Microcontroller found on the
    iPAQ h3xxx series. This device handles some keys, the
    touchscreen, and the battery monitoring.

    This is a port of a driver from handhelds.org 2.6.21 kernel,
    written by Alessandro Gardich based on Andrew Christians
    original HAL-driver. It has been heavily cleaned and
    converted to mfd-core by Dmitry Artamonow and rewritten
    again for the v3.x series kernels by Linus Walleij,
    bringing back some of the functionality lost from Andrew's
    original driver.

    Acked-by: Greg Kroah-Hartman
    Signed-off-by: Alessandro Gardich
    Signed-off-by: Dmitry Artamonow
    Signed-off-by: Linus Walleij
    Signed-off-by: Lee Jones

    Linus Walleij
     
  • commit df73de9b0d412 ("mfd: syscon: Return -ENOSYS if CONFIG_MFD_SYSCON
    is not enabled") introduced fallbacks for APIs, but missed out on adding
    the header file. This would work only if linux/err.h is also included
    in the source code from where this file is included. It would be better
    to include linux/err.h in file to remove possible build errors.

    Without this patch, we get following and similar build errors if this
    header file is included in some source file and CONFIG_MFD_SYSCON is
    not enabled.

    include/linux/mfd/syscon.h: In function ‘syscon_node_to_regmap’:
    include/linux/mfd/syscon.h:30:2: error: implicit declaration of function ‘ERR_PTR’ [-Werror=implicit-function-declaration]
    return ERR_PTR(-ENOSYS);
    ^
    include/linux/mfd/syscon.h:30:18: error: ‘ENOSYS’ undeclared (first use in this function)
    return ERR_PTR(-ENOSYS);
    ^
    Signed-off-by: Tushar Behera
    Signed-off-by: Lee Jones

    Tushar Behera
     
  • This patch introduces the preliminary support for PMICs X-Powers AXP202
    and AXP209. The AXP209 and AXP202 are the PMUs (Power Management Unit)
    used by A10, A13 and A20 SoCs and developed by X-Powers, a sister company
    of Allwinner.

    The core enables support for two subsystems:
    - PEK (Power Enable Key)
    - Regulators

    Signed-off-by: Carlo Caione
    Signed-off-by: Lee Jones

    Carlo Caione
     
  • The pm8xxx read/write wrappers are no longer necessary now that
    all the sub-device drivers are using the regmap API. Remove it.

    Signed-off-by: Stephen Boyd
    Signed-off-by: Lee Jones

    Stephen Boyd
     
  • The device type was stored in sec_pmic_dev state container twice:
    - unsigned long type (initialized from of_device_id or i2c_device_id)
    - int device_type (initialized as above or from board files when there
    is no DTS)

    The 'type' field was never used outside of probe so it can be safely
    removed.

    Change also the device_type in sec_pmic_dev and sec_platform_data to
    unsigned long to avoid any casts.

    Signed-off-by: Krzysztof Kozlowski
    Signed-off-by: Lee Jones

    Krzysztof Kozlowski
     
  • In certain boards the source for the clk32k clock can be gated. In these
    boards the clk32k clock can be provided to the driver and it is going to be
    enabled/disabled when it is needed.
    If the clk32k clock is not provided the driver will assume that it is always
    running.

    Signed-off-by: Peter Ujfalusi
    Signed-off-by: Lee Jones

    Peter Ujfalusi
     
  • All boards using twl6040 configures the i2c bus to 400KHz. While twl6040's
    defaults to normal mode (100KHz). So far twl6040 has no problem with i2c
    communication in this configuration it is safer to select fast i2c mode.

    Signed-off-by: Peter Ujfalusi
    Signed-off-by: Lee Jones

    Peter Ujfalusi
     
  • The valid gpio is GPIO0 ~ GPIO58, so ngpio should be 59.
    This patch also renames RDC321X_MAX_GPIO to RDC321X_NUM_GPIO because it
    actually means the number of available GPIOs.

    Signed-off-by: Axel Lin
    Acked-by: Linus Walleij
    Signed-off-by: Lee Jones

    Axel Lin
     
  • Update the documentation for sec_pmic state container structure to
    reflect current code.

    Signed-off-by: Krzysztof Kozlowski
    Signed-off-by: Lee Jones

    Krzysztof Kozlowski
     
  • The rtc-s5m driver does not support all of S2M and S5M chipsets
    supported by main MFD sec-core driver. For such chipsets unsupported by
    rtc-s5m, the MFD sec-core driver initialized regmap with default config.
    This config in such cases wouldn't work at all.

    The main MFD sec-core driver shouldn't initialize regmap for child
    drivers which is not used by them and even not valid.

    Move the allocation of RTC I2C dummy device and initialization of RTC
    regmap from main MFD sec-core driver to the rtc-s5m driver. The rtc-s5m
    driver will use proper regmap config for supported devices.

    Signed-off-by: Krzysztof Kozlowski
    Acked-by: Alessandro Zummo
    Signed-off-by: Lee Jones

    Krzysztof Kozlowski
     
  • The *rdev[] is not used since commit 413be59e2f333
    "regulator: tps65218: Remove unnecessary regulator_unregister call".

    Signed-off-by: Axel Lin
    Signed-off-by: Lee Jones

    Axel Lin
     
  • Signed-off-by: Alexander Shiyan
    Signed-off-by: Lee Jones

    Alexander Shiyan
     
  • On systems with CONFIG_FRAME_WARN=1024, compiler warns the allocation of
    an object of struct device on stack. Make the allocation dynamically to
    fix the warning. Also change the caller's return type to int so as to
    account for error handling.

    drivers/mfd/abx500-core.c: In function ‘abx500_dump_all_banks’:
    drivers/mfd/abx500-core.c:167:1: warning: the frame size of 1032 bytes
    is larger than 1024 bytes [-Wframe-larger-than=]

    Signed-off-by: Aurabindo J
    Signed-off-by: Lee Jones

    Jay Aurabind
     
  • This patch adds attributes to the Kontron PLD driver to allow
    applications to retrieve firmware information.
    Additionally the format has been changed to conform with the
    representation in other Kontron software.

    Signed-off-by: Michael Brunner
    Reviewed-by: Guenter Roeck
    Signed-off-by: Lee Jones

    Michael Brunner
     
  • Lee Jones
     

27 May, 2014

1 commit


26 May, 2014

1 commit

  • The TPS658640 has a different set of output voltage for most LDO and
    the RTC LDO isn't settable. This chip also report 2 different version
    ID, as the datasheet doesn't list the possible values the second ID
    has simply been named TPS658640v2.

    Signed-off-by: Alban Bedel
    Signed-off-by: Mark Brown

    Alban Bedel
     

23 May, 2014

1 commit


22 May, 2014

1 commit

  • Pull renameat2 arch support from Miklos Szeredi:
    "I've collected architecture patches for the renameat2 syscall that
    maintainers acked and/or asked me to queue.

    This adds architecture support for the renameat2 syscall to m68k,
    parisc, ia64 and through asm-generic to arc, arm64, c6x, hexagon,
    metag, openrisc, score, tile, unicore32"

    * 'renameat2' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
    scripts/checksyscalls.sh: Make renameat optional
    asm-generic: Add renameat2 syscall
    ia64: add renameat2 syscall
    parisc: add renameat2 syscall
    m68k: add renameat2 syscall

    Linus Torvalds
     

21 May, 2014

3 commits

  • Pull driver core fixes from Greg KH:
    "Here are two driver core (well, sysfs) fixes for 3.15-rc6 that resolve
    some reported issues and a regression from 3.13"

    * tag 'driver-core-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
    sysfs: make sure read buffer is zeroed
    kernfs, sysfs, cgroup: restrict extra perm check on open to sysfs

    Linus Torvalds
     
  • Pull more cgroup fixes from Tejun Heo:
    "Three more patches to fix cgroup_freezer breakage due to the recent
    cgroup internal locking changes - an operation cgroup_freezer was
    using now requires sleepable context and cgroup_freezer was invoking
    that while holding a spin lock. cgroup_freezer was using an overly
    elaborate hierarchical locking scheme.

    While it's possible to convert the hierarchical spinlocks directly to
    mutexes, this patch simplifies the overall locking so that it uses a
    global mutex. This has the added benefit of avoiding iterating
    potentially huge number of tasks under a spinlock. While the patch is
    on the larger side in the devel cycle, the changes made are mostly
    straight-forward and the locking logic is a lot simpler afterwards"

    * 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
    cgroup: fix rcu_read_lock() leak in update_if_frozen()
    cgroup_freezer: replace freezer->lock with freezer_mutex
    cgroup: introduce task_css_is_root()

    Linus Torvalds
     
  • Pull device tree fixes from Grant Likely:
    "Drivercore bugfixes for v3.15

    This branch contains bug fixes important to get into v3.15. There is
    a fix for modifying properties seen during early boot, a fix for an
    incorrect prototype when CONFIG_OF=n, and a couple of corrections to
    device tree memory nodes on a few platforms"

    * tag 'dt-for-linus' of git://git.secretlab.ca/git/linux:
    mips: dts: Fix missing device_type="memory" property in memory nodes
    arm: dts: Fix missing device_type="memory" for ste-ccu8540
    of: fix CONFIG_OF=n prototype of of_node_full_name()
    of: make of_update_property() usable earlier in the boot process

    Linus Torvalds
     

20 May, 2014

4 commits

  • Add the renameat2 syscall to the generic syscall list, which is used by the
    following architectures: arc, arm64, c6x, hexagon, metag, openrisc, score,
    tile, unicore32.

    Signed-off-by: James Hogan
    Acked-by: Arnd Bergmann
    Signed-off-by: Miklos Szeredi
    Cc: linux-arch@vger.kernel.org
    Cc: Vineet Gupta
    Cc: Catalin Marinas
    Cc: Will Deacon
    Cc: linux-arm-kernel@lists.infradead.org
    Cc: Mark Salter
    Cc: Aurelien Jacquiot
    Cc: Richard Kuo
    Cc: linux-hexagon@vger.kernel.org
    Cc: linux-metag@vger.kernel.org
    Cc: Jonas Bonn
    Cc: Chen Liqin
    Cc: Lennox Wu
    Cc: Chris Metcalf
    Cc: Guan Xuetao

    James Hogan
     
  • Pull MIPS fixes from Ralf Baechle:
    "MIPS fixes for various loose ends:

    - Fix workarounds for R4000 erratum.
    - Patch up DEC, Siemens-Nixdorf and Loongson hardware support.
    - Wire up renameat2 syscall.
    - Delete unused file - it was causing false warnings from maintenance
    scripts.
    - Revert a patch because it's functionality is now implemented twice
    which causes superfluous /proc/cpuinfo output.
    - Fix a microMIPS regression"

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
    MIPS: mm: Fix broken microMIPS kernel regression.
    MIPS: Add new AUDIT_ARCH token for the N32 ABI on MIPS64
    MIPS: Wire up renameat2 syscall.
    MIPS: inst.h: Rename BITFIELD_FIELD to __BITFIELD_FIELD.
    MIPS: Remove file missed when removing rm9k support a while ago.
    MIPS/loongson2_cpufreq: Fix CPU clock rate setting
    MIPS: Loongson: No need to select GENERIC_HARDIRQS_NO__DO_IRQ
    MIPS: csum_partial.S CPU_DADDI_WORKAROUNDS bug fix
    MIPS: __strncpy_from_user_asm CPU_DADDI_WORKAROUNDS bug fix
    MIPS: __delay CPU_DADDI_WORKAROUNDS bug fix
    MIPS: DEC/SNI: O32 wrapper stack switching fixes
    MIPS: DEC: Bus error handler fixes
    MAINTAINERS: TURBOchannel: Update entry
    Revert "MIPS: MT: proc: Add support for printing VPE and TC ids"

    Linus Torvalds
     
  • Pull Metag architecture and related fixes from James Hogan:
    "Mostly fixes for metag and parisc relating to upgrowing stacks.

    - Fix missing compiler barriers in metag memory barriers.
    - Fix BUG_ON on metag when RLIMIT_STACK hard limit is increased
    beyond safe value.
    - Make maximum stack size configurable. This reduces the default
    user stack size back to 80MB (especially on parisc after their
    removal of _STK_LIM_MAX override). This only affects metag and
    parisc.
    - Remove metag _STK_LIM_MAX override to match other arches and follow
    parisc, now that it is safe to do so (due to the BUG_ON fix
    mentioned above).
    - Finally now that both metag and parisc _STK_LIM_MAX overrides have
    been removed, it makes sense to remove _STK_LIM_MAX altogether"

    * tag 'metag-for-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
    asm-generic: remove _STK_LIM_MAX
    metag: Remove _STK_LIM_MAX override
    parisc,metag: Do not hardcode maximum userspace stack size
    metag: Reduce maximum stack size to 256MB
    metag: fix memory barriers

    Linus Torvalds
     
  • Pull irq fixes from Thomas Gleixner:
    "Two small updates from the irq departement:

    - Provide missing inline stub for a SMP only function

    - Add sub-maintainer for the drivers/irqchip/ part of the irq
    subsystem. YAY!"

    * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    MAINTAINERS: Add co-maintainer for drivers/irqchip
    genirq: Provide irq_force_affinity fallback for non-SMP

    Linus Torvalds
     

15 May, 2014

2 commits

  • Make the CONFIG_OF=n prototpe of of_node_full_name() mateh the CONFIG_OF=y
    version.

    Fixes compile warnings like this:

    sound/soc/soc-core.c: In function 'soc_check_aux_dev':
    sound/soc/soc-core.c:1667:3: warning: passing argument 1 of 'of_node_full_name' discards 'const' qualifier from pointer target type [enabled by default]
    codecname = of_node_full_name(aux_dev->codec_of_node);

    when CONFIG_OF is not defined.

    Signed-off-by: Stephen Rothwell
    Signed-off-by: Grant Likely

    Stephen Rothwell
     
  • _STK_LIM_MAX could be used to override the RLIMIT_STACK hard limit from
    an arch's include/uapi/asm-generic/resource.h file, but is no longer
    used since both parisc and metag removed the override. Therefore remove
    it entirely, setting the hard RLIMIT_STACK limit to RLIM_INFINITY
    directly in include/asm-generic/resource.h.

    Signed-off-by: James Hogan
    Cc: Arnd Bergmann
    Cc: linux-arch@vger.kernel.org
    Cc: Helge Deller
    Cc: John David Anglin

    James Hogan
     

14 May, 2014

1 commit

  • A MIPS64 kernel may support ELF files for all 3 MIPS ABIs
    (O32, N32, N64). Furthermore, the AUDIT_ARCH_MIPS{,EL}64 token
    does not provide enough information about the ABI for the 64-bit
    process. As a result of which, userland needs to use complex
    seccomp filters to decide whether a syscall belongs to the o32 or n32
    or n64 ABI. Therefore, a new arch token for MIPS64/n32 is added so it
    can be used by seccomp to explicitely set syscall filters for this ABI.

    Signed-off-by: Markos Chandras
    Acked-by: Eric Paris
    Acked-by: Paul Moore
    Cc: Andy Lutomirski
    Cc: Ralf Baechle
    Cc: Andy Lutomirski
    Cc: linux-mips@linux-mips.org
    Link: http://sourceforge.net/p/libseccomp/mailman/message/32239040/
    Patchwork: https://patchwork.linux-mips.org/patch/6818/
    Signed-off-by: Ralf Baechle

    Markos Chandras
     

13 May, 2014

3 commits

  • Determining the css of a task usually requires RCU read lock as that's
    the only thing which keeps the returned css accessible till its
    reference is acquired; however, testing whether a task belongs to the
    root can be performed without dereferencing the returned css by
    comparing the returned pointer against the root one in init_css_set[]
    which never changes.

    Implement task_css_is_root() which can be invoked in any context.
    This will be used by the scheduled cgroup_freezer change.

    v2: cgroup no longer supports modular controllers. No need to export
    init_css_set. Pointed out by Li.

    Signed-off-by: Tejun Heo
    Acked-by: Li Zefan

    Tejun Heo
     
  • The kernfs open method - kernfs_fop_open() - inherited extra
    permission checks from sysfs. While the vfs layer allows ignoring the
    read/write permissions checks if the issuer has CAP_DAC_OVERRIDE,
    sysfs explicitly denied open regardless of the cap if the file doesn't
    have any of the UGO perms of the requested access or doesn't implement
    the requested operation. It can be debated whether this was a good
    idea or not but the behavior is too subtle and dangerous to change at
    this point.

    After cgroup got converted to kernfs, this extra perm check also got
    applied to cgroup breaking libcgroup which opens write-only files with
    O_RDWR as root. This patch gates the extra open permission check with
    a new flag KERNFS_ROOT_EXTRA_OPEN_PERM_CHECK and enables it for sysfs.
    For sysfs, nothing changes. For cgroup, root now can perform any
    operation regardless of the permissions as it was before kernfs
    conversion. Note that kernfs still fails unimplemented operations
    with -EINVAL.

    While at it, add comments explaining KERNFS_ROOT flags.

    Signed-off-by: Tejun Heo
    Reported-by: Andrey Wagin
    Tested-by: Andrey Wagin
    Cc: Li Zefan
    References: http://lkml.kernel.org/g/CANaxB-xUm3rJ-Cbp72q-rQJO5mZe1qK6qXsQM=vh0U8upJ44+A@mail.gmail.com
    Fixes: 2bd59d48ebfb ("cgroup: convert to kernfs")
    Signed-off-by: Greg Kroah-Hartman

    Tejun Heo
     
  • Pull ARM SoC fixes from Olof Johansson:
    "Seems like we've had more fixes than usual this release cycle, but
    there's nothing in particular that we're doing differently. Perhaps
    it's just one of those cycles where more people are finding more
    regressions (and/or that the latency of when people actually test
    what's been in the tree for a while is catching up so that we get the
    bug reports now).

    The bigger changes here are are for TI and Marvell platforms:
    * Timing changes for GPMC (generic localbus) on OMAP causing some
    largeish DTS deltas.
    * Fixes to window allocation on PCI for mvebu touching drivers/
    stuff. Patches have acks from subsystem maintainers where needed.
    * A fix from Thomas for a botched DT conversion in drivers/edma.

    There's a handful of other fixes for the above platforms as well as
    sunxi, at91, i.MX. I also included a MAINTAINER update for Broadcom,
    and a trivial move of a binding doc.

    I know you said you'd be offline this week, but I might as well post
    it for when you return. :)"

    I'm not quite offline yet. Doing a few pulls in the last hour before my
    internet goes away..

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (31 commits)
    MAINTAINERS: update Broadcom ARM tree location and add an SoC family
    ARM: dts: i.MX53: Fix ipu register space size
    ARM: dts: kirkwood: fix mislocated pcie-controller nodes
    ARM: sunxi: Enable GMAC in sunxi_defconfig
    ARM: common: edma: Fix xbar mapping
    ARM: sun7i: Fix i2c4 base address
    ARM: Kirkwood: T5325: Fix double probe of Codec
    ARM: mvebu: enable the SATA interface on Armada 375 DB
    ARM: mvebu: specify I2C bus frequency on Armada 370 DB
    ARM: mvebu: use qsgmii phy-mode for Armada XP GP interfaces
    ARM: mvebu: fix NOR bus-width in Armada XP OpenBlocks AX3 Device Tree
    ARM: mvebu: fix NOR bus-width in Armada XP DB Device Tree
    ARM: mvebu: fix NOR bus-width in Armada XP GP Device Tree
    ARM: dts: AM3517: Disable absent IPs inherited from OMAP3
    ARM: dts: OMAP2: Fix interrupts for OMAP2420 mailbox
    ARM: dts: OMAP5: Add mailbox dt node to fix boot warning
    ARM: OMAP5: Switch to THUMB mode if needed on secondary CPU
    ARM: dts: am437x-gp-evm: Do not reset gpio5
    ARM: dts: omap3-igep0020: use SMSC9221 timings
    PCI: mvebu: split PCIe BARs into multiple MBus windows when needed
    ...

    Linus Torvalds
     

10 May, 2014

1 commit

  • Pull x86 fixes from Peter Anvin:
    "A somewhat unpleasantly large collection of small fixes. The big ones
    are the __visible tree sweep and a fix for 'earlyprintk=efi,keep'. It
    was using __init functions with predictably suboptimal results.

    Another key fix is a build fix which would produce output that simply
    would not decompress correctly in some configuration, due to the
    existing Makefiles picking up an unfortunate local label and mistaking
    it for the global symbol _end.

    Additional fixes include the handling of 64-bit numbers when setting
    the vdso data page (a latent bug which became manifest when i386
    started exporting a vdso with time functions), a fix to the new MSR
    manipulation accessors which would cause features to not get properly
    unblocked, a build fix for 32-bit userland, and a few new platform
    quirks"

    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    x86, vdso, time: Cast tv_nsec to u64 for proper shifting in update_vsyscall()
    x86: Fix typo in MSR_IA32_MISC_ENABLE_LIMIT_CPUID macro
    x86: Fix typo preventing msr_set/clear_bit from having an effect
    x86/intel: Add quirk to disable HPET for the Baytrail platform
    x86/hpet: Make boot_hpet_disable extern
    x86-64, build: Fix stack protector Makefile breakage with 32-bit userland
    x86/reboot: Add reboot quirk for Certec BPC600
    asmlinkage: Add explicit __visible to drivers/*, lib/*, kernel/*
    asmlinkage, x86: Add explicit __visible to arch/x86/*
    asmlinkage: Revert "lto: Make asmlinkage __visible"
    x86, build: Don't get confused by local symbols
    x86/efi: earlyprintk=efi,keep fix

    Linus Torvalds
     

09 May, 2014

3 commits

  • The STMPE has VCC and VIO supply lines, and sometimes (as on
    Ux500) this comes from a software-controlled regulator. Make
    it possible to supply the STMPE with power from these
    regulators.

    Signed-off-by: Linus Walleij

    Linus Walleij
     
  • …l/git/rostedt/linux-trace

    Pull tracing fixes from Steven Rostedt:
    "This contains two fixes.

    The first is a long standing bug that causes bogus data to show up in
    the refcnt field of the module_refcnt tracepoint. It was introduced
    by a merge conflict resolution back in 2.6.35-rc days.

    The result should be 'refcnt = incs - decs', but instead it did
    'refcnt = incs + decs'.

    The second fix is to a bug that was introduced in this merge window
    that allowed for a tracepoint funcs pointer to be used after it was
    freed. Moving the location of where the probes are released solved
    the problem"

    * tag 'trace-fixes-v3.15-rc4-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
    tracepoint: Fix use of tracepoint funcs after rcu free
    trace: module: Maintain a valid user count

    Linus Torvalds
     
  • Pull mmc/rtsx revert from Lee Jones.

    * tag 'mfd-mmc-fixes-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
    mmc: rtsx: Revert "mmc: rtsx: add support for pre_req and post_req"

    Linus Torvalds
     

08 May, 2014

1 commit

  • The replacement of the 'count' variable by two variables 'incs' and
    'decs' to resolve some race conditions during module unloading was done
    in parallel with some cleanup in the trace subsystem, and was integrated
    as a merge.

    Unfortunately, the formula for this replacement was wrong in the tracing
    code, and the refcount in the traces was not usable as a result.

    Use 'count = incs - decs' to compute the user count.

    Link: http://lkml.kernel.org/p/1393924179-9147-1-git-send-email-romain.izard.pro@gmail.com

    Acked-by: Ingo Molnar
    Cc: Rusty Russell
    Cc: Frederic Weisbecker
    Cc: stable@vger.kernel.org # 2.6.35
    Fixes: c1ab9cab7509 "merge conflict resolution"
    Signed-off-by: Romain Izard
    Signed-off-by: Steven Rostedt

    Romain Izard