Eric Lee / smarc-fsl-linux-kernel

06 Oct, 2012

2 commits

  • 5f3d2f2e1   Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc ... Browse Code »

    Pull powerpc updates from Benjamin Herrenschmidt:
    "Some highlights in addition to the usual batch of fixes:

    - 64TB address space support for 64-bit processes by Aneesh Kumar

    - Gavin Shan did a major cleanup & re-organization of our EEH support
    code (IBM fancy PCI error handling & recovery infrastructure) which
    paves the way for supporting different platform backends, along
    with some rework of the PCIe code for the PowerNV platform in order
    to remove home made resource allocations and instead use the
    generic code (which is possible after some small improvements to it
    done by Gavin).

    - Uprobes support by Ananth N Mavinakayanahalli

    - A pile of embedded updates from Freescale folks, including new SoC
    and board supports, more KVM stuff including preparing for 64-bit
    BookE KVM support, ePAPR 1.1 updates, etc..."

    Fixup trivial conflicts in drivers/scsi/ipr.c

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (146 commits)
    powerpc/iommu: Fix multiple issues with IOMMU pools code
    powerpc: Fix VMX fix for memcpy case
    driver/mtd:IFC NAND:Initialise internal SRAM before any write
    powerpc/fsl-pci: use 'Header Type' to identify PCIE mode
    powerpc/eeh: Don't release eeh_mutex in eeh_phb_pe_get
    powerpc: Remove tlb batching hack for nighthawk
    powerpc: Set paca->data_offset = 0 for boot cpu
    powerpc/perf: Sample only if SIAR-Valid bit is set in P7+
    powerpc/fsl-pci: fix warning when CONFIG_SWIOTLB is disabled
    powerpc/mpc85xx: Update interrupt handling for IFC controller
    powerpc/85xx: Enable USB support in p1023rds_defconfig
    powerpc/smp: Do not disable IPI interrupts during suspend
    powerpc/eeh: Fix crash on converting OF node to edev
    powerpc/eeh: Lock module while handling EEH event
    powerpc/kprobe: Don't emulate store when kprobe stwu r1
    powerpc/kprobe: Complete kprobe and migrate exception frame
    powerpc/kprobe: Introduce a new thread flag
    powerpc: Remove unused __get_user64() and __put_user64()
    powerpc/eeh: Global mutex to protect PE tree
    powerpc/eeh: Remove EEH PE for normal PCI hotplug
    ...

    Linus Torvalds
     
  • dd0e981a6   sections: fix section conflicts in drivers/macintosh ... Browse Code »

    [akpm@linux-foundation.org: checkpatch fixes]
    Signed-off-by: Andi Kleen
    Cc: Benjamin Herrenschmidt
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andi Kleen
     

03 Oct, 2012

