07 Oct, 2012

7 commits

  • __arch_virt_to_dma expects a virtual address pointer, but
    the ks8695 implementation of this macro treats it as an
    integer. Adding a type cast avoids hundreds of identical
    warning messages.

    Without this patch, building acs5k_defconfig results in:

    arch/arm/include/asm/dma-mapping.h: In function 'virt_to_dma':
    arch/arm/include/asm/dma-mapping.h:60:2: warning: passing argument 1 of '__virt_to_phys' makes integer from pointer without a cast [enabled by default]
    arch/arm/include/asm/memory.h:172:60: note: expected 'long unsigned int' but argument is of type 'void *'
    In file included from include/linux/dma-mapping.h:73:0,
    from include/linux/skbuff.h:33,
    from security/commoncap.c:21:

    Signed-off-by: Arnd Bergmann
    Cc: Krzysztof Halasa
    Cc: Daniel Silverstone
    Cc: Ben Dooks

    Arnd Bergmann
     
  • device_register is marked __must_check, so we better propagate the error
    value by returning it from ecard_probe.

    Without this patch, building rpc_defconfig results in:

    arch/arm/mach-rpc/ecard.c: In function 'ecard_probe':
    arch/arm/mach-rpc/ecard.c:963:17: warning: ignoring return value of 'device_register', declared with attribute warn_unused_result [-Wunused-result]

    Signed-off-by: Arnd Bergmann
    Cc: Russell King

    Arnd Bergmann
     
  • The mityomapl138_cpufreq_init and read_factory_config function in
    board-mityomapl138.c are not __init functions and might be called
    at a later stage, so da850_register_cpufreq must not be __init either.

    Without this patch, building da8xx_omapl_defconfig results in:

    WARNING: arch/arm/mach-davinci/built-in.o(.text+0x2eb4): Section mismatch in reference from the function read_factory_config() to the function .init.text:da850_register_cpufreq()
    The function read_factory_config() references
    the function __init da850_register_cpufreq().
    This is often because read_factory_config lacks a __init
    annotation or the annotation of da850_register_cpufreq is wrong.

    Signed-off-by: Arnd Bergmann
    Acked-by: Sekhar Nori
    Cc: Kevin Hilman

    Arnd Bergmann
     
  • The pci map_irq callbacks get a 'const' pci_dev argument, so change the
    iop13xx version to use the same prototype as everything else.

    Without this patch, building iop13xx_defconfig results in:

    arch/arm/mach-iop13xx/iq81340sc.c:63:2: warning: initialization from incompatible pointer type [enabled by default]
    arch/arm/mach-iop13xx/iq81340sc.c:63:2: warning: (near initialization for 'iq81340sc_pci.map_irq') [enabled by default]

    Signed-off-by: Arnd Bergmann
    Cc: Lennert Buytenhek
    Cc: Dan Williams

    Arnd Bergmann
     
  • pci_scan_root_bus is __devinit, so iop13xx_scan_bus has to be the
    same in order to safely call it. This is ok because the function
    itself is only called from the hwpci->scan callback.

    WARNING: vmlinux.o(.text+0x10138): Section mismatch in reference from the function iop13xx_scan_bus() to the function .devinit.text:pci_scan_root_bus()
    The function iop13xx_scan_bus() references
    the function __devinit pci_scan_root_bus().
    This is often because iop13xx_scan_bus lacks a __devinit
    annotation or the annotation of pci_scan_root_bus is wrong.

    Signed-off-by: Arnd Bergmann
    Cc: Bjorn Helgaas
    Cc: Lennert Buytenhek
    Cc: Dan Williams

    Arnd Bergmann
     
  • The sys_timer init function is only called at __init time,
    so it's safe to mark mv78xx0_timer_init as __init_refok,
    which allows us to call orion_time_init without getting
    a link time warning.

    Without this patch, building mv78xx0_defconfig results in:

    WARNING: vmlinux.o(.text+0x15470): Section mismatch in reference from the function mv78xx0_timer_init() to the function .init.text:orion_time_init()
    The function mv78xx0_timer_init() references
    the function __init orion_time_init().
    This is often because mv78xx0_timer_init lacks a __init
    annotation or the annotation of orion_time_init is wrong.

    Signed-off-by: Arnd Bergmann
    Cc: Jason Cooper
    Cc: Andrew Lunn

    Arnd Bergmann
     
  • The *_irq_add function should not be marked __init because the driver
    subsystem thinks they might be called at a later stage.

    The usb_simtec_init function accesses initdata and should be marked
    init. This is safe because the only caller is also an init function.

    Without this patch, building s3c2410_defconfig results in:

    WARNING: arch/arm/mach-s3c24xx/built-in.o(.data+0x1030): Section mismatch in reference from the variable s3c2416_irq_interface to the function .init.text:s3c2416_irq_add()
    The variable s3c2416_irq_interface references
    the function __init s3c2416_irq_add()
    If the reference is valid then annotate the
    variable with __init* or __refdata (see linux/init.h) or name the variable:
    *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console

    WARNING: arch/arm/mach-s3c24xx/built-in.o(.data+0x1b08): Section mismatch in reference from the variable s3c2443_irq_interface to the function .init.text:s3c2443_irq_add()
    The variable s3c2443_irq_interface references
    the function __init s3c2443_irq_add()
    If the reference is valid then annotate the
    variable with __init* or __refdata (see linux/init.h) or name the variable:
    *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console

    WARNING: arch/arm/mach-s3c24xx/built-in.o(.data+0xf44): Section mismatch in reference from the variable s3c2416_irq_interface to the function .init.text:s3c2416_irq_add()
    The variable s3c2416_irq_interface references
    the function __init s3c2416_irq_add()
    If the reference is valid then annotate the
    variable with __init* or __refdata (see linux/init.h) or name the variable:
    *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console

    WARNING: arch/arm/mach-s3c24xx/built-in.o(.text+0x3f7c): Section mismatch in reference from the function usb_simtec_init() to the (unknown reference) .init.data:(unknown)
    The function usb_simtec_init() references
    the (unknown reference) __initdata (unknown).
    This is often because usb_simtec_init lacks a __initdata
    annotation or the annotation of (unknown) is wrong.

    Signed-off-by: Arnd Bergmann
    Cc: Ben Dooks
    Cc: Kukjin Kim

    Arnd Bergmann
     

