1. 31 1月, 2020 3 次提交
  2. 12 12月, 2019 9 次提交
    • G
      nios2: Fix ioremap · e32ea127
      Guenter Roeck 提交于
      Commit 5ace77e0 ("nios2: remove __ioremap") removed the following code,
      with the argument that cacheflag is always 0 and the expression would
      therefore always be false.
      
      	if (IS_MAPPABLE_UNCACHEABLE(phys_addr) &&
      	    IS_MAPPABLE_UNCACHEABLE(last_addr) &&
      	    !(cacheflag & _PAGE_CACHED))
      		return (void __iomem *)(CONFIG_NIOS2_IO_REGION_BASE + phys_addr);
      
      This did not take the "!" in the expression into account. Result is that
      nios2 images no longer boot. Restoring the removed code fixes the problem.
      
      Fixes: 5ace77e0 ("nios2: remove __ioremap")
      Cc: Christoph Hellwig <hch@lst.de>
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      Reviewed-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NLey Foon Tan <ley.foon.tan@intel.com>
      e32ea127
    • J
      crypto: arm/curve25519 - add arch-specific key generation function · 84faa307
      Jason A. Donenfeld 提交于
      Somehow this was forgotten when Zinc was being split into oddly shaped
      pieces, resulting in linker errors. The x86_64 glue has a specific key
      generation implementation, but the Arm one does not. However, it can
      still receive the NEON speedups by calling the ordinary DH function
      using the base point.
      Signed-off-by: NJason A. Donenfeld <Jason@zx2c4.com>
      Acked-by: NArd Biesheuvel <ardb@kernel.org>
      Signed-off-by: NHerbert Xu <herbert@gondor.apana.org.au>
      84faa307
    • V
      s390/kasan: add KASAN_VMALLOC support · 3e39ce26
      Vasily Gorbik 提交于
      Add KASAN_VMALLOC support which now enables vmalloc memory area access
      checks as well as enables usage of VMAP_STACK under kasan.
      
      KASAN_VMALLOC changes the way vmalloc and modules areas shadow memory
      is handled. With this new approach only top level page tables are
      pre-populated and lower levels are filled dynamically upon memory
      allocation.
      Acked-by: NIlya Leoshkevich <iii@linux.ibm.com>
      Signed-off-by: NVasily Gorbik <gor@linux.ibm.com>
      3e39ce26
    • H
      s390: remove last diag 0x44 caller · 1b68ac86
      Heiko Carstens 提交于
      diag 0x44 is a voluntary undirected yield of a virtual CPU. This has
      caused a lot of performance issues in the past.
      
      There is only one caller left, and that one is only executed if diag
      0x9c (directed yield) is not present. Given that all hypervisors
      implement diag 0x9c anyway, remove the last diag 0x44 to avoid that
      more callers will be added.
      
      Worst case that could happen now, if diag 0x9c is not present, is that
      a virtual CPU would loop a bit instead of giving its time slice up.
      
      diag 0x44 statistics in debugfs are kept and will always be zero, so
      that user space can tell that there are no calls.
      Signed-off-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: NVasily Gorbik <gor@linux.ibm.com>
      1b68ac86
    • C
      s390/uv: use EOPNOTSUPP instead of ENOTSUPP · 157309a9
      Christian Borntraeger 提交于
      ENOTSUP is just an internal kernel error and should never reach
      userspace. The return value of the share function is not exported to
      userspace, but to avoid giving bad examples let us use EOPNOTSUPP:
      Suggested-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Acked-by: NJanosch Frank <frankja@linux.ibm.com>
      Signed-off-by: NChristian Borntraeger <borntraeger@de.ibm.com>
      Signed-off-by: NVasily Gorbik <gor@linux.ibm.com>
      157309a9
    • T
      s390/cpum_sf: Avoid SBD overflow condition in irq handler · 0539ad0b
      Thomas Richter 提交于
      The s390 CPU Measurement sampling facility has an overflow condition
      which fires when all entries in a SBD are used.
      The measurement alert interrupt is triggered and reads out all samples
      in this SDB. It then tests the successor SDB, if this SBD is not full,
      the interrupt handler does not read any samples at all from this SDB
      The design waits for the hardware to fill this SBD and then trigger
      another meassurement alert interrupt.
      
      This scheme works nicely until
      an perf_event_overflow() function call discards the sample due to
      a too high sampling rate.
      The interrupt handler has logic to read out a partially filled SDB
      when the perf event overflow condition in linux common code is met.
      This causes the CPUM sampling measurement hardware and the PMU
      device driver to operate on the same SBD's trailer entry.
      This should not happen.
      
      This can be seen here using this trace:
         cpumsf_pmu_add: tear:0xb5286000
         hw_perf_event_update: sdbt 0xb5286000 full 1 over 0 flush_all:0
         hw_perf_event_update: sdbt 0xb5286008 full 0 over 0 flush_all:0
              above shows 1. interrupt
         hw_perf_event_update: sdbt 0xb5286008 full 1 over 0 flush_all:0
         hw_perf_event_update: sdbt 0xb5286008 full 0 over 0 flush_all:0
              above shows 2. interrupt
      	... this goes on fine until...
         hw_perf_event_update: sdbt 0xb5286068 full 1 over 0 flush_all:0
         perf_push_sample1: overflow
            one or more samples read from the IRQ handler are rejected by
            perf_event_overflow() and the IRQ handler advances to the next SDB
            and modifies the trailer entry of a partially filled SDB.
         hw_perf_event_update: sdbt 0xb5286070 full 0 over 0 flush_all:1
            timestamp: 14:32:52.519953
      
      Next time the IRQ handler is called for this SDB the trailer entry shows
      an overflow count of 19 missed entries.
         hw_perf_event_update: sdbt 0xb5286070 full 1 over 19 flush_all:1
            timestamp: 14:32:52.970058
      
      Remove access to a follow on SDB when event overflow happened.
      Signed-off-by: NThomas Richter <tmricht@linux.ibm.com>
      Signed-off-by: NVasily Gorbik <gor@linux.ibm.com>
      0539ad0b
    • T
      s390/cpum_sf: Adjust sampling interval to avoid hitting sample limits · 39d4a501
      Thomas Richter 提交于
      Function perf_event_ever_overflow() and perf_event_account_interrupt()
      are called every time samples are processed by the interrupt handler.
      However function perf_event_account_interrupt() has checks to avoid being
      flooded with interrupts (more then 1000 samples are received per
      task_tick).  Samples are then dropped and a PERF_RECORD_THROTTLED is
      added to the perf data. The perf subsystem limit calculation is:
      
          maximum sample frequency := 100000 --> 1 samples per 10 us
          task_tick = 10ms = 10000us --> 1000 samples per task_tick
      
      The work flow is
      
      measurement_alert() uses SDBT head and each SBDT points to 511
       SDB pages, each with 126 sample entries. After processing 8 SBDs
       and for each valid sample calling:
      
           perf_event_overflow()
             perf_event_account_interrupts()
      
      there is a considerable amount of samples being dropped, especially when
      the sample frequency is very high and near the 100000 limit.
      
      To avoid the high amount of samples being dropped near the end of a
      task_tick time frame, increment the sampling interval in case of
      dropped events. The CPU Measurement sampling facility on the s390
      supports only intervals, specifiing how many CPU cycles have to be
      executed before a sample is generated. Increase the interval when the
      samples being generated hit the task_tick limit.
      Signed-off-by: NThomas Richter <tmricht@linux.ibm.com>
      Signed-off-by: NVasily Gorbik <gor@linux.ibm.com>
      39d4a501
    • C
      7e914fd1
    • V
      s390/spinlock: remove confusing comment in arch_spin_lock_wait · b62b6cf1
      Vasily Gorbik 提交于
      arch_spin_lock_wait does not take steal time into consideration.
      Signed-off-by: NVasily Gorbik <gor@linux.ibm.com>
      b62b6cf1
  3. 11 12月, 2019 2 次提交
  4. 10 12月, 2019 3 次提交
  5. 09 12月, 2019 2 次提交
  6. 06 12月, 2019 10 次提交
  7. 05 12月, 2019 11 次提交
    • M
      powerpc/perf: Disable trace_imc pmu · 249fad73
      Madhavan Srinivasan 提交于
      When a root user or a user with CAP_SYS_ADMIN privilege uses any
      trace_imc performance monitoring unit events, to monitor application
      or KVM threads, it may result in a checkstop (System crash).
      
      The cause is frequent switching of the "trace/accumulation" mode of
      the In-Memory Collection hardware (LDBAR).
      
      This patch disables the trace_imc PMU unit entirely to avoid
      triggering the checkstop. A future patch will reenable it at a later
      stage once a workaround has been developed.
      
      Fixes: 012ae244 ("powerpc/perf: Trace imc PMU functions")
      Cc: stable@vger.kernel.org # v5.2+
      Signed-off-by: NMadhavan Srinivasan <maddy@linux.vnet.ibm.com>
      Tested-by: NHariharan T.S. <hari@linux.ibm.com>
      [mpe: Add pr_info_once() so dmesg shows the PMU has been disabled]
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      Link: https://lore.kernel.org/r/20191118034452.9939-1-maddy@linux.vnet.ibm.com
      249fad73
    • A
      powerpc/powernv: Avoid re-registration of imc debugfs directory · 48e626ac
      Anju T Sudhakar 提交于
      export_imc_mode_and_cmd() function which creates the debugfs interface
      for imc-mode and imc-command, is invoked when each nest pmu units is
      registered.
      
      When the first nest pmu unit is registered, export_imc_mode_and_cmd()
      creates 'imc' directory under `/debug/powerpc/`. In the subsequent
      invocations debugfs_create_dir() function returns, since the directory
      already exists.
      
      The recent commit <c33d4423> (debugfs: make error message a bit
      more verbose), throws a warning if we try to invoke
      `debugfs_create_dir()` with an already existing directory name.
      
      Address this warning by making the debugfs directory registration in
      the opal_imc_counters_probe() function, i.e invoke
      export_imc_mode_and_cmd() function from the probe function.
      Signed-off-by: NAnju T Sudhakar <anju@linux.vnet.ibm.com>
      Tested-by: NNageswara R Sastry <nasastry@in.ibm.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      Link: https://lore.kernel.org/r/20191127072035.4283-1-anju@linux.vnet.ibm.com
      48e626ac
    • M
      um: add support for folded p4d page tables · e19f97ed
      Mike Rapoport 提交于
      The UML port uses 4 and 5 level fixups to support higher level page
      table directories in the generic VM code.
      
      Implement primitives necessary for the 4th level folding, add walks of
      p4d level where appropriate and drop usage of __ARCH_USE_5LEVEL_HACK.
      
      Link: http://lkml.kernel.org/r/1572938135-31886-13-git-send-email-rppt@kernel.orgSigned-off-by: NMike Rapoport <rppt@linux.ibm.com>
      Cc: Anatoly Pugachev <matorola@gmail.com>
      Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Cc: Greentime Hu <green.hu@gmail.com>
      Cc: Greg Ungerer <gerg@linux-m68k.org>
      Cc: Helge Deller <deller@gmx.de>
      Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
      Cc: Jeff Dike <jdike@addtoit.com>
      Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
      Cc: Mark Salter <msalter@redhat.com>
      Cc: Matt Turner <mattst88@gmail.com>
      Cc: Michal Simek <monstr@monstr.eu>
      Cc: Peter Rosin <peda@axentia.se>
      Cc: Richard Weinberger <richard@nod.at>
      Cc: Rolf Eike Beer <eike-kernel@sf-tec.de>
      Cc: Russell King <linux@armlinux.org.uk>
      Cc: Russell King <rmk+kernel@armlinux.org.uk>
      Cc: Sam Creasey <sammy@sammy.net>
      Cc: Vincent Chen <deanbo422@gmail.com>
      Cc: Vineet Gupta <Vineet.Gupta1@synopsys.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e19f97ed
    • M
      um: remove unused pxx_offset_proc() and addr_pte() functions · 4e65e76f
      Mike Rapoport 提交于
      The pxx_offset_proc() and addr_pte() functions are never used.  Remove
      them.
      
      Link: http://lkml.kernel.org/r/1572938135-31886-12-git-send-email-rppt@kernel.orgSigned-off-by: NMike Rapoport <rppt@linux.ibm.com>
      Acked-by: NRichard Weinberger <richard@nod.at>
      Cc: Anatoly Pugachev <matorola@gmail.com>
      Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Cc: Greentime Hu <green.hu@gmail.com>
      Cc: Greg Ungerer <gerg@linux-m68k.org>
      Cc: Helge Deller <deller@gmx.de>
      Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
      Cc: Jeff Dike <jdike@addtoit.com>
      Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
      Cc: Mark Salter <msalter@redhat.com>
      Cc: Matt Turner <mattst88@gmail.com>
      Cc: Michal Simek <monstr@monstr.eu>
      Cc: Peter Rosin <peda@axentia.se>
      Cc: Rolf Eike Beer <eike-kernel@sf-tec.de>
      Cc: Russell King <linux@armlinux.org.uk>
      Cc: Russell King <rmk+kernel@armlinux.org.uk>
      Cc: Sam Creasey <sammy@sammy.net>
      Cc: Vincent Chen <deanbo422@gmail.com>
      Cc: Vineet Gupta <Vineet.Gupta1@synopsys.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      4e65e76f
    • M
      sparc32: use pgtable-nopud instead of 4level-fixup · 7235db26
      Mike Rapoport 提交于
      32-bit version of sparc has three-level page tables and can use
      pgtable-nopud and folding of the upper layers.
      
      Replace usage of include/asm-generic/4level-fixup.h with
      include/asm-generic/pgtable-nopud.h and adjust page table manipulation
      macros and functions accordingly.
      
      Link: http://lkml.kernel.org/r/1572938135-31886-11-git-send-email-rppt@kernel.orgSigned-off-by: NMike Rapoport <rppt@linux.ibm.com>
      Acked-by: NDavid S. Miller <davem@davemloft.net>
      Tested-by: NAnatoly Pugachev <matorola@gmail.com>
      Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Cc: Greentime Hu <green.hu@gmail.com>
      Cc: Greg Ungerer <gerg@linux-m68k.org>
      Cc: Helge Deller <deller@gmx.de>
      Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
      Cc: Jeff Dike <jdike@addtoit.com>
      Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
      Cc: Mark Salter <msalter@redhat.com>
      Cc: Matt Turner <mattst88@gmail.com>
      Cc: Michal Simek <monstr@monstr.eu>
      Cc: Peter Rosin <peda@axentia.se>
      Cc: Richard Weinberger <richard@nod.at>
      Cc: Rolf Eike Beer <eike-kernel@sf-tec.de>
      Cc: Russell King <linux@armlinux.org.uk>
      Cc: Russell King <rmk+kernel@armlinux.org.uk>
      Cc: Sam Creasey <sammy@sammy.net>
      Cc: Vincent Chen <deanbo422@gmail.com>
      Cc: Vineet Gupta <Vineet.Gupta1@synopsys.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      7235db26
    • H
      parisc/hugetlb: use pgtable-nopXd instead of 4level-fixup · 2fa245c1
      Helge Deller 提交于
      Link: http://lkml.kernel.org/r/1572938135-31886-10-git-send-email-rppt@kernel.orgSigned-off-by: NHelge Deller <deller@gmx.de>
      Signed-off-by: NMike Rapoport <rppt@linux.ibm.com>
      Cc: Anatoly Pugachev <matorola@gmail.com>
      Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Cc: Greentime Hu <green.hu@gmail.com>
      Cc: Greg Ungerer <gerg@linux-m68k.org>
      Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
      Cc: Jeff Dike <jdike@addtoit.com>
      Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
      Cc: Mark Salter <msalter@redhat.com>
      Cc: Matt Turner <mattst88@gmail.com>
      Cc: Michal Simek <monstr@monstr.eu>
      Cc: Peter Rosin <peda@axentia.se>
      Cc: Richard Weinberger <richard@nod.at>
      Cc: Rolf Eike Beer <eike-kernel@sf-tec.de>
      Cc: Russell King <linux@armlinux.org.uk>
      Cc: Russell King <rmk+kernel@armlinux.org.uk>
      Cc: Sam Creasey <sammy@sammy.net>
      Cc: Vincent Chen <deanbo422@gmail.com>
      Cc: Vineet Gupta <Vineet.Gupta1@synopsys.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      2fa245c1
    • M
      parisc: use pgtable-nopXd instead of 4level-fixup · d96885e2
      Mike Rapoport 提交于
      parisc has two or three levels of page tables and can use appropriate
      pgtable-nopXd and folding of the upper layers.
      
      Replace usage of include/asm-generic/4level-fixup.h and explicit
      definitions of __PAGETABLE_PxD_FOLDED in parisc with
      include/asm-generic/pgtable-nopmd.h for two-level configurations and
      with include/asm-generic/pgtable-nopud.h for three-lelve configurations
      and adjust page table manipulation macros and functions accordingly.
      
      Link: http://lkml.kernel.org/r/1572938135-31886-9-git-send-email-rppt@kernel.orgSigned-off-by: NMike Rapoport <rppt@linux.ibm.com>
      Acked-by: NHelge Deller <deller@gmx.de>
      Cc: Anatoly Pugachev <matorola@gmail.com>
      Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Cc: Greentime Hu <green.hu@gmail.com>
      Cc: Greg Ungerer <gerg@linux-m68k.org>
      Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
      Cc: Jeff Dike <jdike@addtoit.com>
      Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
      Cc: Mark Salter <msalter@redhat.com>
      Cc: Matt Turner <mattst88@gmail.com>
      Cc: Michal Simek <monstr@monstr.eu>
      Cc: Peter Rosin <peda@axentia.se>
      Cc: Richard Weinberger <richard@nod.at>
      Cc: Rolf Eike Beer <eike-kernel@sf-tec.de>
      Cc: Russell King <linux@armlinux.org.uk>
      Cc: Russell King <rmk+kernel@armlinux.org.uk>
      Cc: Sam Creasey <sammy@sammy.net>
      Cc: Vincent Chen <deanbo422@gmail.com>
      Cc: Vineet Gupta <Vineet.Gupta1@synopsys.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      d96885e2
    • M
      nds32: use pgtable-nopmd instead of 4level-fixup · 7c2763c4
      Mike Rapoport 提交于
      nds32 has only two-level page tables and can use pgtable-nopmd and
      folding of the upper layers.
      
      Replace usage of include/asm-generic/4level-fixup.h and explicit
      definition of __PAGETABLE_PMD_FOLDED in nds32 with
      include/asm-generic/pgtable-nopmd.h and adjust page table manipulation
      macros and functions accordingly.
      
      Link: http://lkml.kernel.org/r/1572938135-31886-8-git-send-email-rppt@kernel.orgSigned-off-by: NMike Rapoport <rppt@linux.ibm.com>
      Cc: Anatoly Pugachev <matorola@gmail.com>
      Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Cc: Greentime Hu <green.hu@gmail.com>
      Cc: Greg Ungerer <gerg@linux-m68k.org>
      Cc: Helge Deller <deller@gmx.de>
      Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
      Cc: Jeff Dike <jdike@addtoit.com>
      Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
      Cc: Mark Salter <msalter@redhat.com>
      Cc: Matt Turner <mattst88@gmail.com>
      Cc: Michal Simek <monstr@monstr.eu>
      Cc: Peter Rosin <peda@axentia.se>
      Cc: Richard Weinberger <richard@nod.at>
      Cc: Rolf Eike Beer <eike-kernel@sf-tec.de>
      Cc: Russell King <linux@armlinux.org.uk>
      Cc: Russell King <rmk+kernel@armlinux.org.uk>
      Cc: Sam Creasey <sammy@sammy.net>
      Cc: Vincent Chen <deanbo422@gmail.com>
      Cc: Vineet Gupta <Vineet.Gupta1@synopsys.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      7c2763c4
    • M
      microblaze: use pgtable-nopmd instead of 4level-fixup · ed48e1f8
      Mike Rapoport 提交于
      microblaze has only two-level page tables and can use pgtable-nopmd and
      folding of the upper layers.
      
      Replace usage of include/asm-generic/4level-fixup.h and explicit
      definition of __PAGETABLE_PMD_FOLDED in microblaze with
      include/asm-generic/pgtable-nopmd.h and adjust page table manipulation
      macros and functions accordingly.
      
      Link: http://lkml.kernel.org/r/1572938135-31886-7-git-send-email-rppt@kernel.orgSigned-off-by: NMike Rapoport <rppt@linux.ibm.com>
      Cc: Anatoly Pugachev <matorola@gmail.com>
      Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Cc: Greentime Hu <green.hu@gmail.com>
      Cc: Greg Ungerer <gerg@linux-m68k.org>
      Cc: Helge Deller <deller@gmx.de>
      Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
      Cc: Jeff Dike <jdike@addtoit.com>
      Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
      Cc: Mark Salter <msalter@redhat.com>
      Cc: Matt Turner <mattst88@gmail.com>
      Cc: Michal Simek <monstr@monstr.eu>
      Cc: Peter Rosin <peda@axentia.se>
      Cc: Richard Weinberger <richard@nod.at>
      Cc: Rolf Eike Beer <eike-kernel@sf-tec.de>
      Cc: Russell King <linux@armlinux.org.uk>
      Cc: Russell King <rmk+kernel@armlinux.org.uk>
      Cc: Sam Creasey <sammy@sammy.net>
      Cc: Vincent Chen <deanbo422@gmail.com>
      Cc: Vineet Gupta <Vineet.Gupta1@synopsys.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ed48e1f8
    • M
      m68k: mm: use pgtable-nopXd instead of 4level-fixup · 60e50f34
      Mike Rapoport 提交于
      m68k has two or three levels of page tables and can use appropriate
      pgtable-nopXd and folding of the upper layers.
      
      Replace usage of include/asm-generic/4level-fixup.h and explicit
      definitions of __PAGETABLE_PxD_FOLDED in m68k with
      include/asm-generic/pgtable-nopmd.h for two-level configurations and
      with include/asm-generic/pgtable-nopud.h for three-lelve configurations
      and adjust page table manipulation macros and functions accordingly.
      
      [akpm@linux-foundation.org: fix merge glitch]
      [geert@linux-m68k.org: more merge glitch fixes]
      [akpm@linux-foundation.org: s/bad_pgd/bad_pud/, per Mike]
      Link: http://lkml.kernel.org/r/1572938135-31886-6-git-send-email-rppt@kernel.orgSigned-off-by: NMike Rapoport <rppt@linux.ibm.com>
      Acked-by: NGreg Ungerer <gerg@linux-m68k.org>
      Cc: Anatoly Pugachev <matorola@gmail.com>
      Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Cc: Greentime Hu <green.hu@gmail.com>
      Cc: Helge Deller <deller@gmx.de>
      Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
      Cc: Jeff Dike <jdike@addtoit.com>
      Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
      Cc: Mark Salter <msalter@redhat.com>
      Cc: Matt Turner <mattst88@gmail.com>
      Cc: Michal Simek <monstr@monstr.eu>
      Cc: Peter Rosin <peda@axentia.se>
      Cc: Richard Weinberger <richard@nod.at>
      Cc: Rolf Eike Beer <eike-kernel@sf-tec.de>
      Cc: Russell King <linux@armlinux.org.uk>
      Cc: Russell King <rmk+kernel@armlinux.org.uk>
      Cc: Sam Creasey <sammy@sammy.net>
      Cc: Vincent Chen <deanbo422@gmail.com>
      Cc: Vineet Gupta <Vineet.Gupta1@synopsys.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      60e50f34
    • M
      m68k: nommu: use pgtable-nopud instead of 4level-fixup · f6f7caeb
      Mike Rapoport 提交于
      The generic nommu implementation of page table manipulation takes care
      of folding of the upper levels and does not require fixups.
      
      Simply replace of include/asm-generic/4level-fixup.h with
      include/asm-generic/pgtable-nopud.h.
      
      Link: http://lkml.kernel.org/r/1572938135-31886-5-git-send-email-rppt@kernel.orgSigned-off-by: NMike Rapoport <rppt@linux.ibm.com>
      Acked-by: NGreg Ungerer <gerg@linux-m68k.org>
      Cc: Anatoly Pugachev <matorola@gmail.com>
      Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Cc: Greentime Hu <green.hu@gmail.com>
      Cc: Helge Deller <deller@gmx.de>
      Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
      Cc: Jeff Dike <jdike@addtoit.com>
      Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
      Cc: Mark Salter <msalter@redhat.com>
      Cc: Matt Turner <mattst88@gmail.com>
      Cc: Michal Simek <monstr@monstr.eu>
      Cc: Peter Rosin <peda@axentia.se>
      Cc: Richard Weinberger <richard@nod.at>
      Cc: Rolf Eike Beer <eike-kernel@sf-tec.de>
      Cc: Russell King <linux@armlinux.org.uk>
      Cc: Russell King <rmk+kernel@armlinux.org.uk>
      Cc: Sam Creasey <sammy@sammy.net>
      Cc: Vincent Chen <deanbo422@gmail.com>
      Cc: Vineet Gupta <Vineet.Gupta1@synopsys.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f6f7caeb