1 commit

  • 033d9959e   Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq ... Browse Code »

    Pull workqueue changes from Tejun Heo:
    "This is workqueue updates for v3.7-rc1. A lot of activities this
    round including considerable API and behavior cleanups.

    * delayed_work combines a timer and a work item. The handling of the
    timer part has always been a bit clunky leading to confusing
    cancelation API with weird corner-case behaviors. delayed_work is
    updated to use new IRQ safe timer and cancelation now works as
    expected.

    * Another deficiency of delayed_work was lack of the counterpart of
    mod_timer() which led to cancel+queue combinations or open-coded
    timer+work usages. mod_delayed_work[_on]() are added.

    These two delayed_work changes make delayed_work provide interface
    and behave like timer which is executed with process context.

    * A work item could be executed concurrently on multiple CPUs, which
    is rather unintuitive and made flush_work() behavior confusing and
    half-broken under certain circumstances. This problem doesn't
    exist for non-reentrant workqueues. While non-reentrancy check
    isn't free, the overhead is incurred only when a work item bounces
    across different CPUs and even in simulated pathological scenario
    the overhead isn't too high.

    All workqueues are made non-reentrant. This removes the
    distinction between flush_[delayed_]work() and
    flush_[delayed_]_work_sync(). The former is now as strong as the
    latter and the specified work item is guaranteed to have finished
    execution of any previous queueing on return.

    * In addition to the various bug fixes, Lai redid and simplified CPU
    hotplug handling significantly.

    * Joonsoo introduced system_highpri_wq and used it during CPU
    hotplug.

    There are two merge commits - one to pull in IRQ safe timer from
    tip/timers/core and the other to pull in CPU hotplug fixes from
    wq/for-3.6-fixes as Lai's hotplug restructuring depended on them."

    Fixed a number of trivial conflicts, but the more interesting conflicts
    were silent ones where the deprecated interfaces had been used by new
    code in the merge window, and thus didn't cause any real data conflicts.

    Tejun pointed out a few of them, I fixed a couple more.

    * 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (46 commits)
    workqueue: remove spurious WARN_ON_ONCE(in_irq()) from try_to_grab_pending()
    workqueue: use cwq_set_max_active() helper for workqueue_set_max_active()
    workqueue: introduce cwq_set_max_active() helper for thaw_workqueues()
    workqueue: remove @delayed from cwq_dec_nr_in_flight()
    workqueue: fix possible stall on try_to_grab_pending() of a delayed work item
    workqueue: use hotcpu_notifier() for workqueue_cpu_down_callback()
    workqueue: use __cpuinit instead of __devinit for cpu callbacks
    workqueue: rename manager_mutex to assoc_mutex
    workqueue: WORKER_REBIND is no longer necessary for idle rebinding
    workqueue: WORKER_REBIND is no longer necessary for busy rebinding
    workqueue: reimplement idle worker rebinding
    workqueue: deprecate __cancel_delayed_work()
    workqueue: reimplement cancel_delayed_work() using try_to_grab_pending()
    workqueue: use mod_delayed_work() instead of __cancel + queue
    workqueue: use irqsafe timer for delayed_work
    workqueue: clean up delayed_work initializers and add missing one
    workqueue: make deferrable delayed_work initializer names consistent
    workqueue: cosmetic whitespace updates for macro definitions
    workqueue: deprecate system_nrt[_freezable]_wq
    workqueue: deprecate flush[_delayed]_work_sync()
    ...

    Linus Torvalds
     

11 Sep, 2012

2 commits

05 Sep, 2012

1 commit

21 Aug, 2012

1 commit

  • 43829731d   workqueue: deprecate flush[_delayed]_work_sync() ... Browse Code »

    flush[_delayed]_work_sync() are now spurious. Mark them deprecated
    and convert all users to flush[_delayed]_work().

    If you're cc'd and wondering what's going on: Now all workqueues are
    non-reentrant and the regular flushes guarantee that the work item is
    not pending or running on any CPU on return, so there's no reason to
    use the sync flushes at all and they're going away.

    This patch doesn't make any functional difference.

    Signed-off-by: Tejun Heo
    Cc: Russell King
    Cc: Paul Mundt
    Cc: Ian Campbell
    Cc: Jens Axboe
    Cc: Mattia Dongili
    Cc: Kent Yoder
    Cc: David Airlie
    Cc: Jiri Kosina
    Cc: Karsten Keil
    Cc: Bryan Wu
    Cc: Benjamin Herrenschmidt
    Cc: Alasdair Kergon
    Cc: Mauro Carvalho Chehab
    Cc: Florian Tobias Schandinat
    Cc: David Woodhouse
    Cc: "David S. Miller"
    Cc: linux-wireless@vger.kernel.org
    Cc: Anton Vorontsov
    Cc: Sangbeom Kim
    Cc: "James E.J. Bottomley"
    Cc: Greg Kroah-Hartman
    Cc: Eric Van Hensbergen
    Cc: Takashi Iwai
    Cc: Steven Whitehouse
    Cc: Petr Vandrovec
    Cc: Mark Fasheh
    Cc: Christoph Hellwig
    Cc: Avi Kivity

    Tejun Heo
     

09 May, 2012

1 commit

03 May, 2012