04 Oct, 2012

7 commits

  • The code using the variable 'i' in this function is conditional which
    results in a harmless compiler warning. Using the IS_ENABLED macro
    instead of #ifdef makes the code look nicer and gets rid of the
    warning.

    Without this patch, building at91sam9263_defconfig results in:

    /home/arnd/linux-arm/arch/arm/mach-at91/pm.c: In function 'at91_pm_verify_clocks':
    /home/arnd/linux-arm/arch/arm/mach-at91/pm.c:137:6: warning: unused variable 'i' [-Wunused-variable]

    Signed-off-by: Arnd Bergmann
    Acked-by: Jean-Christophe PLAGNIOL-VILLARD
    Cc: Nicolas Ferre

    Arnd Bergmann
     
  • On NOMMU systems, we do cannot remap the MMIO space, so the
    definition of at91_io_desc is unused.

    Without this patch, building at91x40_defconfig results in:

    arch/arm/mach-at91/setup.c:90:24: warning: 'at91_io_desc' defined but not used [-Wunused-variable]

    Signed-off-by: Arnd Bergmann
    Cc: Nicolas Ferre
    Cc: Jean-Christophe Plagniol-Villard

    Arnd Bergmann
     
  • The symbol "GPIO24_SSP1_SFRM" is defined in both mfp-pxa27x.h and
    mfp-pxa25x.h. Since the macro is not actually used in the cm-x2xx.c
    file, but it includes both headers, a safe workaround should be
    to just undefine it from the .c file. This is a bit hacky and
    the headers should be fixed to not both define it, but for now
    it gets us around an annoying warning.

    Without this patch, building cm_x2xx_defconfig results in:

    In file included from arch/arm/mach-pxa/include/mach-pxa/pxa27x.h:7:0,
    from arch/arm/mach-pxa/cm-x2xx.c:25:
    arch/arm/mach-pxa/include/mach-pxa/mfp-pxa27x.h:215:0: warning: "GPIO24_SSP1_SFRM" redefined [enabled by default]
    arch/arm/mach-pxa/include/mach-pxa/mfp-pxa25x.h:111:0: note: this is the location of the previous definition

    Signed-off-by: Arnd Bergmann
    Acked-by: Igor Grinberg
    Cc: Haojian Zhuang
    Cc: Mike Rapoport

    Arnd Bergmann
     
  • The sharpsl_fatal_check has not been used since Pavel Machek removed
    the caller in 99f329a2b "pxa/sharpsl_pm: zaurus c3000 aka spitz: fix
    resume". Nobody has complained since 2009, so it's safe to assume we
    can just remove the function.

    Without this patch, building corgi_defconfig results in:

    /home/arnd/linux-arm/arch/arm/mach-pxa/sharpsl_pm.c:693:12: warning: 'sharpsl_fatal_check' defined but not used [-Wunused-function]

    Signed-off-by: Arnd Bergmann
    Cc: Pavel Machek
    Cc: Stanislav Brabec
    Cc: Eric Miao
    Cc: Haojian Zhuang

    Arnd Bergmann
     
  • Gcc prints a harmless warning about palmte2_pxa_keys not being used
    when the gpio keyboard driver is disabled. The solution is to use
    the same #ifdef that is already present in the place where the
    symbol is used.

    Without this patch, building palmz72_defconfig results in:

    /home/arnd/linux-arm/arch/arm/mach-pxa/palmte2.c:128:31: warning: 'palmte2_pxa_keys' defined but not used [-Wunused-variable]

    Signed-off-by: Arnd Bergmann
    Acked-by: Marek Vasut
    Cc: Carlos Eduardo Medaglia Dyonisio
    Cc: Haojian Zhuang
    Cc: Eric Miao

    Arnd Bergmann
     
  • Calling kstrtoul requires checking the result. In case of
    the viper_tpm_setup function, let's fail the __setup function
    if the number was invalid.

    Without this patch, building viper_defconfig results in:

    arch/arm/mach-pxa/viper.c: In function 'viper_tpm_setup':
    arch/arm/mach-pxa/viper.c:771:10: warning: ignoring return value of 'kstrtoul', declared with attribute warn_unused_result [-Wunused-result]

    Signed-off-by: Arnd Bergmann
    Acked-by: Marc Zyngier
    Cc: Haojian Zhuang
    Cc: Eric Miao

    Arnd Bergmann
     
  • When run on the wrong platform, the shark_pci_init function
    returns an undefined value, as reported by a gcc warning,
    so let's just return -ENODEV.

    Without this patch, building shark_defconfig results in:

    arch/arm/mach-shark/pci.c: In function 'shark_pci_init':
    arch/arm/mach-shark/pci.c:42:3: warning: 'return' with no value, in function returning non-void [-Wreturn-type]

    Signed-off-by: Arnd Bergmann
    Cc: "Krzysztof Halasa"

    Arnd Bergmann
     

