10 Jun, 2013

5 commits

  • When the user does:
    echo 0 > /sys/devices/system/cpu/cpu1/online
    echo 1 > /sys/devices/system/cpu/cpu1/online

    kmemleak reports:
    kmemleak: 7 new suspected memory leaks (see /sys/kernel/debug/kmemleak)

    unreferenced object 0xffff88003fa51260 (size 32):
    comm "swapper/0", pid 1, jiffies 4294667339 (age 1027.789s)
    hex dump (first 32 bytes):
    73 70 69 6e 6c 6f 63 6b 31 00 00 00 00 00 00 00 spinlock1.......
    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
    backtrace:
    [] kmemleak_alloc+0x21/0x50
    [] __kmalloc_track_caller+0xec/0x2a0
    [] kvasprintf+0x5b/0x90
    [] kasprintf+0x38/0x40
    [] xen_init_lock_cpu+0x61/0xbe
    [] xen_cpu_up+0x66/0x3e8
    [] _cpu_up+0xd1/0x14b
    [] cpu_up+0xd9/0xec
    [] smp_init+0x4b/0xa3
    [] kernel_init_freeable+0xdb/0x1e6
    [] kernel_init+0x9/0xf0
    [] ret_from_fork+0x7c/0xb0
    [] 0xffffffffffffffff

    Instead of doing it like the "xen/smp: Don't leak interrupt name when offlining"
    patch did (which has a per-cpu structure which contains both the
    IRQ number and char*) we use a per-cpu pointers to a *char.

    The reason is that the "__this_cpu_read(lock_kicker_irq);" macro
    blows up with "__bad_size_call_parameter()" as the size of the
    returned structure is not within the parameters of what it expects
    and optimizes for.

    Signed-off-by: Konrad Rzeszutek Wilk

    Konrad Rzeszutek Wilk
     
  • When the user does:
    echo 0 > /sys/devices/system/cpu/cpu1/online
    echo 1 > /sys/devices/system/cpu/cpu1/online

    kmemleak reports:
    kmemleak: 7 new suspected memory leaks (see /sys/kernel/debug/kmemleak)

    unreferenced object 0xffff88003fa51240 (size 32):
    comm "swapper/0", pid 1, jiffies 4294667339 (age 1027.789s)
    hex dump (first 32 bytes):
    72 65 73 63 68 65 64 31 00 00 00 00 00 00 00 00 resched1........
    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
    backtrace:
    [] kmemleak_alloc+0x21/0x50
    [] __kmalloc_track_caller+0xec/0x2a0
    [] kvasprintf+0x5b/0x90
    [] kasprintf+0x38/0x40
    [] xen_smp_intr_init+0x41/0x2c0
    [] xen_cpu_up+0x393/0x3e8
    [] _cpu_up+0xd1/0x14b
    [] cpu_up+0xd9/0xec
    [] smp_init+0x4b/0xa3
    [] kernel_init_freeable+0xdb/0x1e6
    [] kernel_init+0x9/0xf0
    [] ret_from_fork+0x7c/0xb0
    [] 0xffffffffffffffff

    This patch fixes some of it by using the 'struct xen_common_irq->name'
    field to stash away the char so that it can be freed when
    the interrupt line is destroyed.
    Signed-off-by: Konrad Rzeszutek Wilk

    Konrad Rzeszutek Wilk
     
  • When we free it we want to make sure to set it to a default
    value of -1 so that we don't double-free it (in case somebody
    calls us twice).

    Signed-off-by: Konrad Rzeszutek Wilk

    Konrad Rzeszutek Wilk
     
  • This patch adds a new structure to contain the common two things
    that each of the per-cpu interrupts need:
    - an interrupt number,
    - and the name of the interrupt (to be added in 'xen/smp: Don't leak
    interrupt name when offlining').

    This allows us to carry the tuple of the per-cpu interrupt data structure
    and expand it as we need in the future.

    Signed-off-by: Konrad Rzeszutek Wilk

    Konrad Rzeszutek Wilk
     
  • There are two functions that do a bunch of 'free_irq' on
    the per_cpu IRQ. Instead of having duplicate code just move
    it to one function.

    This is just code movement.

    Signed-off-by: Konrad Rzeszutek Wilk

    Konrad Rzeszutek Wilk
     

29 May, 2013

1 commit

  • Commit f447d56d36af18c5104ff29dcb1327c0c0ac3634 introduced the
    implementation of the PV apic ipi interface. But there were some
    odd things (it seems none of which cause really any issue but
    maybe they should be cleaned up anyway):
    - xen_send_IPI_mask_allbutself (and by that xen_send_IPI_allbutself)
    ignore the passed in vector and only use the CALL_FUNCTION_SINGLE
    vector. While xen_send_IPI_all and xen_send_IPI_mask use the vector.
    - physflat_send_IPI_allbutself is declared unnecessarily. It is never
    used.

    This patch tries to clean up those things.

    Signed-off-by: Stefan Bader
    Signed-off-by: Konrad Rzeszutek Wilk

    Stefan Bader
     

12 May, 2013

3 commits

  • …nux/kernel/git/konrad/xen

    Pull Xen bug-fixes from Konrad Rzeszutek Wilk:
    - More fixes in the vCPU PVHVM hotplug path.
    - Add more documentation.
    - Fix various ARM related issues in the Xen generic drivers.
    - Updates in the xen-pciback driver per Bjorn's updates.
    - Mask the x2APIC feature for PV guests.

    * tag 'stable/for-linus-3.10-rc0-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen/pci: Used cached MSI-X capability offset
    xen/pci: Use PCI_MSIX_TABLE_BIR, not PCI_MSIX_FLAGS_BIRMASK
    xen: clear IRQ_NOAUTOEN and IRQ_NOREQUEST
    xen: mask x2APIC feature in PV
    xen: SWIOTLB is only used on x86
    xen/spinlock: Fix check from greater than to be also be greater or equal to.
    xen/smp/pvhvm: Don't point per_cpu(xen_vpcu, 33 and larger) to shared_info
    xen/vcpu: Document the xen_vcpu_info and xen_vcpu
    xen/vcpu/pvhvm: Fix vcpu hotplugging hanging.

    Linus Torvalds
     
  • Pull idle update from Len Brown:
    "Add support for new Haswell-ULT CPU idle power states"

    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
    intel_idle: initial C8, C9, C10 support
    tools/power turbostat: display C8, C9, C10 residency

    Linus Torvalds
     
  • Pull audit changes from Eric Paris:
    "Al used to send pull requests every couple of years but he told me to
    just start pushing them to you directly.

    Our touching outside of core audit code is pretty straight forward. A
    couple of interface changes which hit net/. A simple argument bug
    calling audit functions in namei.c and the removal of some assembly
    branch prediction code on ppc"

    * git://git.infradead.org/users/eparis/audit: (31 commits)
    audit: fix message spacing printing auid
    Revert "audit: move kaudit thread start from auditd registration to kaudit init"
    audit: vfs: fix audit_inode call in O_CREAT case of do_last
    audit: Make testing for a valid loginuid explicit.
    audit: fix event coverage of AUDIT_ANOM_LINK
    audit: use spin_lock in audit_receive_msg to process tty logging
    audit: do not needlessly take a lock in tty_audit_exit
    audit: do not needlessly take a spinlock in copy_signal
    audit: add an option to control logging of passwords with pam_tty_audit
    audit: use spin_lock_irqsave/restore in audit tty code
    helper for some session id stuff
    audit: use a consistent audit helper to log lsm information
    audit: push loginuid and sessionid processing down
    audit: stop pushing loginid, uid, sessionid as arguments
    audit: remove the old depricated kernel interface
    audit: make validity checking generic
    audit: allow checking the type of audit message in the user filter
    audit: fix build break when AUDIT_DEBUG == 2
    audit: remove duplicate export of audit_enabled
    Audit: do not print error when LSMs disabled
    ...

    Linus Torvalds
     

11 May, 2013

3 commits

  • Pull stray syscall bits from Al Viro:
    "Several syscall-related commits that were missing from the original"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:
    switch compat_sys_sysctl to COMPAT_SYSCALL_DEFINE
    unicore32: just use mmap_pgoff()...
    unify compat fanotify_mark(2), switch to COMPAT_SYSCALL_DEFINE
    x86, vm86: fix VM86 syscalls: use SYSCALL_DEFINEx(...)

    Linus Torvalds
     
  • Pull misc fixes from David Woodhouse:
    "This is some miscellaneous cleanups that don't really belong anywhere
    else (or were ignored), that have been sitting in linux-next for some
    time. Two of them are fixes resulting from my audit of krealloc()
    usage that don't seem to have elicited any response when I posted
    them, and the other three are patches from Artem removing dead code."

    * tag 'for-linus-20130509' of git://git.infradead.org/~dwmw2/random-2.6:
    pcmcia: remove RPX board stuff
    m68k: remove rpxlite stuff
    pcmcia: remove Motorola MBX860 support
    params: Fix potential memory leak in add_sysfs_param()
    dell-laptop: Fix krealloc() misuse in parse_da_table()

    Linus Torvalds
     
  • Pull kvm fixes from Gleb Natapov:
    "Most of the fixes are in the emulator since now we emulate more than
    we did before for correctness sake we see more bugs there, but there
    is also an OOPS fixed and corruption of xcr0 register."

    * tag 'kvm-3.10-2' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
    KVM: emulator: emulate SALC
    KVM: emulator: emulate XLAT
    KVM: emulator: emulate AAM
    KVM: VMX: fix halt emulation while emulating invalid guest sate
    KVM: Fix kvm_irqfd_init initialization
    KVM: x86: fix maintenance of guest/host xcr0 state

    Linus Torvalds
     

10 May, 2013

28 commits

  • Pull MIPS updates from Ralf Baechle:

    - More work on DT support for various platforms

    - Various fixes that were to late to make it straight into 3.9

    - Improved platform support, in particular the Netlogic XLR and
    BCM63xx, and the SEAD3 and Malta eval boards.

    - Support for several Ralink SOC families.

    - Complete support for the microMIPS ASE which basically reencodes the
    existing MIPS32/MIPS64 ISA to use non-constant size instructions.

    - Some fallout from LTO work which remove old cruft and will generally
    make the MIPS kernel easier to maintain and resistant to compiler
    optimization, even in absence of LTO.

    - KVM support. While MIPS has announced hardware virtualization
    extensions this KVM extension uses trap and emulate mode for
    virtualization of MIPS32. More KVM work to add support for VZ
    hardware virtualizaiton extensions and MIPS64 will probably already
    be merged for 3.11.

    Most of this has been sitting in -next for a long time. All defconfigs
    have been build or run time tested except three for which fixes are being
    sent by other maintainers.

    Semantic conflict with kvm updates done as per Ralf

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (118 commits)
    MIPS: Add new GIC clockevent driver.
    MIPS: Formatting clean-ups for clocksources.
    MIPS: Refactor GIC clocksource code.
    MIPS: Move 'gic_frequency' to common location.
    MIPS: Move 'gic_present' to common location.
    MIPS: MIPS16e: Add unaligned access support.
    MIPS: MIPS16e: Support handling of delay slots.
    MIPS: MIPS16e: Add instruction formats.
    MIPS: microMIPS: Optimise 'strnlen' core library function.
    MIPS: microMIPS: Optimise 'strlen' core library function.
    MIPS: microMIPS: Optimise 'strncpy' core library function.
    MIPS: microMIPS: Optimise 'memset' core library function.
    MIPS: microMIPS: Add configuration option for microMIPS kernel.
    MIPS: microMIPS: Disable LL/SC and fix linker bug.
    MIPS: microMIPS: Add vdso support.
    MIPS: microMIPS: Add unaligned access support.
    MIPS: microMIPS: Support handling of delay slots.
    MIPS: microMIPS: Add support for exception handling.
    MIPS: microMIPS: Floating point support.
    MIPS: microMIPS: Fix macro naming in micro-assembler.
    ...

    Linus Torvalds
     
  • Pull second set of arc arch updates from Vineet Gupta:
    "Aliasing VIPT dcache support for ARC

    I'm satisified with testing, specially with fuse which has
    historically given grief to VIPT arches (ARM/PARISC...)"

    * tag 'arc-v3.10-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
    ARC: [TB10x] Remove GENERIC_GPIO
    ARC: [mm] Aliasing VIPT dcache support 4/4
    ARC: [mm] Aliasing VIPT dcache support 3/4
    ARC: [mm] Aliasing VIPT dcache support 2/4
    ARC: [mm] Aliasing VIPT dcache support 1/4
    ARC: [mm] refactor the core (i|d)cache line ops loops
    ARC: [mm] serious bug in vaddr based icache flush

    Linus Torvalds
     
  • Pull m68knommu updates from Greg Ungerer:
    "The bulk of the changes are generalizing the ColdFire v3 core support
    and adding in 537x CPU support. Also a couple of other bug fixes, one
    to fix a reintroduction of a past bug in the romfs filesystem nommu
    support."

    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
    m68knommu: enable Timer on coldfire 532x
    m68knommu: fix ColdFire 5373/5329 QSPI base address
    m68knommu: add support for configuring a Freescale M5373EVB board
    m68knommu: add support for the ColdFire 537x family of CPUs
    m68knommu: make ColdFire M532x platform support more v3 generic
    m68knommu: create and use a common M53xx ColdFire class of CPUs
    m68k: remove unused asm/dbg.h
    m68k: Set ColdFire ACR1 cache mode depending on kernel configuration
    romfs: fix nommu map length to keep inside filesystem
    m68k: clean up unused "config ROMVECSIZE"

    Linus Torvalds
     
  • Pull blackfin updates from Steven Miao.

    * tag 'for-linus' of git://github.com/realmz/blackfin-linux:
    bfin cache: dcplb map: add 16M dcplb map for BF60x
    blackfin: smp: fix smp build after drop asm/system.h
    blackfin: fix bootup core clock and system clock display
    Platform Nand: Set the GPIO for NAND read as input
    blackfin: rename vmImage to uImage after we move to buildroot
    blackfin: twi: Remove bogus #endif
    bf609: rsi: Add bf609 rsi MMR macro and board platform data.
    blackfin: dmc: Improve DDR2 write through in DMC effict controller.

    Linus Torvalds
     
  • Pull microblaze updates from Michal Simek.

    * 'next' of git://git.monstr.eu/linux-2.6-microblaze:
    microblaze: Enable IRQ in arch_cpu_idle
    microblaze: Fix uaccess_ok macro
    microblaze: Add support for new cpu versions and target architecture
    microblaze: Do not select OPT_LIB_ASM by default
    microblaze: Fix initrd support
    microblaze: Do not use r6 in head.S
    microblaze: pci: Remove duplicated header
    microblaze: Set the default irq_domain
    microblaze: pci: Remove duplicated include from pci-common.c

    Linus Torvalds
     
  • We now cache the MSI-X capability offset in the struct pci_dev, so no
    need to find the capability again.

    Acked-by: Jan Beulich
    Signed-off-by: Bjorn Helgaas
    CC: Konrad Rzeszutek Wilk
    Signed-off-by: Konrad Rzeszutek Wilk

    Bjorn Helgaas
     
  • PCI_MSIX_FLAGS_BIRMASK is mis-named because the BIR mask is in the
    Table Offset register, not the flags ("Message Control" per spec)
    register.

    Acked-by: Jan Beulich
    Signed-off-by: Bjorn Helgaas
    CC: Konrad Rzeszutek Wilk
    Signed-off-by: Konrad Rzeszutek Wilk

    Bjorn Helgaas
     
  • This tracks Alexandre Courbot's mainline GPIO rework

    Signed-off-by: Vineet Gupta
    Acked-by: Alexandre Courbot

    Vineet Gupta
     
  • Pull ARM SoC fixes and straggler patches from Olof Johansson:
    "A collection of fixes for fall out from 3.10 merge window, some build
    fixes and warning cleanups and a small handful of patches that were
    small and contained and made sense to still include in 3.10 (some of
    these have also been in -next since the merge window opened).

    Largest continous series is for OMAP, but there's a handful for other
    platforms.

    For i.MX, one of the patches are framebuffer fixups due to fallout
    during the merge window, and the other removes some stale and broken
    code."

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (34 commits)
    ARM: exynos: dts: Fixed vbus-gpios
    ARM: EXYNOS5: Fix kernel dump in AFTR idle mode
    ARM: ux500: Rid ignored return value of regulator_enable() compiler warning
    ARM: ux500: read the correct soc_id number
    ARM: exynos: dts: cros5250: add cyapa trackpad
    video: mxsfb: Adapt to new videomode API
    ARM: imx: Select GENERIC_ALLOCATOR
    ARM: imx: compile fix for hotplug.c
    ARM: dts: don't assume boards are using twl4030 for omap3
    ARM: OMAP2+: Remove bogus IS_ERR_OR_NULL checking from id.c
    ARM: dts: Configure and fix the McSPI pins for 4430sdp
    ARM: dts: AM33XX: Add GPMC node
    ARM: dts: OMAP4460: Fix CPU OPP voltages
    ARM: dts: OMAP36xx: Fix CPU OPP voltages
    ARM: OMAP4+: omap2plus_defconfig: Enable audio via TWL6040 as module
    ARM: OMAP2: AM33XX: id: Add support for new AM335x PG2.1 Si
    omap: mux: add AM/DM37x gpios
    ARM: OMAP1: DMA: fix error handling in omap1_system_dma_init()
    ARM: OMAP2+: omap_device: use late_initcall_sync
    ARM: OMAP: RX-51: change probe order of touchscreen and panel SPI devices
    ...

    Linus Torvalds
     
  • Pull xtensa updates from Chris Zankel:
    "Support for the latest MMU architecture that allows for a larger
    accessible memory region, and various bug-fixes"

    * tag 'xtensa-next-20130508' of git://github.com/czankel/xtensa-linux:
    xtensa: Switch to asm-generic/linkage.h
    xtensa: fix redboot load address
    xtensa: ISS: fix timer_lock usage in rs_open
    xtensa: disable IRQs while IRQ handler is running
    xtensa: enable lockdep support
    xtensa: fix arch_irqs_disabled_flags implementation
    xtensa: add irq flags trace support
    xtensa: provide custom CALLER_ADDR* implementations
    xtensa: add stacktrace support
    xtensa: clean up stpill_registers
    xtensa: don't use a7 in simcalls
    xtensa: don't attempt to use unconfigured timers
    xtensa: provide default platform_pcibios_init implementation
    xtensa: remove KCORE_ELF again
    xtensa: document MMUv3 setup sequence
    xtensa: add MMU v3 support
    xtensa: fix ibreakenable register update
    xtensa: fix oprofile building as module

    Linus Torvalds
     
  • Pull ARC port updates from Vineet Gupta:
    "Support for two new platforms based on ARC700:
    - Abilis TB10x SoC [Chritisian/Pierrick]
    - Simulator only System-C Model [Mischa]

    ARC specific MM improvements:
    - Avoid full TLB flush (ASID increment) on munmap (even single page)
    - VIPT Cache Flushing improvements
    + Delayed dcache flush for non-aliasing dcache (big performance boost)
    + icache flush aliasing agnostic (no need to kill all possible aliases)

    Others:
    - Avoid needless rebuild of DTB files for every kernel build
    - Remove builtin cmdline as that is already provided by DeviceTree/bootargs
    - Fixing unaligned access emulation corner case
    - checkpatch fixes [Sachin]
    - Various fixlets [Noam]
    - Minor build failures/cleanups"

    * tag 'arc-v3.10-rc1-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: (35 commits)
    ARC: [mm] Lazy D-cache flush (non aliasing VIPT)
    ARC: [mm] micro-optimize page size icache invalidate
    ARC: [mm] remove the pessimistic all-alias-invalidate icache helpers
    ARC: [mm] consolidate icache/dcache sync code
    ARC: [mm] optimise icache flush for kernel mappings
    ARC: [mm] optimise icache flush for user mappings
    ARC: [mm] optimize needless full mm TLB flush on munmap
    ARC: Add support for nSIM OSCI System C model
    ARC: [TB10x] Adapt device tree to new compatible string
    ARC: [TB10x] Add support for TB10x platform
    ARC: [TB10x] Device tree of TB100 and TB101 Development Kits
    ARC: Prepare interrupt code for external controllers
    ARC: Allow embedded arc-intc to be properly placed in DT intc hierarchy
    ARC: [cmdline] Don't overwrite u-boot provided bootargs
    ARC: [cmdline] Remove CONFIG_CMDLINE
    ARC: [plat-arcfpga] defconfig update
    ARC: unaligned access emulation broken if callee-reg dest of LD/ST
    ARC: unaligned access emulation error handling consolidation
    ARC: Debug/crash-printing Improvements
    ARC: fix typo with clock speed
    ...

    Linus Torvalds
     
  • Pull tile update from Chris Metcalf:
    "The interesting bug fix is support for the upcoming "4.2" release of
    the Tilera hypervisor, which by default launches Linux at privilege
    level 2 instead of 1. The fix lets new and old hypervisors and
    Linuxes interoperate more smoothly, so I've tagged it for
    stable@kernel.org so that older Linuxes will be able to boot under the
    newer hypervisor."

    * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
    usb: tilegx: fix memleak when create hcd fail
    arch/tile: remove inline marking of EXPORT_SYMBOL functions
    rtc: rtc-tile: add missing platform_device_unregister() when module exit
    tile: support new Tilera hypervisor

    Linus Torvalds
     
  • Pull more vfs fixes from Al Viro:
    "Regression fix from Geert + yet another open-coded kernel_read()"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
    ecryptfs: don't open-code kernel_read()
    xtensa simdisk: Fix proc_create_data() conversion fallout

    Linus Torvalds
     
  • The 'samsung,vbus-gpio' was submitted before pinmux landed for
    exynos5250 and uses the old-style gpio specifier. Fix the two
    exynos5250 boards that use it.

    Signed-off-by: Doug Anderson
    Signed-off-by: Olof Johansson

    Doug Anderson
     
  • The kernel crashes while resuming from AFTR idle mode. It happens
    because L2 cache was not going into retention state.

    This patch configures the USE_RETENTION bit of ARM_L2_OPTION register
    so that it does not depend on MANUAL_L2RSTDISABLE_CONTROL of
    ARM_COMMON_OPTION register for L2RSTDISABLE signal.

    Signed-off-by: Inderpal Singh
    Tested-by: Chander Kashyap
    Signed-off-by: Olof Johansson

    Inderpal Singh
     
  • …/scm/linux/kernel/git/tmlind/linux-omap into fixes

    From Tony Lindgren:
    Omap device tree fixes for issue discovered during the merge window:

    - Fix triggering for GPIO interrupts that's needed for 4430sdp
    Ethernet. Otherwise booting with nfsroot won't work.
    - Fix CPU operating point values
    - Fix wrong assumption that twl PMIC is always connected to omap3
    - Add gpmc for am33xx so beaglebone users can use the bus
    - Cosmetic fix for mcspi pin muxing to avoid confusion

    * tag 'omap-for-v3.10/dt-fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
    ARM: dts: don't assume boards are using twl4030 for omap3
    ARM: dts: Configure and fix the McSPI pins for 4430sdp
    ARM: dts: AM33XX: Add GPMC node
    ARM: dts: OMAP4460: Fix CPU OPP voltages
    ARM: dts: OMAP36xx: Fix CPU OPP voltages
    ARM: dts: OMAP4: Fix ethernet IRQ for OMAP4 boards

    Olof Johansson
     
  • …pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

    From Tony Lindgren:
    Omap fixes for things that were discovered during the merge window:

    - Few GPMC fixes and binding doc updates noted after sending
    pull requests for the GPMC branch.
    - Board fixes for beagle usb host and rx51 spi probe order
    - SoC fixes dt earlyprintk, omap1 dma and omap2+ id.c error
    handling fixes

    Then few minor things that are not strictly fixes but are good
    to get out of the way:

    - Add missing legacy mux registers for am/dm73x gpio
    - Add detection for am33xx pg2.1 silicon
    - Enable twl4030 audio modules in defconfig

    * tag 'omap-for-v3.10/fixes-for-merge-window-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
    ARM: OMAP2+: Remove bogus IS_ERR_OR_NULL checking from id.c
    ARM: OMAP4+: omap2plus_defconfig: Enable audio via TWL6040 as module
    ARM: OMAP2: AM33XX: id: Add support for new AM335x PG2.1 Si
    omap: mux: add AM/DM37x gpios
    ARM: OMAP1: DMA: fix error handling in omap1_system_dma_init()
    ARM: OMAP2+: omap_device: use late_initcall_sync
    ARM: OMAP: RX-51: change probe order of touchscreen and panel SPI devices
    ARM: OMAP3: Beagle: Fix USB Host on beagle xM Ax/Bx
    ARM: OMAP2+: only WARN if a GPMC child probe function fail
    ARM: OMAP2+: only search for GPMC DT child nodes on probe
    Documentation: dt: update properties in TI GPMC NAND example
    Documentation: dt: update TI GPMC ethernet binding properties

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     
  • arch/arm/mach-ux500/board-mop500.c: In function ‘mop500_prox_activate’:
    arch/arm/mach-ux500/board-mop500.c:406:18: warning: ignoring return value of
    ‘regulator_enable’, declared with attribute warn_unused_result
    [-Wunused-result]

    Signed-off-by: Lee Jones
    Signed-off-by: Linus Walleij
    Signed-off-by: Olof Johansson

    Lee Jones
     
  • Fix db8500_read_soc_id() to read all five soc_id number locations
    instead of repeating the second one two times.

    Signed-off-by: Fabio Baltieri
    Signed-off-by: Linus Walleij
    Signed-off-by: Olof Johansson

    Fabio Baltieri
     
  • Trivial patch, adding the i2c Cypress trackpad used on Snow.

    Signed-off-by: Olof Johansson
    Reviewed-by: Doug Anderson
    Acked-by: Kukjin Kim

    Olof Johansson
     
  • Since commit 657eee7 (media: coda: use genalloc API) the following build
    error happens with imx_v4_v5_defconfig:

    drivers/built-in.o: In function 'coda_remove':
    clk-composite.c:(.text+0x112180): undefined reference to 'gen_pool_free'
    drivers/built-in.o: In function 'coda_probe':
    clk-composite.c:(.text+0x112310): undefined reference to 'of_get_named_gen_pool'
    clk-composite.c:(.text+0x1123f4): undefined reference to 'gen_pool_alloc'
    clk-composite.c:(.text+0x11240c): undefined reference to 'gen_pool_virt_to_phys'
    clk-composite.c:(.text+0x112458): undefined reference to 'dev_get_gen_pool'

    Select GENERIC_ALLOCATOR and get rid of the custom IRAM_ALLOC.

    Signed-off-by: Fabio Estevam
    Signed-off-by: Shawn Guo
    Signed-off-by: Olof Johansson

    Fabio Estevam
     
  • Commit bca7a5a (ARM: cpu hotplug: remove majority of cache flushing
    from platforms) removes include of and hence
    discovers a few indirect inclusion and declaration problems as below.

    CC arch/arm/mach-imx/hotplug.o
    In file included from arch/arm/mach-imx/hotplug.c:16:0:
    arch/arm/mach-imx/common.h:100:29: warning: ‘struct pt_regs’ declared inside parameter list [enabled by default]
    arch/arm/mach-imx/common.h:100:29: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]
    arch/arm/mach-imx/common.h:101:29: warning: ‘struct pt_regs’ declared inside parameter list [enabled by default]
    arch/arm/mach-imx/hotplug.c: In function ‘imx_cpu_die’:
    arch/arm/mach-imx/hotplug.c:53:2: error: implicit declaration of function ‘cpu_do_idle’ [-Werror=implicit-function-declaration]
    arch/arm/mach-imx/hotplug.c: In function ‘imx_cpu_kill’:
    arch/arm/mach-imx/hotplug.c:58:26: error: ‘jiffies’ undeclared (first use in this function)
    arch/arm/mach-imx/hotplug.c:58:26: note: each undeclared identifier is reported only once for each function it appears in
    arch/arm/mach-imx/hotplug.c:58:2: error: implicit declaration of function ‘msecs_to_jiffies’ [-Werror=implicit-function-declaration]
    arch/arm/mach-imx/hotplug.c:61:3: error: implicit declaration of function ‘time_after’ [-Werror=implicit-function-declaration]

    Fix them by adding the needed inclusion and declaration.

    Signed-off-by: Shawn Guo
    Acked-by: Arnd Bergmann
    Acked-by: Uwe Kleine-König
    Signed-off-by: Olof Johansson

    Shawn Guo
     
  • * late/fixes:
    ARM: OMAP2+: Fix unmet direct dependencies for SERIAL_OMAP
    ARM: ux500: always select ABX500_CORE
    ARM: SIRF: select SMP_ON_UP only on SMP builds
    ARM: SPEAr: conditionalize l2x0 support
    ARM: imx: build CPU suspend code only when needed
    ARM: OMAP: build SMP code only for OMAP4/5
    ARM: tegra: Tegra114 needs CPU_FREQ_TABLE
    ARM: default machine descriptor for multiplatform

    Signed-off-by: Olof Johansson

    Olof Johansson
     
  • Signed-off-by: Al Viro

    Al Viro
     
  • Signed-off-by: Al Viro

    Al Viro
     
  • EXPORT_SYMBOL and inline directives are contradictory to each other.
    The patch fixes this inconsistency.

    Found by Linux Driver Verification project (linuxtesting.org).

    Signed-off-by: Denis Efremov
    Signed-off-by: Chris Metcalf

    Denis Efremov
     
  • Signed-off-by: Al Viro

    Al Viro
     
  • Pull PCI updates from Bjorn Helgaas:
    "MSI:
    PCI: Set ->mask_pos correctly
    Hotplug:
    PCI: Delay final fixups until resources are assigned
    Moorestown:
    x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0"

    * tag 'pci-v3.10-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
    PCI: Delay final fixups until resources are assigned
    x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0
    PCI: Set ->mask_pos correctly

    Linus Torvalds