1. 28 Feb, 2015 17 commits
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · e9738946
      Linus Torvalds authored
      Merge misc fixes from Andrew Morton:
       "13 fixes"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        mm: add missing __PAGETABLE_{PUD,PMD}_FOLDED defines
        mm: page_alloc: revert inadvertent !__GFP_FS retry behavior change
        kernel/sys.c: fix UNAME26 for 4.0
        mm: memcontrol: use "max" instead of "infinity" in control knobs
        zram: use proper type to update max_used_pages
        drivers/rtc/rtc-ds1685.c: fix conditional in ds1685_rtc_sysfs_time_regs_{show,store}
        nilfs2: fix potential memory overrun on inode
        scripts/gdb: add empty package initialization script
        rtc: ds1685: remove superfluous checks for out-of-range u8 values
        rtc: ds1685: fix ds1685_rtc_alarm_irq_enable build error
        memcg: fix low limit calculation
        mm/nommu: fix memory leak
        ocfs2: update web page + git tree in documentation
      e9738946
    • Kirill A. Shutemov's avatar
      mm: add missing __PAGETABLE_{PUD,PMD}_FOLDED defines · c07af4f1
      Kirill A. Shutemov authored
      Core mm expects __PAGETABLE_{PUD,PMD}_FOLDED to be defined if these page
      table levels folded.  Usually, these defines are provided by
      <asm-generic/pgtable-nopmd.h> and <asm-generic/pgtable-nopud.h>.
      
      But some architectures fold page table levels in a custom way.  They
      need to define these macros themself.  This patch adds missing defines.
      
      The patch fixes mm->nr_pmds underflow and eliminates dead __pmd_alloc()
      and __pud_alloc() on architectures without these page table levels.
      Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
      Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
      Cc: David Howells <dhowells@redhat.com>
      Cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
      Cc: Helge Deller <deller@gmx.de>
      Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
      Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
      Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      c07af4f1
    • Johannes Weiner's avatar
      mm: page_alloc: revert inadvertent !__GFP_FS retry behavior change · cc873177
      Johannes Weiner authored
      Historically, !__GFP_FS allocations were not allowed to invoke the OOM
      killer once reclaim had failed, but nevertheless kept looping in the
      allocator.
      
      Commit 9879de73 ("mm: page_alloc: embed OOM killing naturally into
      allocation slowpath"), which should have been a simple cleanup patch,
      accidentally changed the behavior to aborting the allocation at that
      point.  This creates problems with filesystem callers (?) that currently
      rely on the allocator waiting for other tasks to intervene.
      
      Revert the behavior as it shouldn't have been changed as part of a
      cleanup patch.
      
      Fixes: 9879de73 ("mm: page_alloc: embed OOM killing naturally into allocation slowpath")
      Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
      Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
      Reported-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
      Cc: Theodore Ts'o <tytso@mit.edu>
      Cc: Dave Chinner <david@fromorbit.com>
      Acked-by: default avatarDavid Rientjes <rientjes@google.com>
      Cc: Oleg Nesterov <oleg@redhat.com>
      Cc: Mel Gorman <mgorman@suse.de>
      Cc: <stable@vger.kernel.org>	[3.19.x]
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      cc873177
    • Jon DeVree's avatar
      kernel/sys.c: fix UNAME26 for 4.0 · 39afb5ee
      Jon DeVree authored
      There's a uname workaround for broken userspace which can't handle kernel
      versions of 3.x.  Update it for 4.x.
      Signed-off-by: default avatarJon DeVree <nuxi@vault24.org>
      Cc: Andi Kleen <andi@firstfloor.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      39afb5ee
    • Johannes Weiner's avatar
      mm: memcontrol: use "max" instead of "infinity" in control knobs · d2973697
      Johannes Weiner authored
      The memcg control knobs indicate the highest possible value using the
      symbolic name "infinity", which is long and awkward to type.
      
      Switch to the string "max", which is just as descriptive but shorter and
      sweeter.
      
      This changes a user interface, so do it before the release and before
      the development flag is dropped from the default hierarchy.
      Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
      Cc: Michal Hocko <mhocko@suse.cz>
      Cc: Tejun Heo <tj@kernel.org>
      Cc: Vladimir Davydov <vdavydov@parallels.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d2973697
    • Joonsoo Kim's avatar
      zram: use proper type to update max_used_pages · 2ea55a2c
      Joonsoo Kim authored
      max_used_pages is defined as atomic_long_t so we need to use unsigned
      long to keep temporary value for it rather than int which is smaller
      than unsigned long in a 64 bit system.
      Signed-off-by: default avatarJoonsoo Kim <iamjoonsoo.kim@lge.com>
      Cc: Minchan Kim <minchan@kernel.org>
      Cc: Jerome Marchand <jmarchan@redhat.com>
      Cc: Nitin Gupta <ngupta@vflare.org>
      Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2ea55a2c
    • Joshua Kinard's avatar
      drivers/rtc/rtc-ds1685.c: fix conditional in ds1685_rtc_sysfs_time_regs_{show,store} · b00eeaed
      Joshua Kinard authored
      Fix a conditional statement checking for NULL in both
      ds1685_rtc_sysfs_time_regs_show and ds1685_rtc_sysfs_time_regs_store
      that was using a logical AND when it should be using a logical OR so
      that we fail out of the function properly if the condition ever
      evaluates to true.
      
      Fixes: aaaf5fbf ("rtc: add driver for DS1685 family of real time clocks")
      Signed-off-by: default avatarJoshua Kinard <kumba@gentoo.org>
      Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b00eeaed
    • Ryusuke Konishi's avatar
      nilfs2: fix potential memory overrun on inode · 957ed60b
      Ryusuke Konishi authored
      Each inode of nilfs2 stores a root node of a b-tree, and it turned out to
      have a memory overrun issue:
      
      Each b-tree node of nilfs2 stores a set of key-value pairs and the number
      of them (in "bn_nchildren" member of nilfs_btree_node struct), as well as
      a few other "bn_*" members.
      
      Since the value of "bn_nchildren" is used for operations on the key-values
      within the b-tree node, it can cause memory access overrun if a large
      number is incorrectly set to "bn_nchildren".
      
      For instance, nilfs_btree_node_lookup() function determines the range of
      binary search with it, and too large "bn_nchildren" leads
      nilfs_btree_node_get_key() in that function to overrun.
      
      As for intermediate b-tree nodes, this is prevented by a sanity check
      performed when each node is read from a drive, however, no sanity check
      has been done for root nodes stored in inodes.
      
      This patch fixes the issue by adding missing sanity check against b-tree
      root nodes so that it's called when on-memory inodes are read from ifile,
      inode metadata file.
      Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      957ed60b
    • Jan Kiszka's avatar
      scripts/gdb: add empty package initialization script · 586a1a12
      Jan Kiszka authored
      This got lost during the initial merge process: Python requires an
      __init__.py script, even if empty, in order to accept a directory as
      package.  Add it, this time as a non-empty file.
      Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      586a1a12
    • Geert Uytterhoeven's avatar
      rtc: ds1685: remove superfluous checks for out-of-range u8 values · 39ea34cc
      Geert Uytterhoeven authored
      drivers/rtc/rtc-ds1685.c: In function `ds1685_rtc_read_alarm':
      drivers/rtc/rtc-ds1685.c:402: warning: comparison is always true due to limited range of data type
      drivers/rtc/rtc-ds1685.c:409: warning: comparison is always true due to limited range of data type
      drivers/rtc/rtc-ds1685.c:416: warning: comparison is always true due to limited range of data type
      drivers/rtc/rtc-ds1685.c: In function `ds1685_rtc_set_alarm':
      drivers/rtc/rtc-ds1685.c:475: warning: comparison is always true due to limited range of data type
      drivers/rtc/rtc-ds1685.c:478: warning: comparison is always true due to limited range of data type
      drivers/rtc/rtc-ds1685.c:481: warning: comparison is always true due to limited range of data type
      
      u8 cannot contain a value larger than 0xff, hence drop the checks.
      Wrapping the checks in unlikely() indicated some sense of humor, though ;-)
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Acked-by: default avatarJoshua Kinard <kumba@gentoo.org>
      Cc: Alessandro Zummo <a.zummo@towertech.it>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      39ea34cc
    • Arnd Bergmann's avatar
      rtc: ds1685: fix ds1685_rtc_alarm_irq_enable build error · 682354d4
      Arnd Bergmann authored
      The newly added ds1685 driver causes a build error when enabled without
      CONFIG_RTC_INTF_DEV:
      
        drivers/rtc/rtc-ds1685.c:919:22: error: 'ds1685_rtc_alarm_irq_enable' undeclared here (not in a function)
          .alarm_irq_enable = ds1685_rtc_alarm_irq_enable,
      
      Apparently the driver was incorrectly changed to reflect the interface
      change from 16380c15 ("RTC: Convert rtc drivers to use the
      alarm_irq_enable method"), which removed the respective #ifdef from all
      other rtc drivers.
      
      This does the same change that was merged for the other drivers before and
      removes the #ifdef, allowing the interrupts to be enabled through the
      in-kernel rtc interface independent of the existence of /dev/rtc.
      
      Fixes: aaaf5fbf ("rtc: add driver for DS1685 family of real time clocks")
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarJoshua Kinard <kumba@gentoo.org>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: Alessandro Zummo <a.zummo@towertech.it>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      682354d4
    • Michal Hocko's avatar
      memcg: fix low limit calculation · 4e54dede
      Michal Hocko authored
      A memcg is considered low limited even when the current usage is equal to
      the low limit.  This leads to interesting side effects e.g.
      groups/hierarchies with no memory accounted are considered protected and
      so the reclaim will emit MEMCG_LOW event when encountering them.
      
      Another and much bigger issue was reported by Joonsoo Kim.  He has hit a
      NULL ptr dereference with the legacy cgroup API which even doesn't have
      low limit exposed.  The limit is 0 by default but the initial check fails
      for memcg with 0 consumption and parent_mem_cgroup() would return NULL if
      use_hierarchy is 0 and so page_counter_read would try to dereference NULL.
      
      I suppose that the current implementation is just an overlook because the
      documentation in Documentation/cgroups/unified-hierarchy.txt says:
      
        "The memory.low boundary on the other hand is a top-down allocated
        reserve.  A cgroup enjoys reclaim protection when it and all its
        ancestors are below their low boundaries"
      
      Fix the usage and the low limit comparision in mem_cgroup_low accordingly.
      
      Fixes: 241994ed (mm: memcontrol: default hierarchy interface for memory)
      Reported-by: default avatarJoonsoo Kim <js1304@gmail.com>
      Signed-off-by: default avatarMichal Hocko <mhocko@suse.cz>
      Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      4e54dede
    • Joonsoo Kim's avatar
      mm/nommu: fix memory leak · da616534
      Joonsoo Kim authored
      Maxime reported the following memory leak regression due to commit
      dbc8358c ("mm/nommu: use alloc_pages_exact() rather than its own
      implementation").
      
      On v3.19, I am facing a memory leak.  Each time I run a command one page
      is lost.  Here an example with busybox's free command:
      
        / # free
                     total       used       free     shared    buffers     cached
        Mem:          7928       1972       5956          0          0        492
        -/+ buffers/cache:       1480       6448
        / # free
                     total       used       free     shared    buffers     cached
        Mem:          7928       1976       5952          0          0        492
        -/+ buffers/cache:       1484       6444
        / # free
                     total       used       free     shared    buffers     cached
        Mem:          7928       1980       5948          0          0        492
        -/+ buffers/cache:       1488       6440
        / # free
                     total       used       free     shared    buffers     cached
        Mem:          7928       1984       5944          0          0        492
        -/+ buffers/cache:       1492       6436
        / # free
                     total       used       free     shared    buffers     cached
        Mem:          7928       1988       5940          0          0        492
        -/+ buffers/cache:       1496       6432
      
      At some point, the system fails to sastisfy 256KB allocations:
      
        free: page allocation failure: order:6, mode:0xd0
        CPU: 0 PID: 67 Comm: free Not tainted 3.19.0-05389-gacf2cf1-dirty #64
        Hardware name: STM32 (Device Tree Support)
          show_stack+0xb/0xc
          warn_alloc_failed+0x97/0xbc
          __alloc_pages_nodemask+0x295/0x35c
          __get_free_pages+0xb/0x24
          alloc_pages_exact+0x19/0x24
          do_mmap_pgoff+0x423/0x658
          vm_mmap_pgoff+0x3f/0x4e
          load_flat_file+0x20d/0x4f8
          load_flat_binary+0x3f/0x26c
          search_binary_handler+0x51/0xe4
          do_execveat_common+0x271/0x35c
          do_execve+0x19/0x1c
          ret_fast_syscall+0x1/0x4a
        Mem-info:
        Normal per-cpu:
        CPU    0: hi:    0, btch:   1 usd:   0
        active_anon:0 inactive_anon:0 isolated_anon:0
         active_file:0 inactive_file:0 isolated_file:0
         unevictable:123 dirty:0 writeback:0 unstable:0
         free:1515 slab_reclaimable:17 slab_unreclaimable:139
         mapped:0 shmem:0 pagetables:0 bounce:0
         free_cma:0
        Normal free:6060kB min:352kB low:440kB high:528kB active_anon:0kB inactive_anon:0kB active_file:0kB inactive_file:0kB unevictable:492kB isolated(anon):0ks
        lowmem_reserve[]: 0 0
        Normal: 23*4kB (U) 22*8kB (U) 24*16kB (U) 23*32kB (U) 23*64kB (U) 23*128kB (U) 1*256kB (U) 0*512kB 0*1024kB 0*2048kB 0*4096kB = 6060kB
        123 total pagecache pages
        2048 pages of RAM
        1538 free pages
        66 reserved pages
        109 slab pages
        -46 pages shared
        0 pages swap cached
        nommu: Allocation of length 221184 from process 67 (free) failed
        Normal per-cpu:
        CPU    0: hi:    0, btch:   1 usd:   0
        active_anon:0 inactive_anon:0 isolated_anon:0
         active_file:0 inactive_file:0 isolated_file:0
         unevictable:123 dirty:0 writeback:0 unstable:0
         free:1515 slab_reclaimable:17 slab_unreclaimable:139
         mapped:0 shmem:0 pagetables:0 bounce:0
         free_cma:0
        Normal free:6060kB min:352kB low:440kB high:528kB active_anon:0kB inactive_anon:0kB active_file:0kB inactive_file:0kB unevictable:492kB isolated(anon):0ks
        lowmem_reserve[]: 0 0
        Normal: 23*4kB (U) 22*8kB (U) 24*16kB (U) 23*32kB (U) 23*64kB (U) 23*128kB (U) 1*256kB (U) 0*512kB 0*1024kB 0*2048kB 0*4096kB = 6060kB
        123 total pagecache pages
        Unable to allocate RAM for process text/data, errno 12 SEGV
      
      This problem happens because we allocate ordered page through
      __get_free_pages() in do_mmap_private() in some cases and we try to free
      individual pages rather than ordered page in free_page_series().  In
      this case, freeing pages whose refcount is not 0 won't be freed to the
      page allocator so memory leak happens.
      
      To fix the problem, this patch changes __get_free_pages() to
      alloc_pages_exact() since alloc_pages_exact() returns
      physically-contiguous pages but each pages are refcounted.
      
      Fixes: dbc8358c ("mm/nommu: use alloc_pages_exact() rather than its own implementation").
      Reported-by: default avatarMaxime Coquelin <mcoquelin.stm32@gmail.com>
      Tested-by: default avatarMaxime Coquelin <mcoquelin.stm32@gmail.com>
      Signed-off-by: default avatarJoonsoo Kim <iamjoonsoo.kim@lge.com>
      Cc: <stable@vger.kernel.org>	[3.19]
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      da616534
    • Mark Fasheh's avatar
      ocfs2: update web page + git tree in documentation · 01945fa2
      Mark Fasheh authored
      We (the Ocfs2 project) recently moved the location of our ocfs2-tools
      git tree and project web page.  The pertinent discussion can be seen
      here:
      
        https://oss.oracle.com/pipermail/ocfs2-devel/2015-February/010579.html
      
      The following patch updates the Ocfs2 documentation in MAINTAINERS,
      ocfs2.txt, and dlmfs.txt.  I added our new official web page, changed
      the location of our tools git tree and removed the link to Joel's
      ancient kernel git tree - Andrew has handled our patches for a while
      now.
      Signed-off-by: default avatarMark Fasheh <mfasheh@suse.de>
      Cc: Joel Becker <jlbec@evilplan.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      01945fa2
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 895c8b7b
      Linus Torvalds authored
      Pull ARM SoC fixes from Arnd Bergmann:
       "The arm-soc bug fixes this time around are mostly for the omap
        platform, coming from a pull request from Tony Lindgren and are almost
        entirely fixing dts files.
      
        The other two changes enable support for the shmobile platform in
        generic armv7 kernels and change some properties in the ARM64
        reference board dts files"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: multi_v7_defconfig: Enable shmobile platforms
        arm64: Add L2 cache topology to ARM Ltd boards/models
        ARM: dts: am335x-bone*: usb0 is hardwired for peripheral
        ARM: dts: dra7x-evm: beagle-x15: Fix USB Host
        ARM: omap2plus_defconfig: Fix SATA boot
        ARM: omap2plus_defconfig: Enable OMAP NAND BCH driver
        ARM: dts: dra7: Correct the dma controller's property names
        ARM: dts: omap5: Correct the dma controller's property names
        ARM: dts: omap4: Correct the dma controller's property names
        ARM: dts: omap3: Correct the dma controller's property names
        ARM: dts: omap2: Correct the dma controller's property names
        ARM: dts: am437x-idk: fix sleep pinctrl state
        ARM: omap2plus_defconfig: enable TPS62362 regulator
        ARM: dts: am437x-idk: fix TPS62362 i2c bus
        ARM: dts: n900: Fix offset for smc91x ethernet
        ARM: dts: n900: fix i2c bus numbering
        ARM: dts: Fix USB dts configuration for dm816x
        ARM: dts: OMAP5: Fix SATA PHY node
        ARM: dts: DRA7: Fix SATA PHY node
      895c8b7b
    • Linus Torvalds's avatar
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 8d20a3dd
      Linus Torvalds authored
      Pull arm64 fixes from Catalin Marinas:
       "Various arm64 fixes:
         - ftrace branch generation fix
         - branch instruction encoding fix
         - include files, guards and unused prototypes clean-up
         - minor VDSO ABI fix (clock_getres)
         - PSCI functions moved to .S to avoid compilation error with gcc 5
         - pte_modify fix to not ignore the mapping type
         - crypto: AES interleaved increased to 4x (for performance reasons)
         - text patching fix for modules
         - swiotlb increased back to 64MB
         - copy_siginfo_to_user32() fix for big endian"
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: cpuidle: add asm/proc-fns.h inclusion
        arm64: compat Fix siginfo_t -> compat_siginfo_t conversion on big endian
        arm64: Increase the swiotlb buffer size 64MB
        arm64: Fix text patching logic when using fixmap
        arm64: crypto: increase AES interleave to 4x
        arm64: enable PTE type bit in the mask for pte_modify
        arm64: mm: remove unused functions and variable protoypes
        arm64: psci: move psci firmware calls out of line
        arm64: vdso: minor ABI fix for clock_getres
        arm64: guard asm/assembler.h against multiple inclusions
        arm64: insn: fix compare-and-branch encodings
        arm64: ftrace: fix ftrace_modify_graph_caller for branch replace
      8d20a3dd
    • Linus Torvalds's avatar
      Merge tag 'renesas-sh-drivers-for-v4.0' of... · 1c070515
      Linus Torvalds authored
      Merge tag 'renesas-sh-drivers-for-v4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas
      
      Pull SH driver fix from Simon Horman:
       "Disable PM runtime for multi-platform r8a7740 with genpd"
      
      * tag 'renesas-sh-drivers-for-v4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        drivers: sh: Disable PM runtime for multi-platform r8a7740 with genpd
      1c070515
  2. 27 Feb, 2015 3 commits
    • Lorenzo Pieralisi's avatar
      arm64: cpuidle: add asm/proc-fns.h inclusion · af4819af
      Lorenzo Pieralisi authored
      ARM64 CPUidle driver requires the cpu_do_idle function so that it can
      be used to enter the shallowest idle state, and it is declared in
      asm/proc-fns.h.
      
      The current ARM64 CPUidle driver does not include asm/proc-fns.h
      explicitly and it has so far relied on implicit inclusion from other
      header files.
      
      Owing to some header dependencies reshuffling this currently triggers
      build failures when CONFIG_ARM64_64K_PAGES=y:
      
      drivers/cpuidle/cpuidle-arm64.c: In function "arm64_enter_idle_state"
      drivers/cpuidle/cpuidle-arm64.c:42:3: error: implicit declaration of
      function "cpu_do_idle" [-Werror=implicit-function-declaration]
         cpu_do_idle();
         ^
      
      This patch adds the explicit inclusion of the asm/proc-fns.h header file
      in the arm64 asm/cpuidle.h header file, so that the build breakage is fixed
      and the required header inclusion is added to the appropriate arch back-end
      CPUidle header, already included by the CPUidle arm64 driver, where
      CPUidle arch related function declarations belong.
      Reported-by: default avatarLaura Abbott <lauraa@codeaurora.org>
      Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
      Acked-by: default avatarWill Deacon <will.deacon@arm.com>
      Tested-by: default avatarMark Rutland <mark.rutland@arm.com>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      af4819af
    • Catalin Marinas's avatar
      arm64: compat Fix siginfo_t -> compat_siginfo_t conversion on big endian · 9d42d48a
      Catalin Marinas authored
      The native (64-bit) sigval_t union contains sival_int (32-bit) and
      sival_ptr (64-bit). When a compat application invokes a syscall that
      takes a sigval_t value (as part of a larger structure, e.g.
      compat_sys_mq_notify, compat_sys_timer_create), the compat_sigval_t
      union is converted to the native sigval_t with sival_int overlapping
      with either the least or the most significant half of sival_ptr,
      depending on endianness. When the corresponding signal is delivered to a
      compat application, on big endian the current (compat_uptr_t)sival_ptr
      cast always returns 0 since sival_int corresponds to the top part of
      sival_ptr. This patch fixes copy_siginfo_to_user32() so that sival_int
      is copied to the compat_siginfo_t structure.
      
      Cc: <stable@vger.kernel.org>
      Reported-by: default avatarBamvor Jian Zhang <bamvor.zhangjian@huawei.com>
      Tested-by: default avatarBamvor Jian Zhang <bamvor.zhangjian@huawei.com>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      9d42d48a
    • Catalin Marinas's avatar
      arm64: Increase the swiotlb buffer size 64MB · a1e50a82
      Catalin Marinas authored
      With commit 3690951f (arm64: Use swiotlb late initialisation), the
      swiotlb buffer size is limited to MAX_ORDER_NR_PAGES. However, there are
      platforms with 32-bit only devices that require bounce buffering via
      swiotlb. This patch changes the swiotlb initialisation to an early 64MB
      memblock allocation. In order to get the swiotlb buffer correctly
      allocated (via memblock_virt_alloc_low_nopanic), this patch also defines
      ARCH_LOW_ADDRESS_LIMIT to the maximum physical address capable of 32-bit
      DMA.
      Reported-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
      Tested-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      a1e50a82
  3. 26 Feb, 2015 10 commits
  4. 25 Feb, 2015 3 commits
    • Arnd Bergmann's avatar
      Merge tag 'fixes-v4.0-rc1' of... · 6af714b0
      Arnd Bergmann authored
      Merge tag 'fixes-v4.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      Fixes for various omap devices. It's all dts and defconfig
      changes for this set:
      
      - Fix wrong DMA properties for dma to avoid them getting
        copied wrong again before we start actually using them
      
      - USB fixes to revert the extcon changes as the driver did not
        get merged yet and cause issues
      
      - Omap5 and dra7 fixes to boot from sata
      
      - Fix few am437x issues for i2c and pinctrl
      
      - Fix beaglebone for hardwared USB configuration
      
      - Defconfig changes for NAND, SATA and TPS62362
      
      - Fix n900 i2c numbering for legacy user space and smc91x
        register offset so it works also for qemu
      
      - Fix incomplete USB configuration for dm816x
      
      * tag 'fixes-v4.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: dts: am335x-bone*: usb0 is hardwired for peripheral
        ARM: dts: dra7x-evm: beagle-x15: Fix USB Host
        ARM: omap2plus_defconfig: Fix SATA boot
        ARM: omap2plus_defconfig: Enable OMAP NAND BCH driver
        ARM: dts: dra7: Correct the dma controller's property names
        ARM: dts: omap5: Correct the dma controller's property names
        ARM: dts: omap4: Correct the dma controller's property names
        ARM: dts: omap3: Correct the dma controller's property names
        ARM: dts: omap2: Correct the dma controller's property names
        ARM: dts: am437x-idk: fix sleep pinctrl state
        ARM: omap2plus_defconfig: enable TPS62362 regulator
        ARM: dts: am437x-idk: fix TPS62362 i2c bus
        ARM: dts: n900: Fix offset for smc91x ethernet
        ARM: dts: n900: fix i2c bus numbering
        ARM: dts: Fix USB dts configuration for dm816x
        ARM: dts: OMAP5: Fix SATA PHY node
        ARM: dts: DRA7: Fix SATA PHY node
      6af714b0
    • Sudeep Holla's avatar
      arm64: Add L2 cache topology to ARM Ltd boards/models · 7934d69a
      Sudeep Holla authored
      Commit 5d425c18 ("arm64: kernel: add support for cpu cache
      information") adds cacheinfo support for ARM64. Since there's no
      architectural way of detecting the cpus that share particular cache,
      device tree can be used and the core cacheinfo already supports the
      same.
      
      This patch adds the L2 cache topology on Juno board, FVP/RTSM and
      foundation models.
      Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Liviu Dudau <Liviu.Dudau@arm.com>
      Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      7934d69a
    • Takashi Iwai's avatar
      ALSA: hda - Disable runtime PM for Panther Point again · de5d0ad5
      Takashi Iwai authored
      This is essentially a partial revert of the commit [b1920c21:
      'ALSA: hda - Enable runtime PM on Panther Point'].  There was a bug
      report showing the HD-audio bus hang during runtime PM on HP Spectre
      XT.
      Reported-by: default avatarDang Sananikone <dang.sananikone@gmail.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      de5d0ad5
  5. 24 Feb, 2015 7 commits