08 Feb, 2012

2 commits

  • fbdev fixes for 3.3

    It includes:
    - compile fix for fsl-diu-fb
    - fix for a suspend/resume issue in atmel_lcdfb
    - fix for a suspend/resume issue in OMAP
    - workaround for a hardware bug to avoid physical damage in OMAP
    - really trivial dead code removal in intelfb

    * tag 'fbdev-fixes-for-3.3-1' of git://github.com/schandinat/linux-2.6:
    atmel_lcdfb: fix usage of CONTRAST_CTR in suspend/resume
    intelfb: remove some dead code
    drivers/video: compile fixes for fsl-diu-fb.c
    OMAPDSS: HDMI: PHY burnout fix
    OMAP: 4430SDP/Panda: add HDMI HPD gpio
    OMAP: 4430SDP/Panda: setup HDMI GPIO muxes
    OMAPDSS: remove wrong HDMI HPD muxing
    OMAP: 4430SDP/Panda: rename HPD GPIO to CT_CP_HPD
    OMAP: 4430SDP/Panda: use gpio_free_array to free HDMI gpios
    OMAPDSS: use sync versions of pm_runtime_put

    Linus Torvalds
     
  • arch: fix ioport mapping on mips,sh

    Kevin Cernekee reported that recent cleanup that replaced pci_iomap with
    a generic function failed to take into account the differences in io
    port handling on mips and sh architectures.

    Rather than revert the changes reintroducing the code duplication, this
    patchset fixes this by adding ability for architectures to override
    ioport mapping for pci devices.

    Signed-off-by: Michael S. Tsirkin

    * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
    sh: use the the PCI channels's io_map_base
    mips: use the the PCI controller's io_map_base
    lib: add NO_GENERIC_PCI_IOPORT_MAP

    Linus Torvalds
     

07 Feb, 2012

1 commit

  • Fixing a regression with the PMU MSRs when PMU virtualization is
    disabled, a guest-internal DoS with the SYSCALL instruction, and a dirty
    memory logging race that may cause live migration to fail.

    * 'kvm-updates/3.3' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
    KVM: do not #GP on perf MSR writes when vPMU is disabled
    KVM: x86: fix missing checks in syscall emulation
    KVM: x86: extend "struct x86_emulate_ops" with "get_cpuid"
    KVM: Fix __set_bit() race in mark_page_dirty() during dirty logging

    Linus Torvalds
     

05 Feb, 2012

5 commits

  • arm-soc fixes for 3.3-rc

    * A series of OMAP regression fixes for merge window fallout
    * Two patches for Davinci, one removes some misdefined clocks, the other
    is a regression fix for merge window fallout
    * Two patches that makes Broadcom bcmring build again (and removes a
    bunch of unused code in the process)

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: bcmring: fix build failure in mach-bcmring/arch.c
    ARM: bcmring: remove unused DMA map code
    ARM: davinci: update mdio bus name
    ARM: OMAP2+: arch/arm/mach-omap2/smartreflex.c: add missing iounmap
    ARM: OMAP2+: arch/arm/mach-omap2/devices.c: introduce missing kfree
    ARM: OMAP: fix MMC2 loopback clock handling
    ARM: OMAP: fix erroneous mmc2 clock change on mmc3 setup
    ARM: OMAP2+: GPMC: fix device size setup
    ARM: OMAP2+: timer: Fix crash due to wrong arg to __omap_dm_timer_read_counter
    ARM: OMAP3: hwmod data: register dss hwmods after dss_core
    ARM: OMAP2/3: PRM: fix missing plat/irqs.h build breakage
    ARM: OMAP2+: io: fix compilation breakage on 2420-only configs
    ARM: OMAP4: hwmod data: Add names for DMIC memory address space
    ARM: OMAP3: hwmod data: add SYSC_HAS_ENAWAKEUP for dispc
    ARM: OMAP2+: hwmod data: split omap2/3 dispc hwmod class
    ARM: davinci: DA850: remove non-existing pll1_sysclk4-7 clocks
    ARM: OMAP2: fix regulator warnings
    ARM: OMAP2: fix omap3 touchbook kconfig warning
    i2c: OMAP: Fix OMAP1 build error

    Linus Torvalds
     
  • Upstream commit d1fce9c115eeb93e01c01732dfe9a86cf76009cf

    "ARM: restart: bcmring: use new restart hook"

    breaks building of this platform, since what used to be the
    last field of the MACHINE_START/END block didn't have a
    trailing comma. Once another field was added below, we get:

    arch/arm/mach-bcmring/arch.c:198: error: request for member 'restart' in something not a structure or union

    Signed-off-by: Paul Gortmaker
    Acked-by: Jiandong Zheng
    Signed-off-by: Olof Johansson

    Paul Gortmaker
     
  • Remove BCMRING DMA map code which is no longer used.

    This also fixes a build error with dma.c introduced by
    bfcd2ea6a40b33270564d706396f1b514a988d3c.

    Signed-off-by: Jiandong Zheng
    Signed-off-by: Olof Johansson

    JD Zheng
     
  • * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
    i.MX SDMA: Fix burstsize settings
    ARM: mach-shmobile: both USB DMAC instances on sh7372 are slave-only
    dma: sh_dma: not all SH DMAC implementations support MEMCPY
    at_hdmac: bugfix for enabling channel irq
    dmaengine: fix missing 'cnt' in ?: in dmatest

    Linus Torvalds
     
  • * akpm:
    mm: compaction: check pfn_valid when entering a new MAX_ORDER_NR_PAGES block during isolation for migration
    readahead: fix pipeline break caused by block plug
    kprobes: fix a memory leak in function pre_handler_kretprobe()
    drivers/tty/vt/vt_ioctl.c: fix KDFONTOP 32bit compatibility layer
    lkdtm: avoid calling lkdtm_do_action() with spinlock held
    mm/filemap_xip.c: fix race condition in xip_file_fault()
    mm/memcontrol.c: fix warning with CONFIG_NUMA=n
    avr32: select generic atomic64_t support
    mm: postpone migrated page mapping reset
    xtensa: fix memscan()
    MAINTAINERS: update lguest F: patterns
    MAINTAINERS: remove staging sections
    MAINTAINERS: remove iMX5 section
    MAINTAINERS: update partitions block F: patterns

    Linus Torvalds
     