29 Sep, 2012

1 commit


28 Sep, 2012

8 commits

  • Pull one more arm-soc bugfix from Olof Johansson:
    "Here's a bugfix for orion5x. Without this, PCI doesn't initialize
    properly because of too small coherent pool to cover the allocations
    needed.

    A similar fix has already been done on kirkwood."

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: Orion5x: Fix too small coherent pool.

    Linus Torvalds
     
  • Pull ARM dma-mapping fix from Marek Szyprowski:
    "This patch fixes a potential memory leak in the ARM dma-mapping code."

    * 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
    ARM: dma-mapping: Fix potential memory leak in atomic_pool_init()

    Linus Torvalds
     
  • The userspace part of UML uses the asm-offsets.h generator mechanism to
    create definitions for UM_KERN_ that match the in-kernel
    KERN_ constant definitions.

    As of commit 04d2c8c83d0e3ac5f78aeede51babb3236200112 ("printk: convert
    the format for KERN_ to a 2 byte pattern"), KERN_ is no
    longer expanded to the literal '""', but to '"\001" "LEVEL"', i.e.
    it contains two parts.

    However, the combo of DEFINE_STR() in
    arch/x86/um/shared/sysdep/kernel-offsets.h and sed-y in Kbuild doesn't
    support string literals consisting of multiple parts. Hence for all
    UM_KERN_ definitions, only the SOH character is retained in the actual
    definition, while the remainder ends up in the comment. E.g. in
    include/generated/asm-offsets.h we get

    #define UM_KERN_INFO "\001" /* "6" KERN_INFO */

    instead of

    #define UM_KERN_INFO "\001" "6" /* KERN_INFO */

    This causes spurious '^A' output in some kernel messages:

    Calibrating delay loop... 4640.76 BogoMIPS (lpj=23203840)
    pid_max: default: 32768 minimum: 301
    Mount-cache hash table entries: 256
    ^AChecking that host ptys support output SIGIO...Yes
    ^AChecking that host ptys support SIGIO on close...No, enabling workaround
    ^AUsing 2.6 host AIO
    NET: Registered protocol family 16
    bio: create slab at 0
    Switching to clocksource itimer

    To fix this:
    - Move the mapping from UM_KERN_ to KERN_ from
    arch/um/include/shared/common-offsets.h to
    arch/um/include/shared/user.h, which is preincluded for all userspace
    parts,
    - Preinclude include/linux/kern_levels.h for all userspace parts, to
    obtain the in-kernel KERN_ constant definitions. This doesn't
    violate the kernel/userspace separation, as include/linux/kern_levels.h
    is self-contained and doesn't expose any other kernel internals.
    - Remove the now unused STR() and DEFINE_STR() macros.

    Signed-off-by: Geert Uytterhoeven
    Signed-off-by: Richard Weinberger

    Geert Uytterhoeven
     
  • commit c1d7e01d (ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION)
    forgot UML and broke IPC on it.
    Also UML has to select ARCH_WANT_IPC_PARSE_VERSION usin Kconfig.

    Reported-and-tested-by:
    Signed-off-by: Richard Weinberger

    Richard Weinberger
     
  • we only use that to tell copy_thread() done by syscall from that
    done by kernel_thread(). However, it's easier to do simply by
    checking PF_KTHREAD in thread flags.

    Merge sys_clone() guts for 32bit and 64bit, while we are at it...

    Signed-off-by: Al Viro

    Al Viro
     
  • ... rather than duplicating that in sigframe setup code (and doing that
    inconsistently, at that)

    Signed-off-by: Al Viro

    Al Viro
     
  • Signed-off-by: Al Viro

    Al Viro
     
  • ... assuming it's needed to be done at all

    Signed-off-by: Al Viro

    Al Viro
     

27 Sep, 2012

2 commits


26 Sep, 2012

1 commit

  • Pull more networking fixes from David Miller:

    1) Eric Dumazet discovered and fixed what turned out to be a family of
    bugs. These functions were using pskb_may_pull() which might need
    to reallocate the linear SKB data buffer, but the callers were not
    expecting this possibility. The callers have cached pointers to the
    packet header areas, and would need to reload them if we were to
    continue using pskb_may_pull().

    So they could end up reading garbage.

    It's easier to just change these RAW4/RAW6/MIP6 routines to use
    skb_header_pointer() instead of pskb_may_pull(), which won't modify
    the linear SKB data area.

    2) Dave Jone's syscall spammer caught a case where a non-TCP socket can
    call down into the TCP keepalive code. The case basically involves
    creating a raw socket with sk_protocol == IPPROTO_TCP, then calling
    setsockopt(sock_fd, SO_KEEPALIVE, ...)

    Fixed by Eric Dumazet.

    3) Bluetooth devices do not get configured properly while being powered
    on, resulting in always using legacy pairing instead of SSP. Fix
    from Andrzej Kaczmarek.

    4) Bluetooth cancels delayed work erroneously, put stricter checks in
    place. From Andrei Emeltchenko.

    5) Fix deadlock between cfg80211_mutex and reg_regdb_search_mutex in
    cfg80211, from Luis R. Rodriguez.

    6) Fix interrupt double release in iwlwifi, from Emmanuel Grumbach.

    7) Missing module license in bcm87xx driver, from Peter Huewe.

    8) Team driver can lose port changed events when adding devices to a
    team, fix from Jiri Pirko.

    9) Fix endless loop when trying ot unregister PPPOE device in zombie
    state, from Xiaodong Xu.

    10) batman-adv layer needs to set MAC address of software device
    earlier, otherwise we call tt_local_add with it uninitialized.

    11) Fix handling of KSZ8021 PHYs, it's matched currently by KS8051 but
    that doesn't program the device properly. From Marek Vasut.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
    ipv6: mip6: fix mip6_mh_filter()
    ipv6: raw: fix icmpv6_filter()
    net: guard tcp_set_keepalive() to tcp sockets
    phy/micrel: Add missing header to micrel_phy.h
    phy/micrel: Rename KS80xx to KSZ80xx
    phy/micrel: Implement support for KSZ8021
    batman-adv: Fix symmetry check / route flapping in multi interface setups
    batman-adv: Fix change mac address of soft iface.
    pppoe: drop PPPOX_ZOMBIEs in pppoe_release
    team: send port changed when added
    ipv4: raw: fix icmp_filter()
    net/phy/bcm87xx: Add MODULE_LICENSE("GPL") to GPL driver
    iwlwifi: don't double free the interrupt in failure path
    cfg80211: fix possible circular lock on reg_regdb_search()
    Bluetooth: Fix not removing power_off delayed work
    Bluetooth: Fix freeing uninitialized delayed works
    Bluetooth: mgmt: Fix enabling LE while powered off
    Bluetooth: mgmt: Fix enabling SSP while powered off

    Linus Torvalds
     

