1. 07 Feb, 2012 11 commits
  2. 06 Feb, 2012 6 commits
  3. 05 Feb, 2012 1 commit
  4. 04 Feb, 2012 22 commits
    • Linus Torvalds's avatar
      Merge tag 'pm-fixes-for-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 23783f81
      Linus Torvalds authored
      Power management fixes for 3.3-rc3
      
      Three power management regression fixes, one for a recent regression introcuded
      by the freezer changes during the 3.3 merge window and two for regressions
      in cpuidle (resulting from PM QoS changes) and in the hibernate user space
      interface, both introduced during the 3.2 development cycle.
      
      They include:
      
      * Two hibernate (s2disk) regression fixes from Srivatsa S. Bhat (for
       regressions introduced during the 3.3 merge window and during the 3.2
       development cycle).
      
      * A cpuidle fix from Venki Pallipadi for a regression resulting from PM QoS
       changes during the 3.2 development cycle causing cpuidle to work incorrectly
       for CONFIG_PM unset.
      
      * tag 'pm-fixes-for-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        PM / QoS: CPU C-state breakage with PM Qos change
        PM / Freezer: Thaw only kernel threads if freezing of kernel threads fails
        PM / Hibernate: Thaw kernel threads in SNAPSHOT_CREATE_IMAGE ioctl path
      23783f81
    • Venkatesh Pallipadi's avatar
      PM / QoS: CPU C-state breakage with PM Qos change · d020283d
      Venkatesh Pallipadi authored
      
      
      Looks like change "PM QoS: Move and rename the implementation files"
      merged during the 3.2 development cycle made PM QoS depend on
      CONFIG_PM which depends on (PM_SLEEP || PM_RUNTIME).
      
      That breaks CPU C-states with kernels not having these CONFIGs, causing CPUs
      to spend time in Polling loop idle instead of going into deep C-states,
      consuming way way more power. This is with either acpi idle or intel idle
      enabled.
      
      Either CONFIG_PM should be enabled with any pm_qos users or
      the !CONFIG_PM pm_qos_request() should return sane defaults not to break
      the existing users. Here's is the patch for the latter option.
      
      [rjw: Modified the changelog slightly.]
      Signed-off-by: default avatarVenkatesh Pallipadi <venki@google.com>
      Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
      Cc: stable@vger.kernel.org
      d020283d
    • Srivatsa S. Bhat's avatar
      PM / Freezer: Thaw only kernel threads if freezing of kernel threads fails · 379e0be8
      Srivatsa S. Bhat authored
      
      
      If freezing of kernel threads fails, we are expected to automatically
      thaw tasks in the error recovery path. However, at times, we encounter
      situations in which we would like the automatic error recovery path
      to thaw only the kernel threads, because we want to be able to do
      some more cleanup before we thaw userspace. Something like:
      
      error = freeze_kernel_threads();
      if (error) {
      	/* Do some cleanup */
      
      	/* Only then thaw userspace tasks*/
      	thaw_processes();
      }
      
      An example of such a situation is where we freeze/thaw filesystems
      during suspend/hibernation. There, if freezing of kernel threads
      fails, we would like to thaw the frozen filesystems before thawing
      the userspace tasks.
      
      So, modify freeze_kernel_threads() to thaw only kernel threads in
      case of freezing failure. And change suspend_freeze_processes()
      accordingly. (At the same time, let us also get rid of the rather
      cryptic usage of the conditional operator (:?) in that function.)
      
      [rjw: In fact, this patch fixes a regression introduced during the
       3.3 merge window, because without it thaw_processes() may be called
       before swsusp_free() in some situations and that may lead to massive
       memory allocation failures.]
      Signed-off-by: default avatarSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
      Acked-by: default avatarTejun Heo <tj@kernel.org>
      Acked-by: default avatarNigel Cunningham <nigel@tuxonice.net>
      Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
      379e0be8
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · d9142025
      Linus Torvalds authored
      arm-soc fixes for 3.3-rc
      
      * A series of OMAP regression fixes for merge window fallout
      * Two patches for Davinci, one removes some misdefined clocks, the other
        is a regression fix for merge window fallout
      * Two patches that makes Broadcom bcmring build again (and removes a
        bunch of unused code in the process)
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: bcmring: fix build failure in mach-bcmring/arch.c
        ARM: bcmring: remove unused DMA map code
        ARM: davinci: update mdio bus name
        ARM: OMAP2+: arch/arm/mach-omap2/smartreflex.c: add missing iounmap
        ARM: OMAP2+: arch/arm/mach-omap2/devices.c: introduce missing kfree
        ARM: OMAP: fix MMC2 loopback clock handling
        ARM: OMAP: fix erroneous mmc2 clock change on mmc3 setup
        ARM: OMAP2+: GPMC: fix device size setup
        ARM: OMAP2+: timer: Fix crash due to wrong arg to __omap_dm_timer_read_counter
        ARM: OMAP3: hwmod data: register dss hwmods after dss_core
        ARM: OMAP2/3: PRM: fix missing plat/irqs.h build breakage
        ARM: OMAP2+: io: fix compilation breakage on 2420-only configs
        ARM: OMAP4: hwmod data: Add names for DMIC memory address space
        ARM: OMAP3: hwmod data: add SYSC_HAS_ENAWAKEUP for dispc
        ARM: OMAP2+: hwmod data: split omap2/3 dispc hwmod class
        ARM: davinci: DA850: remove non-existing pll1_sysclk4-7 clocks
        ARM: OMAP2: fix regulator warnings
        ARM: OMAP2: fix omap3 touchbook kconfig warning
        i2c: OMAP: Fix OMAP1 build error
      d9142025
    • Paul Gortmaker's avatar
      ARM: bcmring: fix build failure in mach-bcmring/arch.c · ca43784d
      Paul Gortmaker authored
      Upstream commit d1fce9c1
      
      
      
         "ARM: restart: bcmring: use new restart hook"
      
      breaks building of this platform, since what used to be the
      last field of the MACHINE_START/END block didn't have a
      trailing comma.  Once another field was added below, we get:
      
      arch/arm/mach-bcmring/arch.c:198: error: request for member 'restart' in something not a structure or union
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Acked-by: default avatarJiandong Zheng <jdzheng@broadcom.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      ca43784d
    • JD Zheng's avatar
      ARM: bcmring: remove unused DMA map code · 864e5e36
      JD Zheng authored
      Remove BCMRING DMA map code which is no longer used.
      
      This also fixes a build error with dma.c introduced by
      bfcd2ea6
      
      .
      Signed-off-by: default avatarJiandong Zheng <jdzheng@broadcom.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      864e5e36
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 31c150a1
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: i8042 - add Lenovo Ideapad U455 to 'reset' blacklist
        Input: serio_raw - return proper result when serio_raw_read fails
        Input: document device properties
        Input: twl4030_keypad - fix comment (trivial)
        Input: gpio_keys - fix struct device declared inside parameter list
        Input: evdev - fix variable initialisation
      31c150a1
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma · 4554c135
      Linus Torvalds authored
      * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
        i.MX SDMA: Fix burstsize settings
        ARM: mach-shmobile: both USB DMAC instances on sh7372 are slave-only
        dma: sh_dma: not all SH DMAC implementations support MEMCPY
        at_hdmac: bugfix for enabling channel irq
        dmaengine: fix missing 'cnt' in ?: in dmatest
      4554c135
    • Linus Torvalds's avatar
      Merge branch 'akpm' · 82bdc843
      Linus Torvalds authored
      * akpm:
        mm: compaction: check pfn_valid when entering a new MAX_ORDER_NR_PAGES block during isolation for migration
        readahead: fix pipeline break caused by block plug
        kprobes: fix a memory leak in function pre_handler_kretprobe()
        drivers/tty/vt/vt_ioctl.c: fix KDFONTOP 32bit compatibility layer
        lkdtm: avoid calling lkdtm_do_action() with spinlock held
        mm/filemap_xip.c: fix race condition in xip_file_fault()
        mm/memcontrol.c: fix warning with CONFIG_NUMA=n
        avr32: select generic atomic64_t support
        mm: postpone migrated page mapping reset
        xtensa: fix memscan()
        MAINTAINERS: update lguest F: patterns
        MAINTAINERS: remove staging sections
        MAINTAINERS: remove iMX5 section
        MAINTAINERS: update partitions block F: patterns
      82bdc843
    • Linus Torvalds's avatar
      Merge tag 'for-linus-3.3' of git://git.infradead.org/~dwmw2/mtd-3.3 · 71b1b20b
      Linus Torvalds authored
       - Fix a regression in 16-bit Atmel NAND flash which was introduced in 3.1
       - Fix breakage with MTD suspend caused by the API rework
       - Fix a problem with resetting the MX28 BCH module
       - A couple of other trivial fixes
      
      * tag 'for-linus-3.3-20120204' of git://git.infradead.org/~dwmw2/mtd-3.3:
        Revert "mtd: atmel_nand: optimize read/write buffer functions"
        mtd: fix MTD suspend
        jffs2: do not initialize variable unnecessarily
        mtd: gpmi-nand bugfix: reset the BCH module when it is not MX23
        mtd: nand: fix typo in comment
      71b1b20b
    • Artem Bityutskiy's avatar
      Revert "mtd: atmel_nand: optimize read/write buffer functions" · 50082319
      Artem Bityutskiy authored
      This reverts commit fb542750
      
      .
      
      The reason is that it breaks 16 bits NAND flash as it was reported by
      Nikolaus Voss and confirmed by Eric Bénard.
      
      Nicolas Ferre <nicolas.ferre@atmel.com> alco confirmed:
      "After double checking with designers, I must admit that I misunderstood
      the way of optimizing accesses to SMC. 16 bit nand is not so common
      those days..."
      Reported-by: default avatarNikolaus Voss <n.voss@weinmann.de>
      Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
      Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
      Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
      Cc: stable@kernel.org [3.1+]
      50082319
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm · d1256667
      Linus Torvalds authored
      * 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
        ARM: 7314/1: kuser: consistently use usr_ret for returning from helpers
        ARM: 7302/1: Add TLB flushing for both entries in a PMD
        ARM: 7303/1: perf: add empty NODE event definitions for Cortex-A5 and Cortex-A15
        ARM: 7308/1: vfp: flush thread hwstate before copying ptrace registers
        ARM: 7307/1: vfp: fix ptrace regset modification race
        ARM: 7306/1: vfp: flush thread hwstate before restoring context from sigframe
        Revert "ARM: 7304/1: ioremap: fix boundary check when reusing static mapping"
      d1256667
    • Mel Gorman's avatar
      mm: compaction: check pfn_valid when entering a new MAX_ORDER_NR_PAGES block... · 0bf380bc
      Mel Gorman authored
      
      mm: compaction: check pfn_valid when entering a new MAX_ORDER_NR_PAGES block during isolation for migration
      
      When isolating for migration, migration starts at the start of a zone
      which is not necessarily pageblock aligned.  Further, it stops isolating
      when COMPACT_CLUSTER_MAX pages are isolated so migrate_pfn is generally
      not aligned.  This allows isolate_migratepages() to call pfn_to_page() on
      an invalid PFN which can result in a crash.  This was originally reported
      against a 3.0-based kernel with the following trace in a crash dump.
      
      PID: 9902   TASK: d47aecd0  CPU: 0   COMMAND: "memcg_process_s"
       #0 [d72d3ad0] crash_kexec at c028cfdb
       #1 [d72d3b24] oops_end at c05c5322
       #2 [d72d3b38] __bad_area_nosemaphore at c0227e60
       #3 [d72d3bec] bad_area at c0227fb6
       #4 [d72d3c00] do_page_fault at c05c72ec
       #5 [d72d3c80] error_code (via page_fault) at c05c47a4
          EAX: 00000000  EBX: 000c0000  ECX: 00000001  EDX: 00000807  EBP: 000c0000
          DS:  007b      ESI: 00000001  ES:  007b      EDI: f3000a80  GS:  6f50
          CS:  0060      EIP: c030b15a  ERR: ffffffff  EFLAGS: 00010002
       #6 [d72d3cb4] isolate_migratepages at c030b15a
       #7 [d72d3d14] zone_watermark_ok at c02d26cb
       #8 [d72d3d2c] compact_zone at c030b8de
       #9 [d72d3d68] compact_zone_order at c030bba1
      #10 [d72d3db4] try_to_compact_pages at c030bc84
      #11 [d72d3ddc] __alloc_pages_direct_compact at c02d61e7
      #12 [d72d3e08] __alloc_pages_slowpath at c02d66c7
      #13 [d72d3e78] __alloc_pages_nodemask at c02d6a97
      #14 [d72d3eb8] alloc_pages_vma at c030a845
      #15 [d72d3ed4] do_huge_pmd_anonymous_page at c03178eb
      #16 [d72d3f00] handle_mm_fault at c02f36c6
      #17 [d72d3f30] do_page_fault at c05c70ed
      #18 [d72d3fb0] error_code (via page_fault) at c05c47a4
          EAX: b71ff000  EBX: 00000001  ECX: 00001600  EDX: 00000431
          DS:  007b      ESI: 08048950  ES:  007b      EDI: bfaa3788
          SS:  007b      ESP: bfaa36e0  EBP: bfaa3828  GS:  6f50
          CS:  0073      EIP: 080487c8  ERR: ffffffff  EFLAGS: 00010202
      
      It was also reported by Herbert van den Bergh against 3.1-based kernel
      with the following snippet from the console log.
      
      BUG: unable to handle kernel paging request at 01c00008
      IP: [<c0522399>] isolate_migratepages+0x119/0x390
      *pdpt = 000000002f7ce001 *pde = 0000000000000000
      
      It is expected that it also affects 3.2.x and current mainline.
      
      The problem is that pfn_valid is only called on the first PFN being
      checked and that PFN is not necessarily aligned.  Lets say we have a case
      like this
      
      H = MAX_ORDER_NR_PAGES boundary
      | = pageblock boundary
      m = cc->migrate_pfn
      f = cc->free_pfn
      o = memory hole
      
      H------|------H------|----m-Hoooooo|ooooooH-f----|------H
      
      The migrate_pfn is just below a memory hole and the free scanner is beyond
      the hole.  When isolate_migratepages started, it scans from migrate_pfn to
      migrate_pfn+pageblock_nr_pages which is now in a memory hole.  It checks
      pfn_valid() on the first PFN but then scans into the hole where there are
      not necessarily valid struct pages.
      
      This patch ensures that isolate_migratepages calls pfn_valid when
      necessary.
      Reported-by: default avatarHerbert van den Bergh <herbert.van.den.bergh@oracle.com>
      Tested-by: default avatarHerbert van den Bergh <herbert.van.den.bergh@oracle.com>
      Signed-off-by: default avatarMel Gorman <mgorman@suse.de>
      Acked-by: default avatarMichal Nazarewicz <mina86@mina86.com>
      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>
      0bf380bc
    • Shaohua Li's avatar
      readahead: fix pipeline break caused by block plug · 3deaa719
      Shaohua Li authored
      
      
      Herbert Poetzl reported a performance regression since 2.6.39.  The test
      is a simple dd read, but with big block size.  The reason is:
      
      T1: ra (A, A+128k), (A+128k, A+256k)
      T2: lock_page for page A, submit the 256k
      T3: hit page A+128K, ra (A+256k, A+384). the range isn't submitted
      because of plug and there isn't any lock_page till we hit page A+256k
      because all pages from A to A+256k is in memory
      T4: hit page A+256k, ra (A+384, A+ 512). Because of plug, the range isn't
      submitted again.
      T5: lock_page A+256k, so (A+256k, A+512k) will be submitted. The task is
      waitting for (A+256k, A+512k) finish.
      
      There is no request to disk in T3 and T4, so readahead pipeline breaks.
      
      We really don't need block plug for generic_file_aio_read() for buffered
      I/O.  The readahead already has plug and has fine grained control when I/O
      should be submitted.  Deleting plug for buffered I/O fixes the regression.
      
      One side effect is plug makes the request size 256k, the size is 128k
      without it.  This is because default ra size is 128k and not a reason we
      need plug here.
      
      Vivek said:
      
      : We submit some readahead IO to device request queue but because of nested
      : plug, queue never gets unplugged.  When read logic reaches a page which is
      : not in page cache, it waits for page to be read from the disk
      : (lock_page_killable()) and that time we flush the plug list.
      :
      : So effectively read ahead logic is kind of broken in parts because of
      : nested plugging.  Removing top level plug (generic_file_aio_read()) for
      : buffered reads, will allow unplugging queue earlier for readahead.
      Signed-off-by: default avatarShaohua Li <shaohua.li@intel.com>
      Signed-off-by: default avatarWu Fengguang <fengguang.wu@intel.com>
      Reported-by: default avatarHerbert Poetzl <herbert@13thfloor.at>
      Tested-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
      Cc: Christoph Hellwig <hch@infradead.org>
      Cc: Jens Axboe <axboe@kernel.dk>
      Cc: Vivek Goyal <vgoyal@redhat.com>
      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>
      3deaa719
    • Jiang Liu's avatar
      kprobes: fix a memory leak in function pre_handler_kretprobe() · 55ca6140
      Jiang Liu authored
      
      
      In function pre_handler_kretprobe(), the allocated kretprobe_instance
      object will get leaked if the entry_handler callback returns non-zero.
      This may cause all the preallocated kretprobe_instance objects exhausted.
      
      This issue can be reproduced by changing
      samples/kprobes/kretprobe_example.c to probe "mutex_unlock".  And the fix
      is straightforward: just put the allocated kretprobe_instance object back
      onto the free_instances list.
      
      [akpm@linux-foundation.org: use raw_spin_lock/unlock]
      Signed-off-by: default avatarJiang Liu <jiang.liu@huawei.com>
      Acked-by: default avatarJim Keniston <jkenisto@us.ibm.com>
      Acked-by: default avatarAnanth N Mavinakayanahalli <ananth@in.ibm.com>
      Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
      Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
      Cc: "David S. Miller" <davem@davemloft.net>
      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>
      55ca6140
    • Samuel Thibault's avatar
      drivers/tty/vt/vt_ioctl.c: fix KDFONTOP 32bit compatibility layer · cbcb8346
      Samuel Thibault authored
      
      
      KDFONTOP(GET) currently fails with EIO when being run in a 32bit userland
      with a 64bit kernel if the font width is not 8.
      
      This is because of the setting of the KD_FONT_FLAG_OLD flag, which makes
      con_font_get return EIO in such case.
      
      This flag should *not* be set for KDFONTOP, since it's actually the whole
      point of this flag (see comment in con_font_set for instance).
      Signed-off-by: default avatarSamuel Thibault <samuel.thibault@ens-lyon.org>
      Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
      Cc: Greg Kroah-Hartman <gregkh@suse.de>
      Cc: Arthur Taylor <art@ified.ca>
      Cc: Jiri Slaby <jslaby@suse.cz>
      Cc: Jiri Olsa <jolsa@redhat.com>
      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>
      cbcb8346
    • Cong Wang's avatar
      lkdtm: avoid calling lkdtm_do_action() with spinlock held · 92618184
      Cong Wang authored
      
      
      lkdtm_do_action() may call sleeping functions like kmalloc(), so do not
      call it with spin lock held.
      Signed-off-by: default avatarWANG Cong <xiyou.wangcong@gmail.com>
      Cc: Prarit Bhargava <prarit@redhat.com>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Greg Kroah-Hartman <greg@kroah.com>
      Reviewed-by: default avatarDave Young <dyoung@redhat.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      92618184
    • Carsten Otte's avatar
      mm/filemap_xip.c: fix race condition in xip_file_fault() · 99f02ef1
      Carsten Otte authored
      
      
      Fix a race condition that shows in conjunction with xip_file_fault() when
      two threads of the same user process fault on the same memory page.
      
      In this case, the race winner will install the page table entry and the
      unlucky loser will cause an oops: xip_file_fault calls vm_insert_pfn (via
      vm_insert_mixed) which drops out at this check:
      
      	retval = -EBUSY;
      	if (!pte_none(*pte))
      		goto out_unlock;
      
      The resulting -EBUSY return value will trigger a BUG_ON() in
      xip_file_fault.
      
      This fix simply considers the fault as fixed in this case, because the
      race winner has successfully installed the pte.
      
      [akpm@linux-foundation.org: use conventional (and consistent) comment layout]
      Reported-by: default avatarDavid Sadler <dsadler@us.ibm.com>
      Signed-off-by: default avatarCarsten Otte <cotte@de.ibm.com>
      Reported-by: default avatarLouis Alex Eisner <leisner@cs.ucsd.edu>
      Cc: Hugh Dickins <hughd@google.com>
      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>
      99f02ef1
    • Andrew Morton's avatar
      mm/memcontrol.c: fix warning with CONFIG_NUMA=n · 82b3f2a7
      Andrew Morton authored
      
      
      mm/memcontrol.c: In function 'memcg_check_events':
      mm/memcontrol.c:779: warning: unused variable 'do_numainfo'
      Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
      Cc: Li Zefan <lizf@cn.fujitsu.com>
      Cc: Hiroyuki KAMEZAWA <kamezawa.hiroyu@jp.fujitsu.com>
      Cc: Johannes Weiner <hannes@cmpxchg.org>
      Acked-by: default avatar"Kirill A. Shutemov" <kirill@shutemov.name>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      82b3f2a7
    • Fabio Baltieri's avatar
      avr32: select generic atomic64_t support · 31e0017e
      Fabio Baltieri authored
      
      
      Enable use of the generic atomic64 implementation on AVR32 platforms.
      Without this the kernel fails to build as the architecture does not
      provide its version.
      Signed-off-by: default avatarFabio Baltieri <fabio.baltieri@gmail.com>
      Acked-by: default avatarHans-Christian Egtvedt <egtvedt@samfundet.no>
      Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      31e0017e
    • Konstantin Khlebnikov's avatar
      mm: postpone migrated page mapping reset · 35512eca
      Konstantin Khlebnikov authored
      
      
      Postpone resetting page->mapping until the final remove_migration_ptes().
      Otherwise the expression PageAnon(migration_entry_to_page(entry)) does not
      work.
      Signed-off-by: default avatarKonstantin Khlebnikov <khlebnikov@openvz.org>
      Cc: Hugh Dickins <hughd@google.com>
      Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      35512eca
    • Akinobu Mita's avatar
      xtensa: fix memscan() · a1b58c23
      Akinobu Mita authored
      
      
      Defining memscan() as memchr() is wrong, because the return values of
      memscan() and memchr() are different when the character is not found.  So
      use the generic memscan() implementation to fix this.
      Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
      Cc: Chris Zankel <chris@zankel.net>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      a1b58c23