diff options
| author | Jens Axboe <axboe@fb.com> | 2014-04-15 14:02:24 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-04-15 14:02:24 -0600 |
| commit | f89e0dd9d1a72fdf6b8958bcadfa6abf84f3cae0 (patch) | |
| tree | 6d4ca8c67dc22d1c81053392078588f9ab3804b5 /mm/Kconfig | |
| parent | 21f9fcd81593e201172160853b8647336fb81f4f (diff) | |
| parent | c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff) | |
| download | op-kernel-dev-f89e0dd9d1a72fdf6b8958bcadfa6abf84f3cae0.zip op-kernel-dev-f89e0dd9d1a72fdf6b8958bcadfa6abf84f3cae0.tar.gz | |
Merge tag 'v3.15-rc1' into for-3.16/core
We don't like this, but things have diverged with the blk-mq fixes
in 3.15-rc1. So merge it in.
Diffstat (limited to 'mm/Kconfig')
| -rw-r--r-- | mm/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -216,6 +216,7 @@ config PAGEFLAGS_EXTENDED # config SPLIT_PTLOCK_CPUS int + default "999999" if !MMU default "999999" if ARM && !CPU_CACHE_VIPT default "999999" if PARISC && !PA20 default "4" @@ -577,3 +578,6 @@ config PGTABLE_MAPPING You can check speed with zsmalloc benchmark: https://github.com/spartacus06/zsmapbench + +config GENERIC_EARLY_IOREMAP + bool |