25 Sep, 2012

5 commits

  • Pull tile gxio ABI fix from Chris Metcalf:
    "This fixes a last-minute change in the Tilera hypervisor ABI for TRIO
    (PCI root complex) support. We've locked in this ABI going forward
    and will make sure no further ABI changes like this occur."

    * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
    tile: gxio iorpc numbering change for TRIO interface

    Linus Torvalds
     
  • Pull a Xen fix from Konrad Rzeszutek Wilk:
    "It is a bug-fix when we run the initial PV guest on a AMD K8 machine
    and have CONFIG_AMD_NUMA enabled and detect the NUMA topology from the
    Northbridge.

    We end up in the situation where the initial domain gets too much
    information and gets confused and crashes - the fix is to restrict the
    domain to get the information - and we do it by just disabling NUMA on
    the PV guest (the hypervisor is still able to do its proper NUMA
    allocations of guests).

    It is OK to disable the PV guest from accessing NUMA data as right now
    we do not inject any NUMA node information to the PV guests. When we
    do get to that point, then this patch will have to be reverted."

    * Disable PV NUMA support as we do not do anything with it (yet) and it
    can cause bootup crashes on certain AMD machines.

    * tag 'stable/for-linus-3.6-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen/boot: Disable NUMA for PV guests.

    Linus Torvalds
     
  • There is no such part as KS8001, KS8041 or KS8051. There are only
    KSZ8001, KSZ8041 and KSZ8051. Rename these parts as such to match
    the Micrel naming.

    Signed-off-by: Marek Vasut
    Cc: David J. Choi
    Cc: David S. Miller
    Cc: Nobuhiro Iwamatsu
    Cc: Linux ARM kernel
    Cc: Fabio Estevam
    Cc: Shawn Guo
    Signed-off-by: David S. Miller

    Marek Vasut
     
  • An ABI numbering change was made in the hypervisor for Tilera's 4.1
    MDE release (just shipped). It's incompatible with the previous 4.0
    release ABI numbering, so we track the new numbering going forward.
    We plan to avoid modifying ABI numbering for these interfaces again.

    Signed-off-by: Chris Metcalf

    Chris Metcalf
     
  • A recent patch in the linux-next tree caused a build failure on
    C6X because C6X didn't define a read_barrier_depends() macro. C6X
    does not support SMP and the architecture doesn't provide any
    special memory ordering instructions, so it makes sense to just
    use the generic barrier.h rather than patching the existing c6x
    specific header.

    Signed-off-by: Mark Salter

    Mark Salter
     

