1. 18 Oct, 2012 3 commits
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · a0a6a39e
      Linus Torvalds authored
      Pull powerpc fixes from Benjamin Herrenschmidt:
       "Here are a handful of powerpc related fixes."
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries.
        cpuidle/powerpc: Fix smt_snooze_delay functionality.
        cpuidle/powerpc: Fix target residency initialisation in pseries cpuidle
        powerpc: Build fix for powerpc KVM
        Revert "powerpc/perf: Use pmc_overflow() to detect rolled back events"
      a0a6a39e
    • Linus Torvalds's avatar
      Merge tag 'dt-fixes-for-3.7' of git://sources.calxeda.com/kernel/linux · bab58350
      Linus Torvalds authored
      Pull DeviceTree fixes from Rob Herring:
       "A handful of fixes:
         - a fix for dtc from upstream
         - sparse fixes in DeviceTree code
         - stub of_get_child_by_name for !OF builds"
      
      * tag 'dt-fixes-for-3.7' of git://sources.calxeda.com/kernel/linux:
        dtc: fix for_each_*() to skip first object if deleted
        of/platform: sparse fix
        of/irq: sparse fixes
        of/address: sparse fixes
        of: add stub of_get_child_by_name for non-OF builds
      bab58350
    • Linus Torvalds's avatar
      Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · ec351832
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "Significant changes are:
         - A regression fix for the new HD-audio LPIB delay counting,
           VGA-switcheroo race fix
         - ASoC ams-delta fix for the broken driver loading
      
        Otherwise a collection of mostly small / trivial fixes."
      
      * tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: emu10k1: add chip details for E-mu 1010 PCIe card
        ALSA: hda - Always check array bounds in alc_get_line_out_pfx
        ASoC: bells: Correct typo in sub speaker DAI name for WM5110
        ALSA: hda - Stop LPIB delay counting on broken hardware
        ALSA: hda - Fix registration race of VGA switcheroo
        ALSA: hda - Clean up superfluous position_fix list entries
        ALSA: ac97 - Fix missing NULL check in snd_ac97_cvol_new()
        ASoC: codecs: da9055: Minor improvement in ALC calibration process
        ASoC: dmaengine: Correct Makefile when sound is built as module
        ASoC: fsi: don't reschedule DMA from an atomic context
        ASoC: fix documentation in soc-jack
        ARM: pxa: Fix build error caused by sram.h rename
        ASoC: wm2200: Fix non-inverted OUT2 mute control
        ASoC: wm2200: Use rev A register patches on rev B
        ASoC: bells: Correct typo in sub speaker DAI name for WM5110
        ASoC: ams-delta: Convert to use snd_soc_register_card()
        ASoC: omap-mcpdm: Remove OMAP revision check
        ASoC: Fix wrong include for McPDM
        ASoC: omap-abe-twl6040: Fix typo of Vibrator
        ASoC: twl6040: Fix Stream DAPM mapping
      ec351832
  2. 17 Oct, 2012 37 commits
    • Deepthi Dharwar's avatar
      cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries. · 83dac594
      Deepthi Dharwar authored
      Earlier without cpuidle framework on pseries, the native arch
      idle routine comprised of both snooze and nap
      states.  smt_snooze_delay variable was used to delay
      the idle process entry to deeper idle state like  nap.
      With the coming of cpuidle, this arch specific idle was replaced
      by two different idle routines, one for supporting snooze and other
      for nap. This enabled addition of more
      low level idle states on pseries in the future.
      
      On adopting the generic cpuidle framework for POWER systems,
      the decision of which idle state to choose from,  given a predicted
      idle time is taken by the menu governor based on
      target_residency and  exit_latency of the idle states.
      target_residency is the minimum time to be resident in that idle state.
      Exit_latency is time taken to exit out of idle state.
      Deeper the idle state, both the target residency and exit latency
      would be higher.
      
      In the current design, smt_snooze_delay is used as target_residency
      for the  snooze state which is incorrect, as it is not the
      minimum but the maximum duration to be in snooze state.
      This would  result in the governor in taking bad decision,
      as presently target_residency of nap < target_residency of snooze
      inspite of nap being deeper idle state.
      
      This patch aims to fix this problem by replacing the smt_snooze_delay loop
      in snooze state, with the need_resched()  as the governor is aware of
      entry and exit of various idle transitions based on which
      next idle time prediction.
      
      The governor is intelligent enough to determine the idle state the needs to
      be transitioned to and maintains a whole of heuristics including
      io load, previous idle states predictions etc for the same, based on
      which idle state entry decision is taken.
      
      With this fix, of setting target_residency of snooze to 0
      					     nap to smt_snooze_delay
      if the predicted idle time is less
      than smt_snooze_delay (target_residency of nap)
      value governor would pick snooze state, else nap. This adhers to the
      previous native idle design.
      Signed-off-by: default avatarDeepthi Dharwar <deepthi@linux.vnet.ibm.com>
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      83dac594
    • Deepthi Dharwar's avatar
      cpuidle/powerpc: Fix smt_snooze_delay functionality. · 8ea959a1
      Deepthi Dharwar authored
      smt_snooze_delay was designed to  delay idle loop's nap entry
      in the native idle code before it got  ported over to use as part of
      the cpuidle framework.
      
      A -ve value  assigned to smt_snooze_delay should result in
      busy looping, in other words disabling the entry to nap state.
      
      	- https://lists.ozlabs.org/pipermail/linuxppc-dev/2010-May/082450.html
      
      This particular functionality can be achieved currently by
      echo 1 > /sys/devices/system/cpu/cpu*/state1/disable
      but it is broken when one assigns -ve value to  the smt_snooze_delay
      variable either via sysfs entry or ppc64_cpu util.
      
      This patch aims to fix this, by disabling nap state when smt_snooze_delay
      variable is set to -ve value.
      Signed-off-by: default avatarDeepthi Dharwar <deepthi@linux.vnet.ibm.com>
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      8ea959a1
    • Deepthi Dharwar's avatar
      cpuidle/powerpc: Fix target residency initialisation in pseries cpuidle · 817deb05
      Deepthi Dharwar authored
      Remove the redundant target residency initialisation in pseries_cpuidle_driver_init().
      This is currently over-writing the residency time updated as part of the static
      table, resulting in  all the idle states having the same target
      residency of 100us which is incorrect. This may result in the menu governor making
      wrong state decisions.
      Signed-off-by: default avatarDeepthi Dharwar <deepthi@linux.vnet.ibm.com>
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      817deb05
    • Aneesh Kumar K.V's avatar
      powerpc: Build fix for powerpc KVM · ce236ab5
      Aneesh Kumar K.V authored
      Fix build failure for powerpc KVM by adding missing VPN_SHIFT definition
      and the ';'
      
      arch/powerpc/kvm/book3s_32_mmu_host.c: In function 'kvmppc_mmu_map_page':
      arch/powerpc/kvm/book3s_32_mmu_host.c:176: error: 'VPN_SHIFT' undeclared (first use in this function)
      arch/powerpc/kvm/book3s_32_mmu_host.c:176: error: (Each undeclared identifier is reported only once
      arch/powerpc/kvm/book3s_32_mmu_host.c:176: error: for each function it appears in.)
      arch/powerpc/kvm/book3s_32_mmu_host.c:178: error: expected ';' before 'next_pteg'
      arch/powerpc/kvm/book3s_32_mmu_host.c:190: error: label 'next_pteg' used but not defined
      make[1]: *** [arch/powerpc/kvm/book3s_32_mmu_host.o] Error 1
      Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      ce236ab5
    • Benjamin Herrenschmidt's avatar
      Revert "powerpc/perf: Use pmc_overflow() to detect rolled back events" · 72523d80
      Benjamin Herrenschmidt authored
      This reverts commit 81331211.
      
      This revert was requested by the author of the patch as it seems
      to cause system hangs with some low frequency events
      72523d80
    • John Johansen's avatar
      apparmor: fix apparmor OOPS in audit_log_untrustedstring+0x1c/0x40 · 43c422ed
      John Johansen authored
      The capability defines have moved causing the auto generated names
      of capabilities that apparmor uses in logging to be incorrect.
      
      Fix the autogenerated table source to uapi/linux/capability.h
      Reported-by: default avatarYanHong <clouds.yan@gmail.com>
      Reported-by: default avatarKrzysztof Kolasa <kkolasa@winsoft.pl>
      Analyzed-by: default avatarAl Viro <viro@ZenIV.linux.org.uk>
      Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
      Acked-by: default avatarDavid Howells <dhowells@redhat.com>
      Acked-by: default avatarJames Morris <james.l.morris@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      43c422ed
    • Stephen Warren's avatar
      dtc: fix for_each_*() to skip first object if deleted · 205a8eb7
      Stephen Warren authored
      The previous definition of for_each_*() would always include the very
      first object within the list, irrespective of whether it was marked
      deleted, since the deleted flag was not checked on the first object,
      but only on any "next" object.
      
      Fix for_each_*() to check the deleted flag in the loop body every
      iteration to correct this.
      
      (upstream dtc commit 1762ab42ef77db7ab2776d0d6cba3515150f518a)
      Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
      Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
      205a8eb7
    • Kim Phillips's avatar
      of/platform: sparse fix · 24fb530f
      Kim Phillips authored
      drivers/of/platform.c:110:59: warning: incorrect type in argument 2 (different base types)
      drivers/of/platform.c:110:59:    expected restricted __be32 const [usertype] *addr
      drivers/of/platform.c:110:59:    got unsigned int const [usertype] *[assigned] reg
      Signed-off-by: default avatarKim Phillips <kim.phillips@freescale.com>
      Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
      24fb530f
    • Kim Phillips's avatar
      of/irq: sparse fixes · d2e41518
      Kim Phillips authored
      drivers/of/irq.c:195:57: warning: restricted __be32 degrades to integer
      drivers/of/irq.c:196:51: warning: restricted __be32 degrades to integer
      drivers/of/irq.c:199:57: warning: restricted __be32 degrades to integer
      drivers/of/irq.c:201:58: warning: restricted __be32 degrades to integer
      drivers/of/irq.c:470:37: warning: incorrect type in assignment (different modifiers)
      drivers/of/irq.c:470:37:    expected int ( *[usertype] irq_init_cb )( ... )
      drivers/of/irq.c:470:37:    got void const *const data
      drivers/of/irq.c:96:5: error: symbol 'of_irq_map_raw' redeclared with different type (originally declared at include/linux/of_irq.h:61) - incompatible argument 2 (different base types)
      
      drivers/of/of_pci_irq.c:91:40: warning: incorrect type in argument 2 (different base types)
      drivers/of/of_pci_irq.c:91:40:    expected unsigned int const [usertype] *intspec
      drivers/of/of_pci_irq.c:91:40:    got restricted __be32 *<noident>
      drivers/of/of_pci_irq.c:91:53: warning: incorrect type in argument 4 (different base types)
      drivers/of/of_pci_irq.c:91:53:    expected unsigned int const [usertype] *addr
      drivers/of/of_pci_irq.c:91:53:    got restricted __be32 *<noident>
      Signed-off-by: default avatarKim Phillips <kim.phillips@freescale.com>
      Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
      d2e41518
    • Kim Phillips's avatar
      of/address: sparse fixes · 47b1e689
      Kim Phillips authored
      drivers/of/address.c:66:29: warning: incorrect type in argument 1 (different base types)
      drivers/of/address.c:66:29:    expected restricted __be32 const [usertype] *cell
      drivers/of/address.c:66:29:    got unsigned int [usertype] *addr
      drivers/of/address.c:87:32: warning: incorrect type in argument 1 (different base types)
      drivers/of/address.c:87:32:    expected restricted __be32 const [usertype] *cell
      drivers/of/address.c:87:32:    got unsigned int [usertype] *addr
      drivers/of/address.c:91:30: warning: incorrect type in assignment (different base types)
      drivers/of/address.c:91:30:    expected unsigned int [unsigned] [usertype] <noident>
      drivers/of/address.c:91:30:    got restricted __be32 [usertype] <noident>
      drivers/of/address.c:92:22: warning: incorrect type in assignment (different base types)
      drivers/of/address.c:92:22:    expected unsigned int [unsigned] [usertype] <noident>
      drivers/of/address.c:92:22:    got restricted __be32 [usertype] <noident>
      drivers/of/address.c:147:35: warning: incorrect type in argument 1 (different base types)
      drivers/of/address.c:147:35:    expected restricted __be32 const [usertype] *addr
      drivers/of/address.c:147:35:    got unsigned int [usertype] *addr
      drivers/of/address.c:157:34: warning: incorrect type in argument 1 (different base types)
      drivers/of/address.c:157:34:    expected restricted __be32 const [usertype] *cell
      drivers/of/address.c:157:34:    got unsigned int [usertype] *
      drivers/of/address.c:256:29: warning: restricted __be32 degrades to integer
      drivers/of/address.c:256:36: warning: restricted __be32 degrades to integer
      drivers/of/address.c:262:34: warning: incorrect type in argument 1 (different base types)
      drivers/of/address.c:262:34:    expected restricted __be32 const [usertype] *cell
      drivers/of/address.c:262:34:    got unsigned int [usertype] *
      drivers/of/address.c:372:41: warning: incorrect type in argument 1 (different base types)
      drivers/of/address.c:372:41:    expected restricted __be32 const [usertype] *cell
      drivers/of/address.c:372:41:    got unsigned int [usertype] *addr
      drivers/of/address.c:395:53: warning: incorrect type in argument 2 (different base types)
      drivers/of/address.c:395:53:    expected restricted __be32 const [usertype] *addr
      drivers/of/address.c:395:53:    got unsigned int [usertype] *addr
      drivers/of/address.c:443:50: warning: incorrect type in argument 2 (different base types)
      drivers/of/address.c:443:50:    expected restricted __be32 const [usertype] *addr
      drivers/of/address.c:443:50:    got unsigned int *<noident>
      drivers/of/address.c:455:49: warning: incorrect type in argument 1 (different base types)
      drivers/of/address.c:455:49:    expected restricted __be32 const [usertype] *cell
      drivers/of/address.c:455:49:    got unsigned int *<noident>
      drivers/of/address.c:480:60: warning: incorrect type in argument 2 (different base types)
      drivers/of/address.c:480:60:    expected restricted __be32 const [usertype] *addr
      drivers/of/address.c:480:60:    got unsigned int *<noident>
      drivers/of/address.c:412:5: warning: symbol '__of_translate_address' was not declared. Should it be static?
      drivers/of/address.c:520:14: error: symbol 'of_get_address' redeclared with different type (originally declared at include/linux/of_address.h:22) - different base types
      Signed-off-by: default avatarKim Phillips <kim.phillips@freescale.com>
      Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
      47b1e689
    • Olof Johansson's avatar
      of: add stub of_get_child_by_name for non-OF builds · 25c040c9
      Olof Johansson authored
      Fixes build error on s3c6400_defconfig, introduced by commit
      06455bbc, "dt/s3c64xx/spi: Use
      of_get_child_by_name to get a named child".
      
      drivers/spi/spi-s3c64xx.c: In function 's3c64xx_get_slave_ctrldata':
      drivers/spi/spi-s3c64xx.c:838:2: error: implicit declaration of function
          'of_get_child_by_name' [-Werror=implicit-function-declaration]
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
      25c040c9
    • Linus Torvalds's avatar
      Merge tag 'uapi-fixes-20121017' of git://git.infradead.org/users/dhowells/linux-headers · 985c9e61
      Linus Torvalds authored
      Pull misc UAPI fixes from David Howells:
       "They do a number of things:
      
        (1) Import a patch from Catalin Marinas to extend the generic-y in
            Kbuild facility to uapi directories.
      
        (2) Make arch/tile's ucontext.h file use (1) and remove the header-y
            line from the kernel internal side of things.
      
        (3) Remove some now-empty conditional bits from include/linux/Kbuild.
            The contents got moved to the UAPI side of things along with new
            conditionals.
      
        (4) Deal with now-empty files:
      
           (a) Empty Kbuild files under include/ get removed.
      
           (b) Empty Kbuild files under arch/ get comments to hold them as
               they are likely to end up with generic-y or genhdr-y lines.
               Deleting them appears to work if we want to go that route.
      
           (c) Put a comment into uapi/asm-generic/kvm_para.h to prevent the
               patch program from deleting that, and made the arches with
               empty kvm_para.h uapi files use that instead of having their
               own files.
      
           (d) Put comments into four other empty uapi/ headers to prevent the
               patch program from deleting them.
      
        A question: Is this the right way to deal with the now-empty Kbuild
        files?
      
        The ones under include/ are unlikely to be used - even for generated
        files, I think - so getting rid of them is probably okay.  Once all
        the bits are in, we can probably remove all the Kbuild files under
        include/ that aren't also under include/uapi/.
      
        The ones under arch/ are more of an issue because of the potential for
        generic-y and genhdr-y."
      
      * tag 'uapi-fixes-20121017' of git://git.infradead.org/users/dhowells/linux-headers:
        UAPI: Make arch/sparc/include/uapi/asm/sigcontext.h non-empty
        UAPI: Make arch/sh/include/uapi/asm/hw_breakpoint.h non-empty
        UAPI: Make arch/mn10300/include/uapi/asm/setup.h non-empty
        UAPI: Put a comment into uapi/asm-generic/kvm_para.h and use it from arches
        UAPI: The tile arch uses the generic ucontext.h file
        UAPI: Place comments in empty arch Kbuilds to make them non-empty
        UAPI: Remove empty non-UAPI Kbuild files
        UAPI: Remove empty conditionals from include/linux/Kbuild
        UAPI: Make uapi/linux/irqnr.h non-empty
        uapi: Allow automatic generation of uapi/asm/ header files
      985c9e61
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 18673533
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Fix regression in /proc/net/if_inet6, sometimes devices do not get
          listed.  From Eric Dumazet.
      
       2) Add IPSEC networking sub-section to MAINTAINERS.
      
       3) S390 networking fixes from Hendrik Brueckner and Stefan Raspl.
      
       4) Fix enslavement of devices that can't do VLAN properly, from Jiri
          Pirko.
      
       5) SCTP sack handling fix from Zijie Pan.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        ipv6: addrconf: fix /proc/net/if_inet6
        bnx2x: fix handling mf storage modes
        qeth: fix deadlock between recovery and bonding driver
        smsgiucv: reestablish IUCV path after resume
        sctp: fix call to SCTP_CMD_PROCESS_SACK in sctp_cmd_interpreter()
        vlan: fix bond/team enslave of vlan challenged slave/port
        MAINTAINERS: Add explicit section for IPSEC networking.
      18673533
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · ccbfddb7
      Linus Torvalds authored
      Pull sparc fixes from David Miller:
       "Two sparc64 perf bug fixes and add a sysrq facility so I can diagnose
        these kinds of problems more quickly in the future."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc64: Fix bit twiddling in sparc_pmu_enable_event().
        sparc64: Add global PMU register dumping via sysrq.
        sparc64: Like x86 we should check current->mm during perf backtrace generation.
      ccbfddb7
    • Maxim Kachur's avatar
      ALSA: emu10k1: add chip details for E-mu 1010 PCIe card · 10f571d0
      Maxim Kachur authored
      Add chip details for E-mu 1010 PCIe card. It has the same
      chip as found in E-mu 1010b but it uses different PCI id.
      Signed-off-by: default avatarMaxim Kachur <mcdebugger@duganet.ru>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      10f571d0
    • Takashi Iwai's avatar
      Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus · c95d947f
      Takashi Iwai authored
      ASoC: Fixes for v3.7
      
      Nothing too exciting except for the ams-delta change which is relatively
      lerge due to the fact that the driver loading had been totally broken as
      the driver needed a newer API to function.
      c95d947f
    • David Howells's avatar
      UAPI: Make arch/sparc/include/uapi/asm/sigcontext.h non-empty · bb2bab17
      David Howells authored
      arch/sparc/include/uapi/asm/sigcontext.h was emitted by the UAPI disintegration
      script as an empty file because the parent file had no UAPI stuff in it,
      despite being marked with "header-y".
      
      Unfortunately, the patch program deletes resultant empty files when applying a
      kernel patch.
      
      So just stick a comment in there as a placeholder.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      cc: David S. Miller <davem@davemloft.net>
      cc: sparclinux@vger.kernel.org
      bb2bab17
    • David Howells's avatar
      UAPI: Make arch/sh/include/uapi/asm/hw_breakpoint.h non-empty · 588be300
      David Howells authored
      arch/sh/include/uapi/asm/hw_breakpoint.h was emitted by the UAPI disintegration
      script as an empty file because the parent file had no UAPI stuff in it,
      despite being marked with "header-y".
      
      Unfortunately, the patch program deletes resultant empty files when applying a
      kernel patch.
      
      So just stick a comment in there as a placeholder.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      cc: Paul Mundt <lethal@linux-sh.org>
      cc: linux-sh@vger.kernel.org
      588be300
    • David Howells's avatar
      UAPI: Make arch/mn10300/include/uapi/asm/setup.h non-empty · 11b8d246
      David Howells authored
      arch/mn10300/include/uapi/asm/setup.h was emitted by the UAPI disintegration
      script as an empty file because the parent file had no UAPI stuff in it,
      despite being marked with "header-y".
      
      Unfortunately, the patch program deletes resultant empty files when applying a
      kernel patch.
      
      So just stick a comment in there as a placeholder.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      11b8d246
    • David Howells's avatar
      UAPI: Put a comment into uapi/asm-generic/kvm_para.h and use it from arches · 0420c87e
      David Howells authored
      Make uapi/asm-generic/kvm_para.h non-empty by addition of a comment to stop
      the patch program from deleting it when it creates it.
      
      Then delete empty arch-specific uapi/asm/kvm_para.h files and tell the Kbuild
      files to use the generic instead.
      
      Should this perhaps instead be a #warning or #error that the facility is
      unsupported on this arch?
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      cc: Arnd Bergmann <arnd@arndb.de>
      cc: Avi Kivity <avi@redhat.com>
      cc: Marcelo Tosatti <mtosatti@redhat.com>
      cc: kvm@vger.kernel.org
      0420c87e
    • David Howells's avatar
      UAPI: The tile arch uses the generic ucontext.h file · e4522fcb
      David Howells authored
      Move the header-y and generic-y lines for ucontext.h from
      arch/tile/include/asm/Kbuild to the uapi/ Kbuild as the asm-generic variant is
      used.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      cc: Chris Metcalf <cmetcalf@tilera.com>
      e4522fcb
    • David Howells's avatar
      UAPI: Place comments in empty arch Kbuilds to make them non-empty · 4c7b279c
      David Howells authored
      Place comments in:
      
      	arch/mips/include/asm/Kbuild
      	arch/tile/include/arch/Kbuild
      
      to make them non-empty so that the patch program doesn't remove them when it
      reduces them to nothing.
      
      Possibly they should be just deleted, but it's possible that they'll acquire
      generic-y or genhdr-y lines in future, so I'm keeping them around for the
      moment.
      
      Note that MIPS will compile happily if the file is deleted instead.  I haven't
      tested TILE, but I suspect it will be the same there.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      cc: Ralf Baechle <ralf@linux-mips.org>
      cc: Chris Metcalf <cmetcalf@tilera.com>
      4c7b279c
    • David Howells's avatar
      UAPI: Remove empty non-UAPI Kbuild files · 64d7155c
      David Howells authored
      Remove non-UAPI Kbuild files that have become empty as a result of UAPI
      disintegration.  They used to have only header-y lines in them and those have
      now moved to the Kbuild files in the corresponding uapi/ directories.
      
      Possibly these should not be removed but rather have a comment inserted to say
      they are intentionally left blank.  This would make it easier to add generated
      header lines in future without having to restore the infrastructure.
      
      Note that at this point not all the UAPI disintegration parts have been merged,
      so it is likely that more empty Kbuild files will turn up.
      
      It is probably necessary to make the files non-empty to prevent the patch
      program from automatically deleting them when it reduces them to nothing.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      64d7155c
    • David Howells's avatar
      UAPI: Remove empty conditionals from include/linux/Kbuild · 02380470
      David Howells authored
      Remove empty conditionals from include/linux/Kbuild as the contents, with new
      conditionals, have moved to include/uapi/linux/Kbuild.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      02380470
    • David Howells's avatar
      UAPI: Make uapi/linux/irqnr.h non-empty · 886927e4
      David Howells authored
      uapi/linux/irqnr.h was emitted by the UAPI disintegration script as an empty
      file because the parent linux/irqnr.h had no UAPI stuff in it, despite being
      marked with "header-y".
      
      Unfortunately, the patch program deletes the empty file when applying a kernel
      patch.
      
      It's not clear why this file is part of the UAPI at all.  Looking in:
      
      	/usr/include/linux/irqnr.h
      
      there's nothing there but a header reinclusion guard and a comment.
      
      So just stick a comment in there as a placeholder.
      
      Without this, if the kernel is fabricated from, say, a tarball and a patch, you
      can get this error when building x86_64 or usermode Linux (and probably
      others):
      
      include/linux/irqnr.h:4:30: fatal error: uapi/linux/irqnr.h: No such file or directory
      Reported-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
      Reported-by: default avatarAlessandro Suardi <alessandro.suardi@gmail.com>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      cc: Randy Dunlap <rdunlap@xenotime.net>
      cc: Alessandro Suardi <alessandro.suardi@gmail.com>
      886927e4
    • Catalin Marinas's avatar
      uapi: Allow automatic generation of uapi/asm/ header files · 3c5994c8
      Catalin Marinas authored
      Several arch/*/include/uapi/asm/* header simply include the
      corresponding <asm-generic/*> file. This patch allows such files to be
      specified in uapi/asm/Kbuild via "generic-y += ..." to be automatically
      generated (similar to asm/Kbuild).
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Cc: Michal Marek <mmarek@suse.cz>
      Cc: Arnd Bergmann <arnd@arndb.de>
      3c5994c8
    • David Henningsson's avatar
      ALSA: hda - Always check array bounds in alc_get_line_out_pfx · 71aa5ebe
      David Henningsson authored
      Even when CONFIG_SND_DEBUG is not enabled, we don't want to
      return an arbitrary memory location when the channel count is
      larger than we expected.
      
      Cc: stable@kernel.org
      Signed-off-by: default avatarDavid Henningsson <david.henningsson@canonical.com>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      71aa5ebe
    • Mark Brown's avatar
    • Linus Torvalds's avatar
      Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh · 8d2b6b3a
      Linus Torvalds authored
      Pull SuperH updates from Paul Mundt.
      
      The bulk of this is the UAPI disintegration for SH.
      
      * tag 'sh-for-linus' of git://github.com/pmundt/linux-sh:
        sh: Fix up more fallout from pointless ARM __iomem churn.
        sh: Wire up kcmp syscall.
        UAPI: (Scripted) Disintegrate arch/sh/include/asm
      8d2b6b3a
    • Linus Torvalds's avatar
      Merge branch 'frv' (FRV patches from David Howells) · 90a24a4a
      Linus Torvalds authored
      Merge emailed FRV fixes from David Howells.
      
      * frv:
        FRV: Fix linux/elf-fdpic.h
        FRV: Fix const sections change
        FRV: Fix incorrect symbol in copy_thread()
        FRV: Fix VLIW packing constraint violation in entry.S
      90a24a4a
    • David Howells's avatar
      FRV: Fix linux/elf-fdpic.h · 0c552e5f
      David Howells authored
      It seems I accidentally switched the guard on linux/elf-fdpic.h from #ifdef
      __KERNEL__ to #ifndef __KERNEL__ when attempting to expand the guarded region
      to cover the elf_fdpic_params struct when doing the UAPI split - with the
      result that the struct became unavailable to kernel code.
      
      Move incorrectly guarded bits back to the kernelspace header.
      
      Whilst we're at it, the __KERNEL__ guards can be deleted as they're no longer
      necessary.
      Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Reported-by: default avatarLars-Peter Clausen <lars@metafoo.de>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      cc: Fengguang Wu <fengguang.wu@intel.com>
      cc: Lars-Peter Clausen <lars@metafoo.de>
      cc: uclinux-dev@uclinux.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0c552e5f
    • Andi Kleen's avatar
      FRV: Fix const sections change · b4b50871
      Andi Kleen authored
      Add __pminitconst to fix the build, otherwise the following error can occur:
      
        arch/frv/kernel/setup.c:187:47: error: expected '=', ',', ';', 'asm' or '__attribute__' before '*' token
        arch/frv/kernel/setup.c:386:2: error: 'clock_cmodes' undeclared (first use in this function)
        arch/frv/kernel/setup.c:571:6: error: 'clock_cmodes' undeclared (first use in this function)
        make[2]: *** [arch/frv/kernel/setup.o] Error 1
      
      http://kisskb.ellerman.id.au/kisskb/buildresult/7344691/Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b4b50871
    • David Howells's avatar
      FRV: Fix incorrect symbol in copy_thread() · ce7bfc7c
      David Howells authored
      Fix an incorrect symbol in copy_thread():
      
        arch/frv/kernel/process.c: In function 'copy_thread':
        arch/frv/kernel/process.c:197: error: 'chilregs' undeclared (first use in this function)
        arch/frv/kernel/process.c:197: error: (Each undeclared identifier is reported only once
        arch/frv/kernel/process.c:197: error: for each function it appears in.)
      Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Acked-by: default avatarAl Viro <viro@ZenIV.linux.org.uk>
      cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ce7bfc7c
    • David Howells's avatar
      FRV: Fix VLIW packing constraint violation in entry.S · 819e1c53
      David Howells authored
      Fix VLIW packing constraint violation in entry.S:
      
        arch/frv/kernel/entry.S: Assembler messages:
        arch/frv/kernel/entry.S:871: Error: VLIW packing constraint violation
      
      When packing CALLL with OR, CALLL must go in the first slot.  The
      instructions are executed simultaneously, so it doesn't matter which way
      round they're packed from that point of view.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Acked-by: default avatarAl Viro <viro@ZenIV.linux.org.uk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      819e1c53
    • Paul E. McKenney's avatar
      printk: Fix scheduling-while-atomic problem in console_cpu_notify() · 85eae82a
      Paul E. McKenney authored
      The console_cpu_notify() function runs with interrupts disabled in the
      CPU_DYING case.  It therefore cannot block, for example, as will happen
      when it calls console_lock().  Therefore, remove the CPU_DYING leg of
      the switch statement to avoid this problem.
      Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
      Reviewed-by: default avatarSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      85eae82a
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 75fa29c7
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Fixes for i915, nouveau and radeon:
      
         - i915: haswell stability, modeset rework fallout, ums fix
         - nouveau: misc fixes from code rework
         - radeon: pll rework fixes, more 2 level PTE cleanups.
         - core: warning fixes on 32-bit."
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (31 commits)
        nouveau: fix warning on 32-bit build.
        drm/nouveau/bios: fix typo in error message
        drm/nouveau: only call ttm_agp_tt_create when __OS_HAS_AGP
        drm/nv50/fb: fix double free of vram mm
        drm/nouveau/pm: do not stop reclocking if failing to set the fan speed
        drm/nouveau/pm: fix a typo related to the move to the therm subdev
        drm/nouveau/hwmon: fix the initialization condition
        drm: fix warning on 32-bit.
        drm: radeon: fix printk format warning
        drm/radeon: fix spelling typos in debugging output
        drm/radeon: Don't destroy I2C Bus Rec in radeon_ext_tmds_enc_destroy().
        drm/radeon: check if pcie gen 2 is already enabled (v2)
        drm/radeon/cayman: set VM max pfn at MC init
        drm/radeon: separate pt alloc from lru add
        drm/radeon: don't add the IB pool to all VMs v2
        drm/radeon: allocate page tables on demand v4
        drm/radeon: update comments to clarify VM setup (v2)
        drm/radeon: allocate PPLLs from low to high
        drm/radeon: fix compilation with backlight disabled
        drm/radeon: use %zu for formatting size_t
        ...
      75fa29c7
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 5d5c5dca
      Linus Torvalds authored
      Pull ext2, ext3, quota fixes from Jan Kara:
       "Fix three regressions caused by user namespace conversions (ext2,
        ext3, quota) and minor ext3 fix and cleanup."
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        quota: Silence warning about PRJQUOTA not being handled in need_print_warning()
        ext3: fix return values on parse_options() failure
        ext2: fix return values on parse_options() failure
        ext3: ext3_bread usage audit
        ext3: fix possible non-initialized variable on htree_dirblock_to_tree()
      5d5c5dca