04 Feb, 2012

3 commits

  • * 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
    ARM: 7314/1: kuser: consistently use usr_ret for returning from helpers
    ARM: 7302/1: Add TLB flushing for both entries in a PMD
    ARM: 7303/1: perf: add empty NODE event definitions for Cortex-A5 and Cortex-A15
    ARM: 7308/1: vfp: flush thread hwstate before copying ptrace registers
    ARM: 7307/1: vfp: fix ptrace regset modification race
    ARM: 7306/1: vfp: flush thread hwstate before restoring context from sigframe
    Revert "ARM: 7304/1: ioremap: fix boundary check when reusing static mapping"

    Linus Torvalds
     
  • Enable use of the generic atomic64 implementation on AVR32 platforms.
    Without this the kernel fails to build as the architecture does not
    provide its version.

    Signed-off-by: Fabio Baltieri
    Acked-by: Hans-Christian Egtvedt
    Cc: Haavard Skinnemoen
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Fabio Baltieri
     
  • Defining memscan() as memchr() is wrong, because the return values of
    memscan() and memchr() are different when the character is not found. So
    use the generic memscan() implementation to fix this.

    Signed-off-by: Akinobu Mita
    Cc: Chris Zankel
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Akinobu Mita
     

03 Feb, 2012

9 commits

  • __kuser_cmpxchg64 has a return path using bx lr to get back to the caller.
    This is actually ok since the code in question is predicated on
    CONFIG_CPU_32v6K, but for the sake of consistency using the usr_ret
    macro is probably better.

    Acked-by: Dave Martin
    Acked-by: Nicolas Pitre
    Signed-off-by: Will Deacon
    Signed-off-by: Russell King

    Will Deacon
     
  • * 'next' of git://git.monstr.eu/linux-2.6-microblaze:
    Revert "microblaze: Add topology init"

    Linus Torvalds
     
  • …or-linus' and 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

    * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    bugs, x86: Fix printk levels for panic, softlockups and stack dumps

    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    perf top: Fix number of samples displayed
    perf tools: Fix strlen() bug in perf_event__synthesize_event_type()
    perf tools: Fix broken build by defining _GNU_SOURCE in Makefile
    x86/dumpstack: Remove unneeded check in dump_trace()
    perf: Fix broken interrupt rate throttling

    * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    sched/rt: Fix task stack corruption under __ARCH_WANT_INTERRUPTS_ON_CTXSW
    sched: Fix ancient race in do_exit()
    sched/nohz: Fix nohz cpu idle load balancing state with cpu hotplug
    sched/s390: Fix compile error in sched/core.c
    sched: Fix rq->nr_uninterruptible update race

    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    x86/reboot: Remove VersaLogic Menlow reboot quirk
    x86/reboot: Skip DMI checks if reboot set by user
    x86: Properly parenthesize cmpxchg() macro arguments

    Linus Torvalds
     
  • Linux uses two PMD entries for a PTE with the classic page table format,
    covering 2MB range. However, the __pte_free_tlb() function only adds a
    single TLB flush corresponding to 1MB range covering 'addr'. On
    Cortex-A15, level 1 entries can be cached by the TLB independently of
    the level 2 entries and without additional flushing a PMD entry would be
    left pointing at the wrong PTE. The patch limits the TLB flushing range
    to two 4KB pages around the 1MB boundary within PMD.

    Signed-off-by: Catalin Marinas
    Signed-off-by: Russell King

    Catalin Marinas
     
  • Commit 89d6c0b5 ("perf, arch: Add generic NODE cache events") added
    empty NODE event definitions for the ARM PMU implementations. This was
    merged along with Cortex-A5 and Cortex-A15 PMU support, so they missed
    out on the original patch.

    This patch adds the empty definitions to Cortex-A5 and Cortex-A15.

    Signed-off-by: Will Deacon
    Signed-off-by: Russell King

    Will Deacon
     
  • If we are context switched whilst copying into a thread's
    vfp_hard_struct then the partial copy may be corrupted by the VFP
    context switching code (see "ARM: vfp: flush thread hwstate before
    restoring context from sigframe").

    This patch updates the ptrace VFP set code so that the thread state is
    flushed before the copy, therefore disabling VFP and preventing
    corruption from occurring.

    Cc: stable
    Signed-off-by: Will Deacon
    Signed-off-by: Russell King

    Will Deacon
     
  • In a preemptible kernel, vfp_set() can be preempted, causing the
    hardware VFP context to be switched while the thread vfp state is
    being read and modified. This leads to a race condition which can
    cause the thread vfp state to become corrupted if lazy VFP context
    save occurs due to preemption in between the time thread->vfpstate
    is read and the time the modified state is written back.

    This may occur if preemption occurs during the execution of a
    ptrace() call which modifies the VFP register state of a thread.
    Such instances should be very rare in most realistic scenarios --
    none has been reported, so far as I am aware. Only uniprocessor
    systems should be affected, since VFP context save is not currently
    lazy in SMP kernels.

    The problem was introduced by my earlier patch migrating to use
    regsets to implement ptrace.

    This patch does a vfp_sync_hwstate() before reading
    thread->vfpstate, to make sure that the thread's VFP state is not
    live in the hardware registers while the registers are modified.

    Thanks to Will Deacon for spotting this.

    Cc: stable
    Signed-off-by: Dave Martin
    Signed-off-by: Will Deacon
    Signed-off-by: Russell King

    Dave Martin
     
  • Following execution of a signal handler, we currently restore the VFP
    context from the ucontext in the signal frame. This involves copying
    from the user stack into the current thread's vfp_hard_struct and then
    flushing the new data out to the hardware registers.

    This is problematic when using a preemptible kernel because we could be
    context switched whilst updating the vfp_hard_struct. If the current
    thread has made use of VFP since the last context switch, the VFP
    notifier will copy from the hardware registers into the vfp_hard_struct,
    overwriting any data that had been partially copied by the signal code.

    Disabling preemption across copy_from_user calls is a terrible idea, so
    instead we move the VFP thread flush *before* we update the
    vfp_hard_struct. Since the flushing is performed lazily, this has the
    effect of disabling VFP and clearing the CPU's VFP state pointer,
    therefore preventing the thread from being updated with stale data on
    the next context switch.

    Cc: stable
    Tested-by: Peter Maydell
    Signed-off-by: Will Deacon
    Signed-off-by: Russell King

    Will Deacon
     
  • This reverts commit 3c424f359898aff48c3d5bed608ac706f8a528c3.

    Joachim Eastwood reports:
    | "ARM: 7304/1: ioremap: fix boundary check when reusing static mapping"
    | Commit: 3c424f359898aff48c3d5bed608ac706f8a528c3 in Linus master
    |
    | Breaks booting on my custom AT91RM9200 board.
    | There isn't any error messages or anything that indicates what goes
    | wrong it just stops after; Uncompressing Linux... done, booting the
    | kernel.
    |
    | Reverting it makes my board boot again.

    and further debugging reveals:

    ioremap: pfn=fffff phys=fffff000 offset=400 size=1000
    ioremap: area c3ffdfc0: phys_addr=200000 pfn=200 size=4000
    ioremap: found: addr fef74000 => fed73000 => fed73400

    Clearly, an area for pfn 0x200, 16K can't ever satisfy a request for pfn
    0xfffff. This happens because the changed if statement becomes:

    if (0x00200 > 0xfffff ||
    0xfffff000 + 0x400 + 0x1000-1 > 0x00200000 + 0x4000-1)
    and therefore:
    if (0x00200 > 0xfffff ||
    0x000003ff > 0x00203fff)

    The if condition fails, and so we _believe_ that the SRAM mapping fits
    our request. Clearly that's totally bogus.

    Moreover, the original premise of the 'fix' patch was wrong:
    | The condition checking boundaries of the requested and existing
    | mappings didn't take in-page offset into consideration though,
    | which lead to obscure and hard to debug problems when requested
    | mapping crossed end of the static one.

    as the code immediately above this loop does:

    size = PAGE_ALIGN(offset + size);

    so 'size' already contains the requested offset into the page.

    So, revert the broken 'fix'.

    Acked-by: Nicolas Pitre

    Russell King
     

02 Feb, 2012

2 commits


01 Feb, 2012

5 commits

  • Return to behaviour perf MSR had before introducing vPMU in case vPMU
    is disabled. Some guests access those registers unconditionally and do
    not expect it to fail.

    Signed-off-by: Gleb Natapov
    Signed-off-by: Marcelo Tosatti

    Gleb Natapov
     
  • On hosts without this patch, 32bit guests will crash (and 64bit guests
    may behave in a wrong way) for example by simply executing following
    nasm-demo-application:

    [bits 32]
    global _start
    SECTION .text
    _start: syscall

    (I tested it with winxp and linux - both always crashed)

    Disassembly of section .text:

    00000000 :
    0: 0f 05 syscall

    The reason seems a missing "invalid opcode"-trap (int6) for the
    syscall opcode "0f05", which is not available on Intel CPUs
    within non-longmodes, as also on some AMD CPUs within legacy-mode.
    (depending on CPU vendor, MSR_EFER and cpuid)

    Because previous mentioned OSs may not engage corresponding
    syscall target-registers (STAR, LSTAR, CSTAR), they remain
    NULL and (non trapping) syscalls are leading to multiple
    faults and finally crashs.

    Depending on the architecture (AMD or Intel) pretended by
    guests, various checks according to vendor's documentation
    are implemented to overcome the current issue and behave
    like the CPUs physical counterparts.

    [mtosatti: cleanup/beautify code]

    Signed-off-by: Stephan Baerwolf
    Signed-off-by: Marcelo Tosatti

    Stephan Bärwolf
     
  • In order to be able to proceed checks on CPU-specific properties
    within the emulator, function "get_cpuid" is introduced.
    With "get_cpuid" it is possible to virtually call the guests
    "cpuid"-opcode without changing the VM's context.

    [mtosatti: cleanup/beautify code]

    Signed-off-by: Stephan Baerwolf
    Signed-off-by: Marcelo Tosatti

    Stephan Bärwolf
     
  • commit 43db595e8b5d78ce5ad2feab719814a76e3ad2e5
    (sh: switch to GENERIC_PCI_IOMAP)
    failed to take into account the PCI channels's
    io_map_base for mapping IO BARs.
    This also caused a new warning on sh.

    Fix this, without re-introducing code duplication,
    by setting NO_GENERIC_PCI_IOPORT_MAP
    and supplying a sh-specific __pci_ioport_map.

    Reported-by: Kevin Cernekee
    Signed-off-by: Michael S. Tsirkin

    Michael S. Tsirkin
     
  • commit eab90291d35438bcebf7c3dc85be66d0f24e3002
    (mips: switch to GENERIC_PCI_IOMAP)
    failed to take into account the PCI controller's
    io_map_base for mapping IO BARs.
    This also caused a new warning on mips.

    Fix this, without re-introducing code duplication,
    by setting NO_GENERIC_PCI_IOPORT_MAP
    and supplying a mips-specific __pci_ioport_map.

    Reported-by: Kevin Cernekee
    Signed-off-by: Michael S. Tsirkin

    Michael S. Tsirkin
     

31 Jan, 2012

3 commits


30 Jan, 2012

4 commits

  • This commit removes the reboot quirk originally added by commit
    e19e074 ("x86: Fix reboot problem on VersaLogic Menlow boards").

    Testing with a VersaLogic Ocelot (VL-EPMs-21a rev 1.00 w/ BIOS
    6.5.102) revealed the following regarding the reboot hang
    problem:

    - v2.6.37 reboot=bios was needed.

    - v2.6.38-rc1: behavior changed, reboot=acpi is needed,
    reboot=kbd and reboot=bios results in system hang.

    - v2.6.38: VersaLogic patch (e19e074 "x86: Fix reboot problem on
    VersaLogic Menlow boards") was applied prior to v2.6.38-rc7. This
    patch sets a quirk for VersaLogic Menlow boards that forces the use
    of reboot=bios, which doesn't work anymore.

    - v3.2: It seems that commit 660e34c ("x86: Reorder reboot method
    preferences") changed the default reboot method to acpi prior to
    v3.0-rc1, which means the default behavior is appropriate for the
    Ocelot. No VersaLogic quirk is required.

    The Ocelot board used for testing can successfully reboot w/out
    having to pass any reboot= arguments for all 3 current versions
    of the BIOS.

    Signed-off-by: Michael D Labriola
    Cc: Matthew Garrett
    Cc: Michael D Labriola
    Cc: Kushal Koolwal
    Cc: Linus Torvalds
    Link: http://lkml.kernel.org/r/87vcnub9hu.fsf@gmail.com
    Signed-off-by: Ingo Molnar

    Michael D Labriola
     
  • Skip DMI checks for vendor specific reboot quirks if the user
    passed in a reboot= arg on the command line - we should never
    override user choices.

    Signed-off-by: Michael D Labriola
    Cc: Alan Cox
    Cc: Michael D Labriola
    Cc: Matthew Garrett
    Cc: Linus Torvalds
    Link: http://lkml.kernel.org/r/87wr8ab9od.fsf@gmail.com
    Signed-off-by: Ingo Molnar

    Michael D Labriola
     
  • * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
    ARM: OMAP2+: arch/arm/mach-omap2/smartreflex.c: add missing iounmap
    ARM: OMAP2+: arch/arm/mach-omap2/devices.c: introduce missing kfree
    ARM: OMAP: fix MMC2 loopback clock handling
    ARM: OMAP: fix erroneous mmc2 clock change on mmc3 setup
    ARM: OMAP2+: GPMC: fix device size setup
    ARM: OMAP2+: timer: Fix crash due to wrong arg to __omap_dm_timer_read_counter
    ARM: OMAP3: hwmod data: register dss hwmods after dss_core
    ARM: OMAP2/3: PRM: fix missing plat/irqs.h build breakage
    ARM: OMAP2+: io: fix compilation breakage on 2420-only configs
    ARM: OMAP4: hwmod data: Add names for DMIC memory address space
    ARM: OMAP3: hwmod data: add SYSC_HAS_ENAWAKEUP for dispc
    ARM: OMAP2+: hwmod data: split omap2/3 dispc hwmod class
    ARM: OMAP2: fix regulator warnings
    ARM: OMAP2: fix omap3 touchbook kconfig warning
    i2c: OMAP: Fix OMAP1 build error

    Olof Johansson
     
  • * 'fixes' of git://gitorious.org/linux-davinci/linux-davinci:
    ARM: davinci: update mdio bus name
    ARM: davinci: DA850: remove non-existing pll1_sysclk4-7 clocks

    Olof Johansson
     

29 Jan, 2012

3 commits

  • …kernel/git/konrad/xen

    * 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen/granttable: Disable grant v2 for HVM domains.
    x86: xen: size struct xen_spinlock to always fit in arch_spinlock_t

    Linus Torvalds
     
  • * 'fixes' of git://git.linaro.org/people/rmk/linux-arm: (31 commits)
    ARM: 7304/1: ioremap: fix boundary check when reusing static mapping
    ARM: 7301/1: Rename the T() macro to TUSER() to avoid namespace conflicts
    ARM: 7299/1: ftrace: clear zero bit in reported IPs for Thumb-2
    ARM: 7298/1: realview: fix mapping of MPCore private memory region
    PCMCIA: fix sa1111 oops on remove
    ARM: 7288/1: mach-sa1100: add missing module_init() call
    ARM: 7297/1: smp_twd: make sure timer is stopped before registering it
    ARM: 7296/1: proc-v7.S: remove HARVARD_CACHE preprocessor guards
    ARM: 7295/1: cortex-a7: move proc_info out of !CONFIG_ARM_LPAE block
    ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP
    ARM: 7291/1: cache: assume 64-byte L1 cachelines for ARMv7 CPUs
    ARM: 7290/1: vmlinux.lds.S: align the exception fixup table to a 4-byte boundary
    ARM: 7289/1: vmlinux.lds.S: do not hardcode cacheline size as 32 bytes
    MFD: ucb1x00-ts: fix resume failure
    MFD: ucb1x00-core: fix gpiolib direction_output handling
    MFD: ucb1x00-core: fix missing restore of io output data on resume
    MFD: mcp-core: fix mcp_priv() to be more type safe
    MFD: mcp-core: fix complaints from the genirq layer
    Revert "ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus."
    Revert "ARM: sa1100: Refactor mcp-sa11x0 to use platform resources."
    ...

    Fix up conflict due to arch/arm/mach-mx5/Kconfig having been merged into
    mach-imx5 (commit 784a90c0a7d8: "ARM i.MX: Merge i.MX5 support into
    mach-imx"), but the ARM_L1_CACHE_SHIFT_6 entry was moved to be driven by
    the CPU_V7 logic from it in the old location in rmk's branch (commit
    a092f2b15399: "ARM: 7291/1: cache: assume 64-byte L1 cachelines for
    ARMv7 CPUs").

    Linus Torvalds
     
  • arm-soc fixes for 3.3-rc:

    AT91 needed reset fixes which resulted in some minor code refactoring,
    it also adds a feature-removal for one of their platforms for 3.4.
    The USB patches have been acked by Greg K-H.

    i.MX and ux500 both have some minor fixes, nothing controversial.

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    arch/arm/mach-imx/mach-mx53_ard.c: add missing iounmap
    ARM: imx: iomux-v1.h: Fix build error due to __init annotation
    ARM: at91: Fix at91sam9g45 and at91cap9 reset
    ARM: at91: make rstc soc independent
    ARM: at91: introduce AT91_SAM9_ALT_RESET to select the at91sam9 alternative reset
    ARM: at91: merge at91cap9_ddrsdr.h in at91sam9_ddrsdr.h
    ARM: at91: fix cap9 ddrsdr register
    ARM/USB: at91/ohci-at91: rename vbus_pin_inverted to vbus_pin_active_low
    USB: at91: fix clk_get error handling
    ARM: at91: removal of CAP9 SoC family
    ARM: at91: fix at91rm9200 soc subtype handling
    mach-ux500: no MMC_CAP_SD_HIGHSPEED on Snowball
    mach-ux500: enable ARM errata 764369
    mach-ux500: do not override outer.inv_all
    mach-ux500: musb: now musb is always in OTG mode
    ARM: imx6: add missing twd_clk for imx6q clock

    Linus Torvalds
     

28 Jan, 2012

3 commits

  • Smatch complains that we have some inconsistent NULL checking.

    If "task" were NULL then it would lead to a NULL dereference
    later. We can remove this test because earlier on in the
    function we have:

    if (!task)
    task = current;

    Signed-off-by: Dan Carpenter
    Acked-by: Frederic Weisbecker
    Cc: Namhyung Kim
    Cc: Peter Zijlstra
    Cc: Clemens Ladisch
    Link: http://lkml.kernel.org/r/20120128105246.GA25092@elgon.mountain
    Signed-off-by: Ingo Molnar

    Dan Carpenter
     
  • Since commit 576d2f2525612ecb5af029a76f21f22a3b82563d "ARM: add
    generic ioremap optimization by reusing static mappings" ioremap()
    is trying to reuse existing static mapping when possible.

    The condition checking boundaries of the requested and existing
    mappings didn't take in-page offset into consideration though,
    which lead to obscure and hard to debug problems when requested
    mapping crossed end of the static one.

    Signed-off-by: Pawel Moll
    Acked-by: Nicolas Pitre
    Signed-off-by: Russell King

    Pawel Moll
     
  • Commit 5a05a8200a4359ef2bfe9094c137dee35cfdd516 ("davinci_emac:
    use an unique MDIO bus name") introduced during the v3.3 merge
    window updated the davinci mdio bus name to make it unique.

    Update the bus name in board files which use DaVinci MDIO bus
    to match the new name. Without this PHY is not detected with
    error like:

    PHY 0:01 not found
    net eth0: could not connect to phy 0:01

    Tested on DM365 and DA850 EVMs.

    Cc: Florian Fainelli
    Cc: David S. Miller
    Signed-off-by: Sekhar Nori

    Sekhar Nori