24 Sep, 2012

3 commits

  • The hypervisor is in charge of allocating the proper "NUMA" memory
    and dealing with the CPU scheduler to keep them bound to the proper
    NUMA node. The PV guests (and PVHVM) have no inkling of where they
    run and do not need to know that right now. In the future we will
    need to inject NUMA configuration data (if a guest spans two or more
    NUMA nodes) so that the kernel can make the right choices. But those
    patches are not yet present.

    In the meantime, disable the NUMA capability in the PV guest, which
    also fixes a bootup issue. Andre says:

    "we see Dom0 crashes due to the kernel detecting the NUMA topology not
    by ACPI, but directly from the northbridge (CONFIG_AMD_NUMA).

    This will detect the actual NUMA config of the physical machine, but
    will crash about the mismatch with Dom0's virtual memory. Variation of
    the theme: Dom0 sees what it's not supposed to see.

    This happens with the said config option enabled and on a machine where
    this scanning is still enabled (K8 and Fam10h, not Bulldozer class)

    We have this dump then:
    NUMA: Warning: node ids are out of bound, from=-1 to=-1 distance=10
    Scanning NUMA topology in Northbridge 24
    Number of physical nodes 4
    Node 0 MemBase 0000000000000000 Limit 0000000040000000
    Node 1 MemBase 0000000040000000 Limit 0000000138000000
    Node 2 MemBase 0000000138000000 Limit 00000001f8000000
    Node 3 MemBase 00000001f8000000 Limit 0000000238000000
    Initmem setup node 0 0000000000000000-0000000040000000
    NODE_DATA [000000003ffd9000 - 000000003fffffff]
    Initmem setup node 1 0000000040000000-0000000138000000
    NODE_DATA [0000000137fd9000 - 0000000137ffffff]
    Initmem setup node 2 0000000138000000-00000001f8000000
    NODE_DATA [00000001f095e000 - 00000001f0984fff]
    Initmem setup node 3 00000001f8000000-0000000238000000
    Cannot find 159744 bytes in node 3
    BUG: unable to handle kernel NULL pointer dereference at (null)
    IP: [] __alloc_bootmem_node+0x43/0x96
    Pid: 0, comm: swapper Not tainted 3.3.6 #1 AMD Dinar/Dinar
    RIP: e030:[] [] __alloc_bootmem_node+0x43/0x96
    .. snip..
    [] sparse_early_usemaps_alloc_node+0x64/0x178
    [] sparse_init+0xe4/0x25a
    [] paging_init+0x13/0x22
    [] setup_arch+0x9c6/0xa9b
    [] ? printk+0x3c/0x3e
    [] start_kernel+0xe5/0x468
    [] x86_64_start_reservations+0xba/0xc1
    [] ? xen_setup_runstate_info+0x2c/0x36
    [] xen_start_kernel+0x565/0x56c
    "

    so we just disable NUMA scanning by setting numa_off=1.

    CC: stable@vger.kernel.org
    Reported-and-Tested-by: Andre Przywara
    Acked-by: Andre Przywara
    Signed-off-by: Konrad Rzeszutek Wilk

    Konrad Rzeszutek Wilk
     
  • When either of __alloc_from_contiguous or __alloc_remap_buffer fails
    to provide a valid pointer, allocated memory is freed up and an error
    is returned. 'pages' was however not freed before returning error.

    Cc: Arnd Bergmann
    Cc: Marek Szyprowski
    Signed-off-by: Sachin Kamat
    Signed-off-by: Marek Szyprowski

    Sachin Kamat
     
  • Pull kbuild fixes from Michal Marek:
    "There are two more kbuild fixes for 3.6.

    One fixes a race between x86's archscripts target and the rule
    (re)building scripts/basic/fixdep. The second is a fix for the
    previous attempt at fixing make firmware_install with make 3.82.
    This new solution should work with any version of GNU make"

    * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    x86/kbuild: archscripts depends on scripts_basic
    firmware: fix directory creation rule matching with make 3.80

    Linus Torvalds
     

