1. 19 Oct, 2012 4 commits
  2. 18 Oct, 2012 8 commits
  3. 17 Oct, 2012 28 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
    • Mauro Carvalho Chehab's avatar
      [media] Kconfig: Fix dependencies for driver autoselect options · 2c76a12a
      Mauro Carvalho Chehab authored
      This option is a merge of both analog TV and DVB CUSTOMISE.
      
      At the merge, the dependencies were not done right: the menu
      currently appears only for analog TV. It should also be opened
      for digital TV. As there are other I2C devices there (flash
      devices, etc) that aren't related to either one, it is better
      to make it generic enough to open for all media devices with
      video.
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      2c76a12a
    • 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
    • Sasha Levin's avatar
      SUNRPC: Prevent kernel stack corruption on long values of flush · 212ba906
      Sasha Levin authored
      The buffer size in read_flush() is too small for the longest possible values
      for it. This can lead to a kernel stack corruption:
      
      [   43.047329] Kernel panic - not syncing: stack-protector: Kernel stack is corrupted in: ffffffff833e64b4
      [   43.047329]
      [   43.049030] Pid: 6015, comm: trinity-child18 Tainted: G        W    3.5.0-rc7-next-20120716-sasha #221
      [   43.050038] Call Trace:
      [   43.050435]  [<ffffffff836c60c2>] panic+0xcd/0x1f4
      [   43.050931]  [<ffffffff833e64b4>] ? read_flush.isra.7+0xe4/0x100
      [   43.051602]  [<ffffffff810e94e6>] __stack_chk_fail+0x16/0x20
      [   43.052206]  [<ffffffff833e64b4>] read_flush.isra.7+0xe4/0x100
      [   43.052951]  [<ffffffff833e6500>] ? read_flush_pipefs+0x30/0x30
      [   43.053594]  [<ffffffff833e652c>] read_flush_procfs+0x2c/0x30
      [   43.053596]  [<ffffffff812b9a8c>] proc_reg_read+0x9c/0xd0
      [   43.053596]  [<ffffffff812b99f0>] ? proc_reg_write+0xd0/0xd0
      [   43.053596]  [<ffffffff81250d5b>] do_loop_readv_writev+0x4b/0x90
      [   43.053596]  [<ffffffff81250fd6>] do_readv_writev+0xf6/0x1d0
      [   43.053596]  [<ffffffff812510ee>] vfs_readv+0x3e/0x60
      [   43.053596]  [<ffffffff812511b8>] sys_readv+0x48/0xb0
      [   43.053596]  [<ffffffff8378167d>] system_call_fastpath+0x1a/0x1f
      Signed-off-by: default avatarSasha Levin <levinsasha928@gmail.com>
      Cc: stable@kernel.org
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      212ba906
    • 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
    • Ralf Baechle's avatar
      MIPS: JZ4740: Forward declare struct uart_port in header. · a1226540
      Ralf Baechle authored
      As suggested by Geert Uytterhoeven <geert@linux-m68k.org>.
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      Cc: Antony Pavlov <antonynpavlov@gmail.com>
      Cc: linux-mips@linux-mips.org
      Cc: Lars-Peter Clausen <lars@metafoo.de>
      a1226540
    • Antony Pavlov's avatar
      MIPS: JZ4740: Fix '#include guard' in serial.h · a40b012f
      Antony Pavlov authored
      Signed-off-by: default avatarAntony Pavlov <antonynpavlov@gmail.com>
      Cc: linux-mips@linux-mips.org
      Cc: Lars-Peter Clausen <lars@metafoo.de>
      Patchwork: https://patchwork.linux-mips.org/patch/4424/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      a40b012f
    • Trond Myklebust's avatar
      NLM: nlm_lookup_file() may return NLMv4-specific error codes · cd0b16c1
      Trond Myklebust authored
      If the filehandle is stale, or open access is denied for some reason,
      nlm_fopen() may return one of the NLMv4-specific error codes nlm4_stale_fh
      or nlm4_failed. These get passed right through nlm_lookup_file(),
      and so when nlmsvc_retrieve_args() calls the latter, it needs to filter
      the result through the cast_status() machinery.
      
      Failure to do so, will trigger the BUG_ON() in encode_nlm_stat...
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      Reported-by: default avatarLarry McVoy <lm@bitmover.com>
      Cc: stable@kernel.org
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      cd0b16c1
    • Mauro Carvalho Chehab's avatar
      DocBook/media/Makefile: Fix build due to uapi breakage · ce3b5952
      Mauro Carvalho Chehab authored
      The uapi changeset forgot to fix the header locations, needed
      for the DocBook specs. Fix it.
      
      Cc: David Howells <dhowells@redhat.com>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      ce3b5952
    • David Howells's avatar
    • Mauro Carvalho Chehab's avatar
      Merge tag 'v3.7-rc1' into staging/for_v3.8 · 214e2ca2
      Mauro Carvalho Chehab authored
      Linux 3.7-rc1
      
      * tag 'v3.7-rc1': (9579 commits)
        Linux 3.7-rc1
        x86, boot: Explicitly include autoconf.h for hostprogs
        perf: Fix UAPI fallout
        ARM: config: make sure that platforms are ordered by option string
        ARM: config: sort select statements alphanumerically
        UAPI: (Scripted) Disintegrate include/linux/byteorder
        UAPI: (Scripted) Disintegrate include/linux
        UAPI: Unexport linux/blk_types.h
        UAPI: Unexport part of linux/ppp-comp.h
        perf: Handle new rbtree implementation
        procfs: don't need a PATH_MAX allocation to hold a string representation of an int
        vfs: embed struct filename inside of names_cache allocation if possible
        audit: make audit_inode take struct filename
        vfs: make path_openat take a struct filename pointer
        vfs: turn do_path_lookup into wrapper around struct filename variant
        audit: allow audit code to satisfy getname requests from its names_list
        vfs: define struct filename and have getname() return it
        btrfs: Fix compilation with user namespace support enabled
        userns: Fix posix_acl_file_xattr_userns gid conversion
        userns: Properly print bluetooth socket uids
        ...
      214e2ca2
    • 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