]> Git Repo - J-linux.git/commitdiff
Merge tag 'csky-for-linus-6.4' of https://github.com/c-sky/csky-linux
authorLinus Torvalds <[email protected]>
Thu, 4 May 2023 19:25:05 +0000 (12:25 -0700)
committerLinus Torvalds <[email protected]>
Thu, 4 May 2023 19:25:05 +0000 (12:25 -0700)
Pull arch/csky updates from Guo Ren:

 - Remove CPU_TLB_SIZE config

 - Prevent spurious page faults

* tag 'csky-for-linus-6.4' of https://github.com/c-sky/csky-linux:
  csky: mmu: Prevent spurious page faults
  csky: remove obsolete config CPU_TLB_SIZE

1  2 
arch/csky/Kconfig

diff --combined arch/csky/Kconfig
index 00379a843c376569fe5dbd87f61fe91962dcc757,1fb5f066a885f517e7b6cb2e44c486c0158a1d71..4df1f8c9d170b3359d3759d1ce1640bf76a422af
@@@ -166,11 -166,6 +166,6 @@@ config STACKTRACE_SUPPOR
  config TIME_LOW_RES
        def_bool y
  
- config CPU_TLB_SIZE
-       int
-       default "128"   if (CPU_CK610 || CPU_CK807 || CPU_CK810)
-       default "1024"  if (CPU_CK860)
  config CPU_ASID_BITS
        int
        default "8"     if (CPU_CK610 || CPU_CK807 || CPU_CK810)
@@@ -332,6 -327,10 +327,6 @@@ config HIGHME
        select KMAP_LOCAL
        default y
  
 -config ARCH_FORCE_MAX_ORDER
 -      int "Maximum zone order"
 -      default "11"
 -
  config DRAM_BASE
        hex "DRAM start addr (the same with memory-section in dts)"
        default 0x0
This page took 0.050187 seconds and 4 git commands to generate.