23 Sep, 2012

2 commits

  • Pull MIPS fixes from Ralf Baechle:
    "Random fixes across arch/mips, essentially.

    One fix for an issue in get_user_pages_fast() which previously was
    discovered on x86, a miscalculation in the support for the MIPS MT
    hardware multithreading support, the RTC support for the Malta and a
    fix for a spurious interrupt issue that seems to bite only very
    special Malta configurations."

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
    MIPS: Malta: Don't crash on spurious interrupt.
    MIPS: Malta: Remove RTC Data Mode bootstrap breakage
    MIPS: mm: Add compound tail page _mapcount when mapped
    MIPS: CMP/SMTC: Fix tc_id calculation

    Linus Torvalds
     
  • Pull ARM and clkdev fixes from Russell King:
    "Two patches for clkdev which resolve the long standing issue that the
    devm_* versions were dependent on clkdev, which they shouldn't have
    been. Instead, they're dependent on HAVE_CLK instead, which implies
    that you're providing clk_get() and clk_put().

    A small fix to the ARM decompressor to ensure that the page tables are
    properly interpreted by the CPU, and reserve syscall 378 for kcmp (the
    checksyscalls.sh script is unfortunately currently broken so arch
    maintainers aren't getting notified of new syscalls...)

    Lastly, a larger fix for an issue between the common clk subsystem and
    smp_twd which causes warnings to be spat out."

    * 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
    ARM: reserve syscall 378 for kcmp
    ARM: 7535/1: Reprogram smp_twd based on new common clk framework notifiers
    ARM: 7537/1: clk: Fix release in devm_clk_put()
    ARM: 7532/1: decompressor: reset SCTLR.TRE for VMSA ARMv7 cores
    ARM: 7534/1: clk: Make the managed clk functions generically available

    Linus Torvalds
     

22 Sep, 2012

4 commits