2 commits

  • 43671cc96   powerpc/windfarm: don't pass const strings to snprintf ... Browse Code »

    Fixes these build warnings:

    drivers/macintosh/windfarm_smu_sat.c: In function 'wf_sat_probe':
    drivers/macintosh/windfarm_smu_sat.c:290:3: warning: passing argument 1 of 'snprintf' discards qualifiers from pointer target type
    include/linux/kernel.h:323:5: note: expected 'char *' but argument is of type 'const char *'
    drivers/macintosh/windfarm_smu_sat.c:317:3: warning: passing argument 1 of 'snprintf' discards qualifiers from pointer target type
    include/linux/kernel.h:323:5: note: expected 'char *' but argument is of type 'const char *'

    Introduced by commit e074d08e2b98 ("powerpc/windfarm: const'ify and add
    "priv" field to controls & sensors").

    Signed-off-by: Stephen Rothwell
    Signed-off-by: Benjamin Herrenschmidt

    Stephen Rothwell
     
  • ca7d593e0   powerpc/windfarm: fix compiler warning ... Browse Code »

    Fixes this warning:

    drivers/macintosh/windfarm_pm91.c: In function 'wf_smu_cpu_fans_tick':
    drivers/macintosh/windfarm_pm91.c:237:2: warning: passing argument 1 of 'wf_sensor_get' from incompatible pointer type
    drivers/macintosh/windfarm.h:124:19: note: expected 'struct wf_sensor *' but argument is of type 'struct wf_sensor **'

    Introduced by commit 33e6820b767a ("powerpc/windfarm: Add useful
    accessors").

    Signed-off-by: Stephen Rothwell
    Signed-off-by: Benjamin Herrenschmidt

    Stephen Rothwell
     

30 Apr, 2012

14 commits

29 Mar, 2012

1 commit

22 Mar, 2012

1 commit

  • f8974cb71   Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux-2.6 ... Browse Code »

    Pull core device tree changes for Linux v3.4 from Grant Likely:
    "This branch contains a minor documentation addition, a utility
    function for parsing string properties needed by some of the new ARM
    platforms, disables dynamic DT code that isn't used anywhere but on a
    few PPC machines, and exports DT node compatible data to userspace via
    UEVENT properties. Nothing earth shattering here."

    * tag 'dt-for-linus' of git://git.secretlab.ca/git/linux-2.6:
    of: Only compile OF_DYNAMIC on PowerPC pseries and iseries
    arm/dts: OMAP3: Add omap3evm and am335xevm support
    drivercore: Output common devicetree information in uevent
    of: Add of_property_match_string() to find index into a string list

    Linus Torvalds
     

21 Mar, 2012

1 commit

  • 69a7aebcf   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... Browse Code »

    Pull trivial tree from Jiri Kosina:
    "It's indeed trivial -- mostly documentation updates and a bunch of
    typo fixes from Masanari.

    There are also several linux/version.h include removals from Jesper."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (101 commits)
    kcore: fix spelling in read_kcore() comment
    constify struct pci_dev * in obvious cases
    Revert "char: Fix typo in viotape.c"
    init: fix wording error in mm_init comment
    usb: gadget: Kconfig: fix typo for 'different'
    Revert "power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c"
    writeback: fix fn name in writeback_inodes_sb_nr_if_idle() comment header
    writeback: fix typo in the writeback_control comment
    Documentation: Fix multiple typo in Documentation
    tpm_tis: fix tis_lock with respect to RCU
    Revert "media: Fix typo in mixer_drv.c and hdmi_drv.c"
    Doc: Update numastat.txt
    qla4xxx: Add missing spaces to error messages
    compiler.h: Fix typo
    security: struct security_operations kerneldoc fix
    Documentation: broken URL in libata.tmpl
    Documentation: broken URL in filesystems.tmpl
    mtd: simplify return logic in do_map_probe()
    mm: fix comment typo of truncate_inode_pages_range
    power: bq27x00: Fix typos in comment
    ...

    Linus Torvalds
     

16 Feb, 2012

1 commit

04 Feb, 2012

2 commits

02 Feb, 2012

1 commit

  • 07d57a32f   drivercore: Output common devicetree information in uevent ... Browse Code »

    When userspace needs to find a specific device, it currently isn't easy to
    resolve a /sys/devices/ path from a specific device tree node. Nor is it
    easy to obtain the compatible list for devices.

    This patch generalizes the code that inserts OF_* values into the uevent
    device attribute so that any device that is attached to an OF node will
    have that information exported to userspace. Without this patch only
    platform devices and some powerpc-specific busses have access to this
    data.

    The original function also creates a MODALIAS property for the compatible
    list, but that code has not been generalized into the common case because
    it has the potential to break module loading on a lot of bus types. Bus
    types are still responsible for their own MODALIAS properties.

    Boot tested on ARM and compile tested on PowerPC and SPARC.

    Signed-off-by: Grant Likely
    Acked-by: Greg Kroah-Hartman
    Cc: Tobias Klauser
    Cc: Frederic Lambert
    Cc: Rob Herring
    Cc: Mark Brown
    Cc: "David S. Miller"
    Cc: Benjamin Herrenschmidt

    Grant Likely
     

13 Jan, 2012

1 commit

08 Jan, 2012

1 commit

  • 7affca353   Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core ... Browse Code »

    * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (73 commits)
    arm: fix up some samsung merge sysdev conversion problems
    firmware: Fix an oops on reading fw_priv->fw in sysfs loading file
    Drivers:hv: Fix a bug in vmbus_driver_unregister()
    driver core: remove __must_check from device_create_file
    debugfs: add missing #ifdef HAS_IOMEM
    arm: time.h: remove device.h #include
    driver-core: remove sysdev.h usage.
    clockevents: remove sysdev.h
    arm: convert sysdev_class to a regular subsystem
    arm: leds: convert sysdev_class to a regular subsystem
    kobject: remove kset_find_obj_hinted()
    m86k: gpio - convert sysdev_class to a regular subsystem
    mips: txx9_sram - convert sysdev_class to a regular subsystem
    mips: 7segled - convert sysdev_class to a regular subsystem
    sh: dma - convert sysdev_class to a regular subsystem
    sh: intc - convert sysdev_class to a regular subsystem
    power: suspend - convert sysdev_class to a regular subsystem
    power: qe_ic - convert sysdev_class to a regular subsystem
    power: cmm - convert sysdev_class to a regular subsystem
    s390: time - convert sysdev_class to a regular subsystem
    ...

    Fix up conflicts with 'struct sysdev' removal from various platform
    drivers that got changed:
    - arch/arm/mach-exynos/cpu.c
    - arch/arm/mach-exynos/irq-eint.c
    - arch/arm/mach-s3c64xx/common.c
    - arch/arm/mach-s3c64xx/cpu.c
    - arch/arm/mach-s5p64x0/cpu.c
    - arch/arm/mach-s5pv210/common.c
    - arch/arm/plat-samsung/include/plat/cpu.h
    - arch/powerpc/kernel/sysfs.c
    and fix up cpu_is_hotpluggable() as per Greg in include/linux/cpu.h

    Linus Torvalds
     

07 Jan, 2012

1 commit

  • ff4b8a57f   Merge branch 'driver-core-next' into Linux 3.2 ... Browse Code »

    This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
    and it fixes the build error in the arch/x86/kernel/microcode_core.c
    file, that the merge did not catch.

    The microcode_core.c patch was provided by Stephen Rothwell
    who was invaluable in the merge issues involved
    with the large sysdev removal process in the driver-core tree.

    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     

22 Dec, 2011

1 commit

  • edbaa603e   driver-core: remove sysdev.h usage. ... Browse Code »

    The sysdev.h file should not be needed by any in-kernel code, so remove
    the .h file from these random files that seem to still want to include
    it.

    The sysdev code will be going away soon, so this include needs to be
    removed no matter what.

    Cc: Jiandong Zheng
    Cc: Scott Branden
    Cc: Russell King
    Cc: Kukjin Kim
    Cc: David Brown
    Cc: Daniel Walker
    Cc: Bryan Huntsman
    Cc: Ben Dooks
    Cc: Wan ZongShun
    Cc: Haavard Skinnemoen
    Cc: Hans-Christian Egtvedt
    Cc: Guan Xuetao
    Cc: "Venkatesh Pallipadi
    Cc: Thomas Gleixner
    Cc: Ingo Molnar
    Cc: "H. Peter Anvin"
    Cc: Grant Likely
    Cc: Richard Purdie
    Cc: Matthew Garrett
    Signed-off-by: Kay Sievers

    Kay Sievers
     

20 Dec, 2011

1 commit

15 Dec, 2011

1 commit

06 Dec, 2011

1 commit

  • 3292beb34   sched/accounting: Change cpustat fields to an array ... Browse Code »
    43

    This patch changes fields in cpustat from a structure, to an
    u64 array. Math gets easier, and the code is more flexible.

    Signed-off-by: Glauber Costa
    Reviewed-by: KAMEZAWA Hiroyuki
    Cc: Linus Torvalds
    Cc: Andrew Morton
    Cc: Paul Tuner
    Signed-off-by: Peter Zijlstra
    Link: http://lkml.kernel.org/r/1322498719-2255-2-git-send-email-glommer@parallels.com
    Signed-off-by: Ingo Molnar

    Glauber Costa
     

09 Nov, 2011

1 commit

21 Jul, 2011

1 commit