diff options
author | Christoph Hellwig <hch@lst.de> | 2019-04-05 12:08:59 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2019-04-06 12:48:35 -0400 |
commit | 72deb455b5ec619ff043c30bc90025aa3de3cdda (patch) | |
tree | 8c2a77bc41d25181e03da1f04068be12a4c0583c | |
parent | 75199aa5269f66d0958aa9971fa81a92de83d7f9 (diff) |
block: remove CONFIG_LBDAF
Currently support for 64-bit sector_t and blkcnt_t is optional on 32-bit
architectures. These types are required to support block device and/or
file sizes larger than 2 TiB, and have generally defaulted to on for
a long time. Enabling the option only increases the i386 tinyconfig
size by 145 bytes, and many data structures already always use
64-bit values for their in-core and on-disk data structures anyway,
so there should not be a large change in dynamic memory usage either.
Dropping this option removes a somewhat weird non-default config that
has cause various bugs or compiler warnings when actually used.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
61 files changed, 52 insertions, 250 deletions
diff --git a/Documentation/process/submit-checklist.rst b/Documentation/process/submit-checklist.rst index 367353c54949..c88867b173d9 100644 --- a/Documentation/process/submit-checklist.rst +++ b/Documentation/process/submit-checklist.rst | |||
@@ -72,47 +72,44 @@ and elsewhere regarding submitting Linux kernel patches. | |||
72 | 13) Has been build- and runtime tested with and without ``CONFIG_SMP`` and | 72 | 13) Has been build- and runtime tested with and without ``CONFIG_SMP`` and |
73 | ``CONFIG_PREEMPT.`` | 73 | ``CONFIG_PREEMPT.`` |
74 | 74 | ||
75 | 14) If the patch affects IO/Disk, etc: has been tested with and without | 75 | 16) All codepaths have been exercised with all lockdep features enabled. |
76 | ``CONFIG_LBDAF.`` | ||
77 | 76 | ||
78 | 15) All codepaths have been exercised with all lockdep features enabled. | 77 | 17) All new ``/proc`` entries are documented under ``Documentation/`` |
79 | 78 | ||
80 | 16) All new ``/proc`` entries are documented under ``Documentation/`` | 79 | 18) All new kernel boot parameters are documented in |
81 | |||
82 | 17) All new kernel boot parameters are documented in | ||
83 | ``Documentation/admin-guide/kernel-parameters.rst``. | 80 | ``Documentation/admin-guide/kernel-parameters.rst``. |
84 | 81 | ||
85 | 18) All new module parameters are documented with ``MODULE_PARM_DESC()`` | 82 | 19) All new module parameters are documented with ``MODULE_PARM_DESC()`` |
86 | 83 | ||
87 | 19) All new userspace interfaces are documented in ``Documentation/ABI/``. | 84 | 20) All new userspace interfaces are documented in ``Documentation/ABI/``. |
88 | See ``Documentation/ABI/README`` for more information. | 85 | See ``Documentation/ABI/README`` for more information. |
89 | Patches that change userspace interfaces should be CCed to | 86 | Patches that change userspace interfaces should be CCed to |
90 | linux-api@vger.kernel.org. | 87 | linux-api@vger.kernel.org. |
91 | 88 | ||
92 | 20) Check that it all passes ``make headers_check``. | 89 | 21) Check that it all passes ``make headers_check``. |
93 | 90 | ||
94 | 21) Has been checked with injection of at least slab and page-allocation | 91 | 22) Has been checked with injection of at least slab and page-allocation |
95 | failures. See ``Documentation/fault-injection/``. | 92 | failures. See ``Documentation/fault-injection/``. |
96 | 93 | ||
97 | If the new code is substantial, addition of subsystem-specific fault | 94 | If the new code is substantial, addition of subsystem-specific fault |
98 | injection might be appropriate. | 95 | injection might be appropriate. |
99 | 96 | ||
100 | 22) Newly-added code has been compiled with ``gcc -W`` (use | 97 | 23) Newly-added code has been compiled with ``gcc -W`` (use |
101 | ``make EXTRA_CFLAGS=-W``). This will generate lots of noise, but is good | 98 | ``make EXTRA_CFLAGS=-W``). This will generate lots of noise, but is good |
102 | for finding bugs like "warning: comparison between signed and unsigned". | 99 | for finding bugs like "warning: comparison between signed and unsigned". |
103 | 100 | ||
104 | 23) Tested after it has been merged into the -mm patchset to make sure | 101 | 24) Tested after it has been merged into the -mm patchset to make sure |
105 | that it still works with all of the other queued patches and various | 102 | that it still works with all of the other queued patches and various |
106 | changes in the VM, VFS, and other subsystems. | 103 | changes in the VM, VFS, and other subsystems. |
107 | 104 | ||
108 | 24) All memory barriers {e.g., ``barrier()``, ``rmb()``, ``wmb()``} need a | 105 | 25) All memory barriers {e.g., ``barrier()``, ``rmb()``, ``wmb()``} need a |
109 | comment in the source code that explains the logic of what they are doing | 106 | comment in the source code that explains the logic of what they are doing |
110 | and why. | 107 | and why. |
111 | 108 | ||
112 | 25) If any ioctl's are added by the patch, then also update | 109 | 26) If any ioctl's are added by the patch, then also update |
113 | ``Documentation/ioctl/ioctl-number.txt``. | 110 | ``Documentation/ioctl/ioctl-number.txt``. |
114 | 111 | ||
115 | 26) If your modified source code depends on or uses any of the kernel | 112 | 27) If your modified source code depends on or uses any of the kernel |
116 | APIs or features that are related to the following ``Kconfig`` symbols, | 113 | APIs or features that are related to the following ``Kconfig`` symbols, |
117 | then test multiple builds with the related ``Kconfig`` symbols disabled | 114 | then test multiple builds with the related ``Kconfig`` symbols disabled |
118 | and/or ``=m`` (if that option is available) [not all of these at the | 115 | and/or ``=m`` (if that option is available) [not all of these at the |
diff --git a/Documentation/translations/ja_JP/SubmitChecklist b/Documentation/translations/ja_JP/SubmitChecklist index 60c7c35ac517..b42220d3d46c 100644 --- a/Documentation/translations/ja_JP/SubmitChecklist +++ b/Documentation/translations/ja_JP/SubmitChecklist | |||
@@ -74,38 +74,34 @@ Linux カーネルパッチ投稿者向けチェックリスト | |||
74 | 13: CONFIG_SMP, CONFIG_PREEMPT を有効にした場合と無効にした場合の両方で | 74 | 13: CONFIG_SMP, CONFIG_PREEMPT を有効にした場合と無効にした場合の両方で |
75 | ビルドした上、動作確認を行ってください。 | 75 | ビルドした上、動作確認を行ってください。 |
76 | 76 | ||
77 | 14: もしパッチがディスクのI/O性能などに影響を与えるようであれば、 | 77 | 14: lockdepの機能を全て有効にした上で、全てのコードパスを評価してください。 |
78 | 'CONFIG_LBDAF'オプションを有効にした場合と無効にした場合の両方で | ||
79 | テストを実施してみてください。 | ||
80 | 78 | ||
81 | 15: lockdepの機能を全て有効にした上で、全てのコードパスを評価してください。 | 79 | 15: /proc に新しいエントリを追加した場合には、Documentation/ 配下に |
82 | |||
83 | 16: /proc に新しいエントリを追加した場合には、Documentation/ 配下に | ||
84 | 必ずドキュメントを追加してください。 | 80 | 必ずドキュメントを追加してください。 |
85 | 81 | ||
86 | 17: 新しいブートパラメータを追加した場合には、 | 82 | 16: 新しいブートパラメータを追加した場合には、 |
87 | 必ずDocumentation/admin-guide/kernel-parameters.rst に説明を追加してください。 | 83 | 必ずDocumentation/admin-guide/kernel-parameters.rst に説明を追加してください。 |
88 | 84 | ||
89 | 18: 新しくmoduleにパラメータを追加した場合には、MODULE_PARM_DESC()を | 85 | 17: 新しくmoduleにパラメータを追加した場合には、MODULE_PARM_DESC()を |
90 | 利用して必ずその説明を記述してください。 | 86 | 利用して必ずその説明を記述してください。 |
91 | 87 | ||
92 | 19: 新しいuserspaceインタフェースを作成した場合には、Documentation/ABI/ に | 88 | 18: 新しいuserspaceインタフェースを作成した場合には、Documentation/ABI/ に |
93 | Documentation/ABI/README を参考にして必ずドキュメントを追加してください。 | 89 | Documentation/ABI/README を参考にして必ずドキュメントを追加してください。 |
94 | 90 | ||
95 | 20: 'make headers_check'を実行して全く問題がないことを確認してください。 | 91 | 19: 'make headers_check'を実行して全く問題がないことを確認してください。 |
96 | 92 | ||
97 | 21: 少なくともslabアロケーションとpageアロケーションに失敗した場合の | 93 | 20: 少なくともslabアロケーションとpageアロケーションに失敗した場合の |
98 | 挙動について、fault-injectionを利用して確認してください。 | 94 | 挙動について、fault-injectionを利用して確認してください。 |
99 | Documentation/fault-injection/ を参照してください。 | 95 | Documentation/fault-injection/ を参照してください。 |
100 | 96 | ||
101 | 追加したコードがかなりの量であったならば、サブシステム特有の | 97 | 追加したコードがかなりの量であったならば、サブシステム特有の |
102 | fault-injectionを追加したほうが良いかもしれません。 | 98 | fault-injectionを追加したほうが良いかもしれません。 |
103 | 99 | ||
104 | 22: 新たに追加したコードは、`gcc -W'でコンパイルしてください。 | 100 | 21: 新たに追加したコードは、`gcc -W'でコンパイルしてください。 |
105 | このオプションは大量の不要なメッセージを出力しますが、 | 101 | このオプションは大量の不要なメッセージを出力しますが、 |
106 | "warning: comparison between signed and unsigned" のようなメッセージは、 | 102 | "warning: comparison between signed and unsigned" のようなメッセージは、 |
107 | バグを見つけるのに役に立ちます。 | 103 | バグを見つけるのに役に立ちます。 |
108 | 104 | ||
109 | 23: 投稿したパッチが -mm パッチセットにマージされた後、全ての既存のパッチや | 105 | 22: 投稿したパッチが -mm パッチセットにマージされた後、全ての既存のパッチや |
110 | VM, VFS およびその他のサブシステムに関する様々な変更と、現時点でも共存 | 106 | VM, VFS およびその他のサブシステムに関する様々な変更と、現時点でも共存 |
111 | できることを確認するテストを行ってください。 | 107 | できることを確認するテストを行ってください。 |
diff --git a/arch/arc/configs/haps_hs_defconfig b/arch/arc/configs/haps_hs_defconfig index f56cc2070c11..b117e6c16d41 100644 --- a/arch/arc/configs/haps_hs_defconfig +++ b/arch/arc/configs/haps_hs_defconfig | |||
@@ -15,7 +15,6 @@ CONFIG_PERF_EVENTS=y | |||
15 | # CONFIG_COMPAT_BRK is not set | 15 | # CONFIG_COMPAT_BRK is not set |
16 | CONFIG_SLAB=y | 16 | CONFIG_SLAB=y |
17 | CONFIG_MODULES=y | 17 | CONFIG_MODULES=y |
18 | # CONFIG_LBDAF is not set | ||
19 | # CONFIG_BLK_DEV_BSG is not set | 18 | # CONFIG_BLK_DEV_BSG is not set |
20 | # CONFIG_IOSCHED_DEADLINE is not set | 19 | # CONFIG_IOSCHED_DEADLINE is not set |
21 | # CONFIG_IOSCHED_CFQ is not set | 20 | # CONFIG_IOSCHED_CFQ is not set |
diff --git a/arch/arc/configs/haps_hs_smp_defconfig b/arch/arc/configs/haps_hs_smp_defconfig index b6f2482c7e74..33a787c375e2 100644 --- a/arch/arc/configs/haps_hs_smp_defconfig +++ b/arch/arc/configs/haps_hs_smp_defconfig | |||
@@ -17,7 +17,6 @@ CONFIG_PERF_EVENTS=y | |||
17 | CONFIG_SLAB=y | 17 | CONFIG_SLAB=y |
18 | CONFIG_KPROBES=y | 18 | CONFIG_KPROBES=y |
19 | CONFIG_MODULES=y | 19 | CONFIG_MODULES=y |
20 | # CONFIG_LBDAF is not set | ||
21 | # CONFIG_BLK_DEV_BSG is not set | 20 | # CONFIG_BLK_DEV_BSG is not set |
22 | # CONFIG_IOSCHED_DEADLINE is not set | 21 | # CONFIG_IOSCHED_DEADLINE is not set |
23 | # CONFIG_IOSCHED_CFQ is not set | 22 | # CONFIG_IOSCHED_CFQ is not set |
diff --git a/arch/arc/configs/nsim_700_defconfig b/arch/arc/configs/nsim_700_defconfig index 318e4cd29629..de398c7b10b3 100644 --- a/arch/arc/configs/nsim_700_defconfig +++ b/arch/arc/configs/nsim_700_defconfig | |||
@@ -18,7 +18,6 @@ CONFIG_PERF_EVENTS=y | |||
18 | CONFIG_ISA_ARCOMPACT=y | 18 | CONFIG_ISA_ARCOMPACT=y |
19 | CONFIG_KPROBES=y | 19 | CONFIG_KPROBES=y |
20 | CONFIG_MODULES=y | 20 | CONFIG_MODULES=y |
21 | # CONFIG_LBDAF is not set | ||
22 | # CONFIG_BLK_DEV_BSG is not set | 21 | # CONFIG_BLK_DEV_BSG is not set |
23 | # CONFIG_IOSCHED_DEADLINE is not set | 22 | # CONFIG_IOSCHED_DEADLINE is not set |
24 | # CONFIG_IOSCHED_CFQ is not set | 23 | # CONFIG_IOSCHED_CFQ is not set |
diff --git a/arch/arc/configs/nsim_hs_defconfig b/arch/arc/configs/nsim_hs_defconfig index c15807b0e0c1..2dbd34a9ff07 100644 --- a/arch/arc/configs/nsim_hs_defconfig +++ b/arch/arc/configs/nsim_hs_defconfig | |||
@@ -20,7 +20,6 @@ CONFIG_MODULES=y | |||
20 | CONFIG_MODULE_FORCE_LOAD=y | 20 | CONFIG_MODULE_FORCE_LOAD=y |
21 | CONFIG_MODULE_UNLOAD=y | 21 | CONFIG_MODULE_UNLOAD=y |
22 | CONFIG_MODULE_FORCE_UNLOAD=y | 22 | CONFIG_MODULE_FORCE_UNLOAD=y |
23 | # CONFIG_LBDAF is not set | ||
24 | # CONFIG_BLK_DEV_BSG is not set | 23 | # CONFIG_BLK_DEV_BSG is not set |
25 | # CONFIG_IOSCHED_DEADLINE is not set | 24 | # CONFIG_IOSCHED_DEADLINE is not set |
26 | # CONFIG_IOSCHED_CFQ is not set | 25 | # CONFIG_IOSCHED_CFQ is not set |
diff --git a/arch/arc/configs/nsim_hs_smp_defconfig b/arch/arc/configs/nsim_hs_smp_defconfig index 65e983fd942b..c7135f1e2583 100644 --- a/arch/arc/configs/nsim_hs_smp_defconfig +++ b/arch/arc/configs/nsim_hs_smp_defconfig | |||
@@ -18,7 +18,6 @@ CONFIG_MODULES=y | |||
18 | CONFIG_MODULE_FORCE_LOAD=y | 18 | CONFIG_MODULE_FORCE_LOAD=y |
19 | CONFIG_MODULE_UNLOAD=y | 19 | CONFIG_MODULE_UNLOAD=y |
20 | CONFIG_MODULE_FORCE_UNLOAD=y | 20 | CONFIG_MODULE_FORCE_UNLOAD=y |
21 | # CONFIG_LBDAF is not set | ||
22 | # CONFIG_BLK_DEV_BSG is not set | 21 | # CONFIG_BLK_DEV_BSG is not set |
23 | # CONFIG_IOSCHED_DEADLINE is not set | 22 | # CONFIG_IOSCHED_DEADLINE is not set |
24 | # CONFIG_IOSCHED_CFQ is not set | 23 | # CONFIG_IOSCHED_CFQ is not set |
diff --git a/arch/arc/configs/nsimosci_defconfig b/arch/arc/configs/nsimosci_defconfig index 08c5b99ac341..385a71d3c478 100644 --- a/arch/arc/configs/nsimosci_defconfig +++ b/arch/arc/configs/nsimosci_defconfig | |||
@@ -18,7 +18,6 @@ CONFIG_PERF_EVENTS=y | |||
18 | CONFIG_ISA_ARCOMPACT=y | 18 | CONFIG_ISA_ARCOMPACT=y |
19 | CONFIG_KPROBES=y | 19 | CONFIG_KPROBES=y |
20 | CONFIG_MODULES=y | 20 | CONFIG_MODULES=y |
21 | # CONFIG_LBDAF is not set | ||
22 | # CONFIG_BLK_DEV_BSG is not set | 21 | # CONFIG_BLK_DEV_BSG is not set |
23 | # CONFIG_IOSCHED_DEADLINE is not set | 22 | # CONFIG_IOSCHED_DEADLINE is not set |
24 | # CONFIG_IOSCHED_CFQ is not set | 23 | # CONFIG_IOSCHED_CFQ is not set |
diff --git a/arch/arc/configs/nsimosci_hs_defconfig b/arch/arc/configs/nsimosci_hs_defconfig index 5b5e26d67955..248a2c3bdc12 100644 --- a/arch/arc/configs/nsimosci_hs_defconfig +++ b/arch/arc/configs/nsimosci_hs_defconfig | |||
@@ -17,7 +17,6 @@ CONFIG_PERF_EVENTS=y | |||
17 | # CONFIG_COMPAT_BRK is not set | 17 | # CONFIG_COMPAT_BRK is not set |
18 | CONFIG_KPROBES=y | 18 | CONFIG_KPROBES=y |
19 | CONFIG_MODULES=y | 19 | CONFIG_MODULES=y |
20 | # CONFIG_LBDAF is not set | ||
21 | # CONFIG_BLK_DEV_BSG is not set | 20 | # CONFIG_BLK_DEV_BSG is not set |
22 | # CONFIG_IOSCHED_DEADLINE is not set | 21 | # CONFIG_IOSCHED_DEADLINE is not set |
23 | # CONFIG_IOSCHED_CFQ is not set | 22 | # CONFIG_IOSCHED_CFQ is not set |
diff --git a/arch/arc/configs/nsimosci_hs_smp_defconfig b/arch/arc/configs/nsimosci_hs_smp_defconfig index 26af9b2f7fcb..1a4bc7b660fb 100644 --- a/arch/arc/configs/nsimosci_hs_smp_defconfig +++ b/arch/arc/configs/nsimosci_hs_smp_defconfig | |||
@@ -12,7 +12,6 @@ CONFIG_PERF_EVENTS=y | |||
12 | # CONFIG_COMPAT_BRK is not set | 12 | # CONFIG_COMPAT_BRK is not set |
13 | CONFIG_KPROBES=y | 13 | CONFIG_KPROBES=y |
14 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
15 | # CONFIG_LBDAF is not set | ||
16 | # CONFIG_BLK_DEV_BSG is not set | 15 | # CONFIG_BLK_DEV_BSG is not set |
17 | # CONFIG_IOSCHED_DEADLINE is not set | 16 | # CONFIG_IOSCHED_DEADLINE is not set |
18 | # CONFIG_IOSCHED_CFQ is not set | 17 | # CONFIG_IOSCHED_CFQ is not set |
diff --git a/arch/arm/configs/aspeed_g4_defconfig b/arch/arm/configs/aspeed_g4_defconfig index 1446262921b4..bdbade6af9c7 100644 --- a/arch/arm/configs/aspeed_g4_defconfig +++ b/arch/arm/configs/aspeed_g4_defconfig | |||
@@ -23,7 +23,6 @@ CONFIG_SLAB_FREELIST_RANDOM=y | |||
23 | CONFIG_JUMP_LABEL=y | 23 | CONFIG_JUMP_LABEL=y |
24 | CONFIG_STRICT_KERNEL_RWX=y | 24 | CONFIG_STRICT_KERNEL_RWX=y |
25 | CONFIG_GCC_PLUGINS=y | 25 | CONFIG_GCC_PLUGINS=y |
26 | # CONFIG_LBDAF is not set | ||
27 | # CONFIG_BLK_DEV_BSG is not set | 26 | # CONFIG_BLK_DEV_BSG is not set |
28 | # CONFIG_BLK_DEBUG_FS is not set | 27 | # CONFIG_BLK_DEBUG_FS is not set |
29 | # CONFIG_IOSCHED_DEADLINE is not set | 28 | # CONFIG_IOSCHED_DEADLINE is not set |
diff --git a/arch/arm/configs/aspeed_g5_defconfig b/arch/arm/configs/aspeed_g5_defconfig index 02fa3a41add5..4bde84eae4eb 100644 --- a/arch/arm/configs/aspeed_g5_defconfig +++ b/arch/arm/configs/aspeed_g5_defconfig | |||
@@ -23,7 +23,6 @@ CONFIG_SLAB_FREELIST_RANDOM=y | |||
23 | CONFIG_JUMP_LABEL=y | 23 | CONFIG_JUMP_LABEL=y |
24 | CONFIG_STRICT_KERNEL_RWX=y | 24 | CONFIG_STRICT_KERNEL_RWX=y |
25 | CONFIG_GCC_PLUGINS=y | 25 | CONFIG_GCC_PLUGINS=y |
26 | # CONFIG_LBDAF is not set | ||
27 | # CONFIG_BLK_DEV_BSG is not set | 26 | # CONFIG_BLK_DEV_BSG is not set |
28 | # CONFIG_BLK_DEBUG_FS is not set | 27 | # CONFIG_BLK_DEBUG_FS is not set |
29 | # CONFIG_IOSCHED_DEADLINE is not set | 28 | # CONFIG_IOSCHED_DEADLINE is not set |
diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig index e4b1be66b3f5..b7752929975c 100644 --- a/arch/arm/configs/at91_dt_defconfig +++ b/arch/arm/configs/at91_dt_defconfig | |||
@@ -9,7 +9,6 @@ CONFIG_EMBEDDED=y | |||
9 | CONFIG_SLAB=y | 9 | CONFIG_SLAB=y |
10 | CONFIG_MODULES=y | 10 | CONFIG_MODULES=y |
11 | CONFIG_MODULE_UNLOAD=y | 11 | CONFIG_MODULE_UNLOAD=y |
12 | # CONFIG_LBDAF is not set | ||
13 | # CONFIG_BLK_DEV_BSG is not set | 12 | # CONFIG_BLK_DEV_BSG is not set |
14 | # CONFIG_IOSCHED_DEADLINE is not set | 13 | # CONFIG_IOSCHED_DEADLINE is not set |
15 | # CONFIG_IOSCHED_CFQ is not set | 14 | # CONFIG_IOSCHED_CFQ is not set |
diff --git a/arch/arm/configs/clps711x_defconfig b/arch/arm/configs/clps711x_defconfig index fc105c9178cc..09ae750164e0 100644 --- a/arch/arm/configs/clps711x_defconfig +++ b/arch/arm/configs/clps711x_defconfig | |||
@@ -6,7 +6,6 @@ CONFIG_RD_LZMA=y | |||
6 | CONFIG_EMBEDDED=y | 6 | CONFIG_EMBEDDED=y |
7 | CONFIG_SLOB=y | 7 | CONFIG_SLOB=y |
8 | CONFIG_JUMP_LABEL=y | 8 | CONFIG_JUMP_LABEL=y |
9 | # CONFIG_LBDAF is not set | ||
10 | CONFIG_PARTITION_ADVANCED=y | 9 | CONFIG_PARTITION_ADVANCED=y |
11 | # CONFIG_IOSCHED_CFQ is not set | 10 | # CONFIG_IOSCHED_CFQ is not set |
12 | CONFIG_ARCH_CLPS711X=y | 11 | CONFIG_ARCH_CLPS711X=y |
diff --git a/arch/arm/configs/efm32_defconfig b/arch/arm/configs/efm32_defconfig index ee42158f41ec..10ea92513a69 100644 --- a/arch/arm/configs/efm32_defconfig +++ b/arch/arm/configs/efm32_defconfig | |||
@@ -11,7 +11,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
11 | CONFIG_EMBEDDED=y | 11 | CONFIG_EMBEDDED=y |
12 | # CONFIG_VM_EVENT_COUNTERS is not set | 12 | # CONFIG_VM_EVENT_COUNTERS is not set |
13 | # CONFIG_SLUB_DEBUG is not set | 13 | # CONFIG_SLUB_DEBUG is not set |
14 | # CONFIG_LBDAF is not set | ||
15 | # CONFIG_BLK_DEV_BSG is not set | 14 | # CONFIG_BLK_DEV_BSG is not set |
16 | # CONFIG_IOSCHED_DEADLINE is not set | 15 | # CONFIG_IOSCHED_DEADLINE is not set |
17 | # CONFIG_IOSCHED_CFQ is not set | 16 | # CONFIG_IOSCHED_CFQ is not set |
diff --git a/arch/arm/configs/ezx_defconfig b/arch/arm/configs/ezx_defconfig index 484e51fbd4a6..e3afca5bd9d6 100644 --- a/arch/arm/configs/ezx_defconfig +++ b/arch/arm/configs/ezx_defconfig | |||
@@ -13,7 +13,6 @@ CONFIG_MODULES=y | |||
13 | CONFIG_MODULE_UNLOAD=y | 13 | CONFIG_MODULE_UNLOAD=y |
14 | CONFIG_MODULE_FORCE_UNLOAD=y | 14 | CONFIG_MODULE_FORCE_UNLOAD=y |
15 | CONFIG_MODVERSIONS=y | 15 | CONFIG_MODVERSIONS=y |
16 | # CONFIG_LBDAF is not set | ||
17 | # CONFIG_BLK_DEV_BSG is not set | 16 | # CONFIG_BLK_DEV_BSG is not set |
18 | # CONFIG_IOSCHED_CFQ is not set | 17 | # CONFIG_IOSCHED_CFQ is not set |
19 | CONFIG_ARCH_PXA=y | 18 | CONFIG_ARCH_PXA=y |
diff --git a/arch/arm/configs/h3600_defconfig b/arch/arm/configs/h3600_defconfig index ebeca11faa48..175881b7da7c 100644 --- a/arch/arm/configs/h3600_defconfig +++ b/arch/arm/configs/h3600_defconfig | |||
@@ -4,7 +4,6 @@ CONFIG_HIGH_RES_TIMERS=y | |||
4 | CONFIG_LOG_BUF_SHIFT=14 | 4 | CONFIG_LOG_BUF_SHIFT=14 |
5 | CONFIG_BLK_DEV_INITRD=y | 5 | CONFIG_BLK_DEV_INITRD=y |
6 | CONFIG_MODULES=y | 6 | CONFIG_MODULES=y |
7 | # CONFIG_LBDAF is not set | ||
8 | # CONFIG_BLK_DEV_BSG is not set | 7 | # CONFIG_BLK_DEV_BSG is not set |
9 | # CONFIG_IOSCHED_DEADLINE is not set | 8 | # CONFIG_IOSCHED_DEADLINE is not set |
10 | # CONFIG_IOSCHED_CFQ is not set | 9 | # CONFIG_IOSCHED_CFQ is not set |
diff --git a/arch/arm/configs/imote2_defconfig b/arch/arm/configs/imote2_defconfig index f204017c26b9..9b779e13e05d 100644 --- a/arch/arm/configs/imote2_defconfig +++ b/arch/arm/configs/imote2_defconfig | |||
@@ -12,7 +12,6 @@ CONFIG_MODULES=y | |||
12 | CONFIG_MODULE_UNLOAD=y | 12 | CONFIG_MODULE_UNLOAD=y |
13 | CONFIG_MODULE_FORCE_UNLOAD=y | 13 | CONFIG_MODULE_FORCE_UNLOAD=y |
14 | CONFIG_MODVERSIONS=y | 14 | CONFIG_MODVERSIONS=y |
15 | # CONFIG_LBDAF is not set | ||
16 | # CONFIG_BLK_DEV_BSG is not set | 15 | # CONFIG_BLK_DEV_BSG is not set |
17 | # CONFIG_IOSCHED_CFQ is not set | 16 | # CONFIG_IOSCHED_CFQ is not set |
18 | CONFIG_ARCH_PXA=y | 17 | CONFIG_ARCH_PXA=y |
diff --git a/arch/arm/configs/moxart_defconfig b/arch/arm/configs/moxart_defconfig index 078228a19339..6a11669fa536 100644 --- a/arch/arm/configs/moxart_defconfig +++ b/arch/arm/configs/moxart_defconfig | |||
@@ -15,7 +15,6 @@ CONFIG_EMBEDDED=y | |||
15 | # CONFIG_VM_EVENT_COUNTERS is not set | 15 | # CONFIG_VM_EVENT_COUNTERS is not set |
16 | # CONFIG_SLUB_DEBUG is not set | 16 | # CONFIG_SLUB_DEBUG is not set |
17 | # CONFIG_COMPAT_BRK is not set | 17 | # CONFIG_COMPAT_BRK is not set |
18 | # CONFIG_LBDAF is not set | ||
19 | # CONFIG_BLK_DEV_BSG is not set | 18 | # CONFIG_BLK_DEV_BSG is not set |
20 | # CONFIG_IOSCHED_DEADLINE is not set | 19 | # CONFIG_IOSCHED_DEADLINE is not set |
21 | CONFIG_ARCH_MULTI_V4=y | 20 | CONFIG_ARCH_MULTI_V4=y |
diff --git a/arch/arm/configs/multi_v4t_defconfig b/arch/arm/configs/multi_v4t_defconfig index 9a6390c172d6..eeea0c41138b 100644 --- a/arch/arm/configs/multi_v4t_defconfig +++ b/arch/arm/configs/multi_v4t_defconfig | |||
@@ -5,7 +5,6 @@ CONFIG_BLK_DEV_INITRD=y | |||
5 | CONFIG_EMBEDDED=y | 5 | CONFIG_EMBEDDED=y |
6 | CONFIG_SLOB=y | 6 | CONFIG_SLOB=y |
7 | CONFIG_JUMP_LABEL=y | 7 | CONFIG_JUMP_LABEL=y |
8 | # CONFIG_LBDAF is not set | ||
9 | CONFIG_PARTITION_ADVANCED=y | 8 | CONFIG_PARTITION_ADVANCED=y |
10 | # CONFIG_IOSCHED_CFQ is not set | 9 | # CONFIG_IOSCHED_CFQ is not set |
11 | CONFIG_ARCH_MULTI_V4T=y | 10 | CONFIG_ARCH_MULTI_V4T=y |
diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig index cfc00b0961ec..8448a7f407a4 100644 --- a/arch/arm/configs/omap1_defconfig +++ b/arch/arm/configs/omap1_defconfig | |||
@@ -17,7 +17,6 @@ CONFIG_OPROFILE=y | |||
17 | CONFIG_MODULES=y | 17 | CONFIG_MODULES=y |
18 | CONFIG_MODULE_UNLOAD=y | 18 | CONFIG_MODULE_UNLOAD=y |
19 | CONFIG_MODULE_FORCE_UNLOAD=y | 19 | CONFIG_MODULE_FORCE_UNLOAD=y |
20 | # CONFIG_LBDAF is not set | ||
21 | # CONFIG_BLK_DEV_BSG is not set | 20 | # CONFIG_BLK_DEV_BSG is not set |
22 | # CONFIG_IOSCHED_DEADLINE is not set | 21 | # CONFIG_IOSCHED_DEADLINE is not set |
23 | # CONFIG_IOSCHED_CFQ is not set | 22 | # CONFIG_IOSCHED_CFQ is not set |
diff --git a/arch/arm/configs/stm32_defconfig b/arch/arm/configs/stm32_defconfig index 0258ba891376..152321d2893e 100644 --- a/arch/arm/configs/stm32_defconfig +++ b/arch/arm/configs/stm32_defconfig | |||
@@ -13,7 +13,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
13 | CONFIG_EMBEDDED=y | 13 | CONFIG_EMBEDDED=y |
14 | # CONFIG_VM_EVENT_COUNTERS is not set | 14 | # CONFIG_VM_EVENT_COUNTERS is not set |
15 | # CONFIG_SLUB_DEBUG is not set | 15 | # CONFIG_SLUB_DEBUG is not set |
16 | # CONFIG_LBDAF is not set | ||
17 | # CONFIG_BLK_DEV_BSG is not set | 16 | # CONFIG_BLK_DEV_BSG is not set |
18 | # CONFIG_IOSCHED_DEADLINE is not set | 17 | # CONFIG_IOSCHED_DEADLINE is not set |
19 | # CONFIG_IOSCHED_CFQ is not set | 18 | # CONFIG_IOSCHED_CFQ is not set |
diff --git a/arch/arm/configs/u300_defconfig b/arch/arm/configs/u300_defconfig index 36d77406e31b..831ba6a9ee8b 100644 --- a/arch/arm/configs/u300_defconfig +++ b/arch/arm/configs/u300_defconfig | |||
@@ -9,7 +9,6 @@ CONFIG_EXPERT=y | |||
9 | # CONFIG_VM_EVENT_COUNTERS is not set | 9 | # CONFIG_VM_EVENT_COUNTERS is not set |
10 | CONFIG_MODULES=y | 10 | CONFIG_MODULES=y |
11 | CONFIG_MODULE_UNLOAD=y | 11 | CONFIG_MODULE_UNLOAD=y |
12 | # CONFIG_LBDAF is not set | ||
13 | # CONFIG_BLK_DEV_BSG is not set | 12 | # CONFIG_BLK_DEV_BSG is not set |
14 | CONFIG_PARTITION_ADVANCED=y | 13 | CONFIG_PARTITION_ADVANCED=y |
15 | # CONFIG_IOSCHED_CFQ is not set | 14 | # CONFIG_IOSCHED_CFQ is not set |
diff --git a/arch/arm/configs/vexpress_defconfig b/arch/arm/configs/vexpress_defconfig index 392ed3b3613c..484d77a7f589 100644 --- a/arch/arm/configs/vexpress_defconfig +++ b/arch/arm/configs/vexpress_defconfig | |||
@@ -14,7 +14,6 @@ CONFIG_PROFILING=y | |||
14 | CONFIG_OPROFILE=y | 14 | CONFIG_OPROFILE=y |
15 | CONFIG_MODULES=y | 15 | CONFIG_MODULES=y |
16 | CONFIG_MODULE_UNLOAD=y | 16 | CONFIG_MODULE_UNLOAD=y |
17 | # CONFIG_LBDAF is not set | ||
18 | # CONFIG_BLK_DEV_BSG is not set | 17 | # CONFIG_BLK_DEV_BSG is not set |
19 | # CONFIG_IOSCHED_DEADLINE is not set | 18 | # CONFIG_IOSCHED_DEADLINE is not set |
20 | # CONFIG_IOSCHED_CFQ is not set | 19 | # CONFIG_IOSCHED_CFQ is not set |
diff --git a/arch/m68k/configs/amcore_defconfig b/arch/m68k/configs/amcore_defconfig index 0857cdbfde0c..d5e683dd885d 100644 --- a/arch/m68k/configs/amcore_defconfig +++ b/arch/m68k/configs/amcore_defconfig | |||
@@ -12,7 +12,6 @@ CONFIG_EMBEDDED=y | |||
12 | # CONFIG_VM_EVENT_COUNTERS is not set | 12 | # CONFIG_VM_EVENT_COUNTERS is not set |
13 | # CONFIG_SLUB_DEBUG is not set | 13 | # CONFIG_SLUB_DEBUG is not set |
14 | # CONFIG_COMPAT_BRK is not set | 14 | # CONFIG_COMPAT_BRK is not set |
15 | # CONFIG_LBDAF is not set | ||
16 | # CONFIG_BLK_DEV_BSG is not set | 15 | # CONFIG_BLK_DEV_BSG is not set |
17 | # CONFIG_IOSCHED_CFQ is not set | 16 | # CONFIG_IOSCHED_CFQ is not set |
18 | # CONFIG_MMU is not set | 17 | # CONFIG_MMU is not set |
diff --git a/arch/m68k/configs/m5475evb_defconfig b/arch/m68k/configs/m5475evb_defconfig index 4f4ccd13c11b..434bd3750966 100644 --- a/arch/m68k/configs/m5475evb_defconfig +++ b/arch/m68k/configs/m5475evb_defconfig | |||
@@ -11,7 +11,6 @@ CONFIG_SYSCTL_SYSCALL=y | |||
11 | # CONFIG_AIO is not set | 11 | # CONFIG_AIO is not set |
12 | CONFIG_EMBEDDED=y | 12 | CONFIG_EMBEDDED=y |
13 | CONFIG_MODULES=y | 13 | CONFIG_MODULES=y |
14 | # CONFIG_LBDAF is not set | ||
15 | # CONFIG_BLK_DEV_BSG is not set | 14 | # CONFIG_BLK_DEV_BSG is not set |
16 | # CONFIG_IOSCHED_DEADLINE is not set | 15 | # CONFIG_IOSCHED_DEADLINE is not set |
17 | # CONFIG_IOSCHED_CFQ is not set | 16 | # CONFIG_IOSCHED_CFQ is not set |
diff --git a/arch/m68k/configs/stmark2_defconfig b/arch/m68k/configs/stmark2_defconfig index 69f23c7b0497..27fa9465d19d 100644 --- a/arch/m68k/configs/stmark2_defconfig +++ b/arch/m68k/configs/stmark2_defconfig | |||
@@ -17,7 +17,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
17 | CONFIG_EMBEDDED=y | 17 | CONFIG_EMBEDDED=y |
18 | # CONFIG_VM_EVENT_COUNTERS is not set | 18 | # CONFIG_VM_EVENT_COUNTERS is not set |
19 | # CONFIG_COMPAT_BRK is not set | 19 | # CONFIG_COMPAT_BRK is not set |
20 | # CONFIG_LBDAF is not set | ||
21 | # CONFIG_BLK_DEV_BSG is not set | 20 | # CONFIG_BLK_DEV_BSG is not set |
22 | CONFIG_BLK_CMDLINE_PARSER=y | 21 | CONFIG_BLK_CMDLINE_PARSER=y |
23 | # CONFIG_MMU is not set | 22 | # CONFIG_MMU is not set |
diff --git a/arch/mips/configs/ar7_defconfig b/arch/mips/configs/ar7_defconfig index 9fbfb6e5c7d2..c83fdf649327 100644 --- a/arch/mips/configs/ar7_defconfig +++ b/arch/mips/configs/ar7_defconfig | |||
@@ -18,7 +18,6 @@ CONFIG_KEXEC=y | |||
18 | # CONFIG_SECCOMP is not set | 18 | # CONFIG_SECCOMP is not set |
19 | CONFIG_MODULES=y | 19 | CONFIG_MODULES=y |
20 | CONFIG_MODULE_UNLOAD=y | 20 | CONFIG_MODULE_UNLOAD=y |
21 | # CONFIG_LBDAF is not set | ||
22 | # CONFIG_BLK_DEV_BSG is not set | 21 | # CONFIG_BLK_DEV_BSG is not set |
23 | CONFIG_PARTITION_ADVANCED=y | 22 | CONFIG_PARTITION_ADVANCED=y |
24 | CONFIG_BSD_DISKLABEL=y | 23 | CONFIG_BSD_DISKLABEL=y |
diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig index 0c86ed86266a..30a6eafdb1d0 100644 --- a/arch/mips/configs/decstation_defconfig +++ b/arch/mips/configs/decstation_defconfig | |||
@@ -17,7 +17,6 @@ CONFIG_TC=y | |||
17 | CONFIG_MODULES=y | 17 | CONFIG_MODULES=y |
18 | CONFIG_MODULE_UNLOAD=y | 18 | CONFIG_MODULE_UNLOAD=y |
19 | CONFIG_MODULE_SRCVERSION_ALL=y | 19 | CONFIG_MODULE_SRCVERSION_ALL=y |
20 | # CONFIG_LBDAF is not set | ||
21 | CONFIG_PARTITION_ADVANCED=y | 20 | CONFIG_PARTITION_ADVANCED=y |
22 | CONFIG_OSF_PARTITION=y | 21 | CONFIG_OSF_PARTITION=y |
23 | # CONFIG_EFI_PARTITION is not set | 22 | # CONFIG_EFI_PARTITION is not set |
diff --git a/arch/mips/configs/decstation_r4k_defconfig b/arch/mips/configs/decstation_r4k_defconfig index 0e54ab2680ce..e2b58dbf4aa9 100644 --- a/arch/mips/configs/decstation_r4k_defconfig +++ b/arch/mips/configs/decstation_r4k_defconfig | |||
@@ -16,7 +16,6 @@ CONFIG_TC=y | |||
16 | CONFIG_MODULES=y | 16 | CONFIG_MODULES=y |
17 | CONFIG_MODULE_UNLOAD=y | 17 | CONFIG_MODULE_UNLOAD=y |
18 | CONFIG_MODULE_SRCVERSION_ALL=y | 18 | CONFIG_MODULE_SRCVERSION_ALL=y |
19 | # CONFIG_LBDAF is not set | ||
20 | CONFIG_PARTITION_ADVANCED=y | 19 | CONFIG_PARTITION_ADVANCED=y |
21 | CONFIG_OSF_PARTITION=y | 20 | CONFIG_OSF_PARTITION=y |
22 | # CONFIG_EFI_PARTITION is not set | 21 | # CONFIG_EFI_PARTITION is not set |
diff --git a/arch/mips/configs/loongson1b_defconfig b/arch/mips/configs/loongson1b_defconfig index b064d68a5424..aa7e98c5f5fc 100644 --- a/arch/mips/configs/loongson1b_defconfig +++ b/arch/mips/configs/loongson1b_defconfig | |||
@@ -19,7 +19,6 @@ CONFIG_MACH_LOONGSON32=y | |||
19 | CONFIG_MODULES=y | 19 | CONFIG_MODULES=y |
20 | CONFIG_MODULE_UNLOAD=y | 20 | CONFIG_MODULE_UNLOAD=y |
21 | CONFIG_MODVERSIONS=y | 21 | CONFIG_MODVERSIONS=y |
22 | # CONFIG_LBDAF is not set | ||
23 | # CONFIG_BLK_DEV_BSG is not set | 22 | # CONFIG_BLK_DEV_BSG is not set |
24 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 23 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
25 | CONFIG_NET=y | 24 | CONFIG_NET=y |
diff --git a/arch/mips/configs/loongson1c_defconfig b/arch/mips/configs/loongson1c_defconfig index 5d76559b56cd..520e7ef35383 100644 --- a/arch/mips/configs/loongson1c_defconfig +++ b/arch/mips/configs/loongson1c_defconfig | |||
@@ -20,7 +20,6 @@ CONFIG_LOONGSON1_LS1C=y | |||
20 | CONFIG_MODULES=y | 20 | CONFIG_MODULES=y |
21 | CONFIG_MODULE_UNLOAD=y | 21 | CONFIG_MODULE_UNLOAD=y |
22 | CONFIG_MODVERSIONS=y | 22 | CONFIG_MODVERSIONS=y |
23 | # CONFIG_LBDAF is not set | ||
24 | # CONFIG_BLK_DEV_BSG is not set | 23 | # CONFIG_BLK_DEV_BSG is not set |
25 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 24 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
26 | CONFIG_NET=y | 25 | CONFIG_NET=y |
diff --git a/arch/mips/configs/rb532_defconfig b/arch/mips/configs/rb532_defconfig index 7befe05fd813..ed1038f62a2c 100644 --- a/arch/mips/configs/rb532_defconfig +++ b/arch/mips/configs/rb532_defconfig | |||
@@ -19,7 +19,6 @@ CONFIG_PCI=y | |||
19 | # CONFIG_PCI_QUIRKS is not set | 19 | # CONFIG_PCI_QUIRKS is not set |
20 | CONFIG_MODULES=y | 20 | CONFIG_MODULES=y |
21 | CONFIG_MODULE_UNLOAD=y | 21 | CONFIG_MODULE_UNLOAD=y |
22 | # CONFIG_LBDAF is not set | ||
23 | # CONFIG_BLK_DEV_BSG is not set | 22 | # CONFIG_BLK_DEV_BSG is not set |
24 | CONFIG_PARTITION_ADVANCED=y | 23 | CONFIG_PARTITION_ADVANCED=y |
25 | CONFIG_MAC_PARTITION=y | 24 | CONFIG_MAC_PARTITION=y |
diff --git a/arch/mips/configs/rbtx49xx_defconfig b/arch/mips/configs/rbtx49xx_defconfig index 50a2c9ad583f..b0f0c5f9ad9d 100644 --- a/arch/mips/configs/rbtx49xx_defconfig +++ b/arch/mips/configs/rbtx49xx_defconfig | |||
@@ -17,7 +17,6 @@ CONFIG_TOSHIBA_RBTX4938_MPLEX_KEEP=y | |||
17 | CONFIG_PCI=y | 17 | CONFIG_PCI=y |
18 | CONFIG_MODULES=y | 18 | CONFIG_MODULES=y |
19 | CONFIG_MODULE_UNLOAD=y | 19 | CONFIG_MODULE_UNLOAD=y |
20 | # CONFIG_LBDAF is not set | ||
21 | # CONFIG_BLK_DEV_BSG is not set | 20 | # CONFIG_BLK_DEV_BSG is not set |
22 | CONFIG_NET=y | 21 | CONFIG_NET=y |
23 | CONFIG_PACKET=y | 22 | CONFIG_PACKET=y |
diff --git a/arch/parisc/configs/generic-32bit_defconfig b/arch/parisc/configs/generic-32bit_defconfig index 37ae4b57c001..a8f9bbef0975 100644 --- a/arch/parisc/configs/generic-32bit_defconfig +++ b/arch/parisc/configs/generic-32bit_defconfig | |||
@@ -14,7 +14,6 @@ CONFIG_SLAB=y | |||
14 | CONFIG_MODULES=y | 14 | CONFIG_MODULES=y |
15 | CONFIG_MODULE_UNLOAD=y | 15 | CONFIG_MODULE_UNLOAD=y |
16 | CONFIG_MODULE_FORCE_UNLOAD=y | 16 | CONFIG_MODULE_FORCE_UNLOAD=y |
17 | # CONFIG_LBDAF is not set | ||
18 | # CONFIG_BLK_DEV_BSG is not set | 17 | # CONFIG_BLK_DEV_BSG is not set |
19 | CONFIG_PA7100LC=y | 18 | CONFIG_PA7100LC=y |
20 | CONFIG_SMP=y | 19 | CONFIG_SMP=y |
diff --git a/arch/sh/configs/apsh4ad0a_defconfig b/arch/sh/configs/apsh4ad0a_defconfig index 825c641726c4..d0d9ebc7165b 100644 --- a/arch/sh/configs/apsh4ad0a_defconfig +++ b/arch/sh/configs/apsh4ad0a_defconfig | |||
@@ -19,7 +19,6 @@ CONFIG_SLAB=y | |||
19 | CONFIG_PROFILING=y | 19 | CONFIG_PROFILING=y |
20 | CONFIG_MODULES=y | 20 | CONFIG_MODULES=y |
21 | CONFIG_MODULE_UNLOAD=y | 21 | CONFIG_MODULE_UNLOAD=y |
22 | # CONFIG_LBDAF is not set | ||
23 | # CONFIG_BLK_DEV_BSG is not set | 22 | # CONFIG_BLK_DEV_BSG is not set |
24 | CONFIG_CFQ_GROUP_IOSCHED=y | 23 | CONFIG_CFQ_GROUP_IOSCHED=y |
25 | CONFIG_CPU_SUBTYPE_SH7786=y | 24 | CONFIG_CPU_SUBTYPE_SH7786=y |
diff --git a/arch/sh/configs/ecovec24-romimage_defconfig b/arch/sh/configs/ecovec24-romimage_defconfig index 0c5dfccbfe37..bdb61d1d0127 100644 --- a/arch/sh/configs/ecovec24-romimage_defconfig +++ b/arch/sh/configs/ecovec24-romimage_defconfig | |||
@@ -7,7 +7,6 @@ CONFIG_LOG_BUF_SHIFT=14 | |||
7 | CONFIG_BLK_DEV_INITRD=y | 7 | CONFIG_BLK_DEV_INITRD=y |
8 | # CONFIG_KALLSYMS is not set | 8 | # CONFIG_KALLSYMS is not set |
9 | CONFIG_SLAB=y | 9 | CONFIG_SLAB=y |
10 | # CONFIG_LBDAF is not set | ||
11 | # CONFIG_BLK_DEV_BSG is not set | 10 | # CONFIG_BLK_DEV_BSG is not set |
12 | CONFIG_CPU_SUBTYPE_SH7724=y | 11 | CONFIG_CPU_SUBTYPE_SH7724=y |
13 | CONFIG_MEMORY_SIZE=0x10000000 | 12 | CONFIG_MEMORY_SIZE=0x10000000 |
diff --git a/arch/sh/configs/rsk7264_defconfig b/arch/sh/configs/rsk7264_defconfig index 2b9b731fc86b..ad003ee469ea 100644 --- a/arch/sh/configs/rsk7264_defconfig +++ b/arch/sh/configs/rsk7264_defconfig | |||
@@ -16,7 +16,6 @@ CONFIG_PERF_COUNTERS=y | |||
16 | CONFIG_SLAB=y | 16 | CONFIG_SLAB=y |
17 | CONFIG_MMAP_ALLOW_UNINITIALIZED=y | 17 | CONFIG_MMAP_ALLOW_UNINITIALIZED=y |
18 | CONFIG_PROFILING=y | 18 | CONFIG_PROFILING=y |
19 | # CONFIG_LBDAF is not set | ||
20 | # CONFIG_BLK_DEV_BSG is not set | 19 | # CONFIG_BLK_DEV_BSG is not set |
21 | CONFIG_PARTITION_ADVANCED=y | 20 | CONFIG_PARTITION_ADVANCED=y |
22 | # CONFIG_IOSCHED_DEADLINE is not set | 21 | # CONFIG_IOSCHED_DEADLINE is not set |
diff --git a/arch/sh/configs/rsk7269_defconfig b/arch/sh/configs/rsk7269_defconfig index d041f7bcb84c..27fc01d58cf8 100644 --- a/arch/sh/configs/rsk7269_defconfig +++ b/arch/sh/configs/rsk7269_defconfig | |||
@@ -3,7 +3,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
3 | CONFIG_EMBEDDED=y | 3 | CONFIG_EMBEDDED=y |
4 | # CONFIG_VM_EVENT_COUNTERS is not set | 4 | # CONFIG_VM_EVENT_COUNTERS is not set |
5 | CONFIG_SLAB=y | 5 | CONFIG_SLAB=y |
6 | # CONFIG_LBDAF is not set | ||
7 | # CONFIG_BLK_DEV_BSG is not set | 6 | # CONFIG_BLK_DEV_BSG is not set |
8 | # CONFIG_IOSCHED_DEADLINE is not set | 7 | # CONFIG_IOSCHED_DEADLINE is not set |
9 | # CONFIG_IOSCHED_CFQ is not set | 8 | # CONFIG_IOSCHED_CFQ is not set |
diff --git a/arch/sh/configs/sh7785lcr_32bit_defconfig b/arch/sh/configs/sh7785lcr_32bit_defconfig index 2ddf5ca7094e..a89ccc15af23 100644 --- a/arch/sh/configs/sh7785lcr_32bit_defconfig +++ b/arch/sh/configs/sh7785lcr_32bit_defconfig | |||
@@ -11,7 +11,6 @@ CONFIG_PROFILING=y | |||
11 | CONFIG_GCOV_KERNEL=y | 11 | CONFIG_GCOV_KERNEL=y |
12 | CONFIG_MODULES=y | 12 | CONFIG_MODULES=y |
13 | CONFIG_MODULE_UNLOAD=y | 13 | CONFIG_MODULE_UNLOAD=y |
14 | # CONFIG_LBDAF is not set | ||
15 | # CONFIG_BLK_DEV_BSG is not set | 14 | # CONFIG_BLK_DEV_BSG is not set |
16 | CONFIG_CPU_SUBTYPE_SH7785=y | 15 | CONFIG_CPU_SUBTYPE_SH7785=y |
17 | CONFIG_MEMORY_START=0x40000000 | 16 | CONFIG_MEMORY_START=0x40000000 |
diff --git a/block/Kconfig b/block/Kconfig index 028bc085dac8..1b220101a9cb 100644 --- a/block/Kconfig +++ b/block/Kconfig | |||
@@ -26,30 +26,6 @@ menuconfig BLOCK | |||
26 | 26 | ||
27 | if BLOCK | 27 | if BLOCK |
28 | 28 | ||
29 | config LBDAF | ||
30 | bool "Support for large (2TB+) block devices and files" | ||
31 | depends on !64BIT | ||
32 | default y | ||
33 | help | ||
34 | Enable block devices or files of size 2TB and larger. | ||
35 | |||
36 | This option is required to support the full capacity of large | ||
37 | (2TB+) block devices, including RAID, disk, Network Block Device, | ||
38 | Logical Volume Manager (LVM) and loopback. | ||
39 | |||
40 | This option also enables support for single files larger than | ||
41 | 2TB. | ||
42 | |||
43 | The ext4 filesystem requires that this feature be enabled in | ||
44 | order to support filesystems that have the huge_file feature | ||
45 | enabled. Otherwise, it will refuse to mount in the read-write | ||
46 | mode any filesystems that use the huge_file feature, which is | ||
47 | enabled by default by mke2fs.ext4. | ||
48 | |||
49 | The GFS2 filesystem also requires this feature. | ||
50 | |||
51 | If unsure, say Y. | ||
52 | |||
53 | config BLK_SCSI_REQUEST | 29 | config BLK_SCSI_REQUEST |
54 | bool | 30 | bool |
55 | 31 | ||
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index 000a2f4c0e92..acd7af3630e9 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h | |||
@@ -1317,10 +1317,6 @@ struct bm_extent { | |||
1317 | 1317 | ||
1318 | #define DRBD_MAX_SECTORS_FIXED_BM \ | 1318 | #define DRBD_MAX_SECTORS_FIXED_BM \ |
1319 | ((MD_128MB_SECT - MD_32kB_SECT - MD_4kB_SECT) * (1LL<<(BM_EXT_SHIFT-9))) | 1319 | ((MD_128MB_SECT - MD_32kB_SECT - MD_4kB_SECT) * (1LL<<(BM_EXT_SHIFT-9))) |
1320 | #if !defined(CONFIG_LBDAF) && BITS_PER_LONG == 32 | ||
1321 | #define DRBD_MAX_SECTORS DRBD_MAX_SECTORS_32 | ||
1322 | #define DRBD_MAX_SECTORS_FLEX DRBD_MAX_SECTORS_32 | ||
1323 | #else | ||
1324 | #define DRBD_MAX_SECTORS DRBD_MAX_SECTORS_FIXED_BM | 1320 | #define DRBD_MAX_SECTORS DRBD_MAX_SECTORS_FIXED_BM |
1325 | /* 16 TB in units of sectors */ | 1321 | /* 16 TB in units of sectors */ |
1326 | #if BITS_PER_LONG == 32 | 1322 | #if BITS_PER_LONG == 32 |
@@ -1333,7 +1329,6 @@ struct bm_extent { | |||
1333 | #define DRBD_MAX_SECTORS_FLEX (1UL << 51) | 1329 | #define DRBD_MAX_SECTORS_FLEX (1UL << 51) |
1334 | /* corresponds to (1UL << 38) bits right now. */ | 1330 | /* corresponds to (1UL << 38) bits right now. */ |
1335 | #endif | 1331 | #endif |
1336 | #endif | ||
1337 | 1332 | ||
1338 | /* Estimate max bio size as 256 * PAGE_SIZE, | 1333 | /* Estimate max bio size as 256 * PAGE_SIZE, |
1339 | * so for typical PAGE_SIZE of 4k, that is (1<<20) Byte. | 1334 | * so for typical PAGE_SIZE of 4k, that is (1<<20) Byte. |
diff --git a/drivers/block/ps3disk.c b/drivers/block/ps3disk.c index 4e1d9b31f60c..cc61c5ce3ad5 100644 --- a/drivers/block/ps3disk.c +++ b/drivers/block/ps3disk.c | |||
@@ -102,7 +102,7 @@ static void ps3disk_scatter_gather(struct ps3_storage_device *dev, | |||
102 | 102 | ||
103 | rq_for_each_segment(bvec, req, iter) { | 103 | rq_for_each_segment(bvec, req, iter) { |
104 | unsigned long flags; | 104 | unsigned long flags; |
105 | dev_dbg(&dev->sbd.core, "%s:%u: bio %u: %u sectors from %lu\n", | 105 | dev_dbg(&dev->sbd.core, "%s:%u: bio %u: %u sectors from %llu\n", |
106 | __func__, __LINE__, i, bio_sectors(iter.bio), | 106 | __func__, __LINE__, i, bio_sectors(iter.bio), |
107 | iter.bio->bi_iter.bi_sector); | 107 | iter.bio->bi_iter.bi_sector); |
108 | 108 | ||
@@ -496,7 +496,7 @@ static int ps3disk_probe(struct ps3_system_bus_device *_dev) | |||
496 | dev->regions[dev->region_idx].size*priv->blocking_factor); | 496 | dev->regions[dev->region_idx].size*priv->blocking_factor); |
497 | 497 | ||
498 | dev_info(&dev->sbd.core, | 498 | dev_info(&dev->sbd.core, |
499 | "%s is a %s (%llu MiB total, %lu MiB for OtherOS)\n", | 499 | "%s is a %s (%llu MiB total, %llu MiB for OtherOS)\n", |
500 | gendisk->disk_name, priv->model, priv->raw_capacity >> 11, | 500 | gendisk->disk_name, priv->model, priv->raw_capacity >> 11, |
501 | get_capacity(gendisk) >> 11); | 501 | get_capacity(gendisk) >> 11); |
502 | 502 | ||
diff --git a/drivers/md/dm-exception-store.h b/drivers/md/dm-exception-store.h index 12b5216c2cfe..721efc493942 100644 --- a/drivers/md/dm-exception-store.h +++ b/drivers/md/dm-exception-store.h | |||
@@ -135,9 +135,8 @@ struct dm_dev *dm_snap_cow(struct dm_snapshot *snap); | |||
135 | /* | 135 | /* |
136 | * Funtions to manipulate consecutive chunks | 136 | * Funtions to manipulate consecutive chunks |
137 | */ | 137 | */ |
138 | # if defined(CONFIG_LBDAF) || (BITS_PER_LONG == 64) | 138 | #define DM_CHUNK_CONSECUTIVE_BITS 8 |
139 | # define DM_CHUNK_CONSECUTIVE_BITS 8 | 139 | #define DM_CHUNK_NUMBER_BITS 56 |
140 | # define DM_CHUNK_NUMBER_BITS 56 | ||
141 | 140 | ||
142 | static inline chunk_t dm_chunk_number(chunk_t chunk) | 141 | static inline chunk_t dm_chunk_number(chunk_t chunk) |
143 | { | 142 | { |
@@ -163,29 +162,6 @@ static inline void dm_consecutive_chunk_count_dec(struct dm_exception *e) | |||
163 | e->new_chunk -= (1ULL << DM_CHUNK_NUMBER_BITS); | 162 | e->new_chunk -= (1ULL << DM_CHUNK_NUMBER_BITS); |
164 | } | 163 | } |
165 | 164 | ||
166 | # else | ||
167 | # define DM_CHUNK_CONSECUTIVE_BITS 0 | ||
168 | |||
169 | static inline chunk_t dm_chunk_number(chunk_t chunk) | ||
170 | { | ||
171 | return chunk; | ||
172 | } | ||
173 | |||
174 | static inline unsigned dm_consecutive_chunk_count(struct dm_exception *e) | ||
175 | { | ||
176 | return 0; | ||
177 | } | ||
178 | |||
179 | static inline void dm_consecutive_chunk_count_inc(struct dm_exception *e) | ||
180 | { | ||
181 | } | ||
182 | |||
183 | static inline void dm_consecutive_chunk_count_dec(struct dm_exception *e) | ||
184 | { | ||
185 | } | ||
186 | |||
187 | # endif | ||
188 | |||
189 | /* | 165 | /* |
190 | * Return the number of sectors in the device. | 166 | * Return the number of sectors in the device. |
191 | */ | 167 | */ |
diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c index d57d997a52c8..0eb56ba89a7f 100644 --- a/drivers/md/dm-integrity.c +++ b/drivers/md/dm-integrity.c | |||
@@ -88,14 +88,10 @@ struct journal_entry { | |||
88 | 88 | ||
89 | #if BITS_PER_LONG == 64 | 89 | #if BITS_PER_LONG == 64 |
90 | #define journal_entry_set_sector(je, x) do { smp_wmb(); WRITE_ONCE((je)->u.sector, cpu_to_le64(x)); } while (0) | 90 | #define journal_entry_set_sector(je, x) do { smp_wmb(); WRITE_ONCE((je)->u.sector, cpu_to_le64(x)); } while (0) |
91 | #define journal_entry_get_sector(je) le64_to_cpu((je)->u.sector) | ||
92 | #elif defined(CONFIG_LBDAF) | ||
93 | #define journal_entry_set_sector(je, x) do { (je)->u.s.sector_lo = cpu_to_le32(x); smp_wmb(); WRITE_ONCE((je)->u.s.sector_hi, cpu_to_le32((x) >> 32)); } while (0) | ||
94 | #define journal_entry_get_sector(je) le64_to_cpu((je)->u.sector) | ||
95 | #else | 91 | #else |
96 | #define journal_entry_set_sector(je, x) do { (je)->u.s.sector_lo = cpu_to_le32(x); smp_wmb(); WRITE_ONCE((je)->u.s.sector_hi, cpu_to_le32(0)); } while (0) | 92 | #define journal_entry_set_sector(je, x) do { (je)->u.s.sector_lo = cpu_to_le32(x); smp_wmb(); WRITE_ONCE((je)->u.s.sector_hi, cpu_to_le32((x) >> 32)); } while (0) |
97 | #define journal_entry_get_sector(je) le32_to_cpu((je)->u.s.sector_lo) | ||
98 | #endif | 93 | #endif |
94 | #define journal_entry_get_sector(je) le64_to_cpu((je)->u.sector) | ||
99 | #define journal_entry_is_unused(je) ((je)->u.s.sector_hi == cpu_to_le32(-1)) | 95 | #define journal_entry_is_unused(je) ((je)->u.s.sector_hi == cpu_to_le32(-1)) |
100 | #define journal_entry_set_unused(je) do { ((je)->u.s.sector_hi = cpu_to_le32(-1)); } while (0) | 96 | #define journal_entry_set_unused(je) do { ((je)->u.s.sector_hi = cpu_to_le32(-1)); } while (0) |
101 | #define journal_entry_is_inprogress(je) ((je)->u.s.sector_hi == cpu_to_le32(-2)) | 97 | #define journal_entry_is_inprogress(je) ((je)->u.s.sector_hi == cpu_to_le32(-2)) |
diff --git a/drivers/md/md.c b/drivers/md/md.c index d0f688399a56..1fa2682951f1 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -1106,8 +1106,7 @@ static int super_90_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor | |||
1106 | * (not needed for Linear and RAID0 as metadata doesn't | 1106 | * (not needed for Linear and RAID0 as metadata doesn't |
1107 | * record this size) | 1107 | * record this size) |
1108 | */ | 1108 | */ |
1109 | if (IS_ENABLED(CONFIG_LBDAF) && (u64)rdev->sectors >= (2ULL << 32) && | 1109 | if ((u64)rdev->sectors >= (2ULL << 32) && sb->level >= 1) |
1110 | sb->level >= 1) | ||
1111 | rdev->sectors = (sector_t)(2ULL << 32) - 2; | 1110 | rdev->sectors = (sector_t)(2ULL << 32) - 2; |
1112 | 1111 | ||
1113 | if (rdev->sectors < ((sector_t)sb->size) * 2 && sb->level >= 1) | 1112 | if (rdev->sectors < ((sector_t)sb->size) * 2 && sb->level >= 1) |
@@ -1405,8 +1404,7 @@ super_90_rdev_size_change(struct md_rdev *rdev, sector_t num_sectors) | |||
1405 | /* Limit to 4TB as metadata cannot record more than that. | 1404 | /* Limit to 4TB as metadata cannot record more than that. |
1406 | * 4TB == 2^32 KB, or 2*2^32 sectors. | 1405 | * 4TB == 2^32 KB, or 2*2^32 sectors. |
1407 | */ | 1406 | */ |
1408 | if (IS_ENABLED(CONFIG_LBDAF) && (u64)num_sectors >= (2ULL << 32) && | 1407 | if ((u64)num_sectors >= (2ULL << 32) && rdev->mddev->level >= 1) |
1409 | rdev->mddev->level >= 1) | ||
1410 | num_sectors = (sector_t)(2ULL << 32) - 2; | 1408 | num_sectors = (sector_t)(2ULL << 32) - 2; |
1411 | do { | 1409 | do { |
1412 | md_super_write(rdev->mddev, rdev, rdev->sb_start, rdev->sb_size, | 1410 | md_super_write(rdev->mddev, rdev, rdev->sb_start, rdev->sb_size, |
diff --git a/drivers/nvdimm/pfn_devs.c b/drivers/nvdimm/pfn_devs.c index d271bd731af7..01f40672507f 100644 --- a/drivers/nvdimm/pfn_devs.c +++ b/drivers/nvdimm/pfn_devs.c | |||
@@ -391,7 +391,7 @@ static int nd_pfn_clear_memmap_errors(struct nd_pfn *nd_pfn) | |||
391 | bb_present = badblocks_check(&nd_region->bb, meta_start, | 391 | bb_present = badblocks_check(&nd_region->bb, meta_start, |
392 | meta_num, &first_bad, &num_bad); | 392 | meta_num, &first_bad, &num_bad); |
393 | if (bb_present) { | 393 | if (bb_present) { |
394 | dev_dbg(&nd_pfn->dev, "meta: %x badblocks at %lx\n", | 394 | dev_dbg(&nd_pfn->dev, "meta: %x badblocks at %llx\n", |
395 | num_bad, first_bad); | 395 | num_bad, first_bad); |
396 | nsoff = ALIGN_DOWN((nd_region->ndr_start | 396 | nsoff = ALIGN_DOWN((nd_region->ndr_start |
397 | + (first_bad << 9)) - nsio->res.start, | 397 | + (first_bad << 9)) - nsio->res.start, |
@@ -410,7 +410,7 @@ static int nd_pfn_clear_memmap_errors(struct nd_pfn *nd_pfn) | |||
410 | } | 410 | } |
411 | if (rc) { | 411 | if (rc) { |
412 | dev_err(&nd_pfn->dev, | 412 | dev_err(&nd_pfn->dev, |
413 | "error clearing %x badblocks at %lx\n", | 413 | "error clearing %x badblocks at %llx\n", |
414 | num_bad, first_bad); | 414 | num_bad, first_bad); |
415 | return rc; | 415 | return rc; |
416 | } | 416 | } |
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 2b2bc4b49d78..92c34d93e051 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
@@ -2256,22 +2256,6 @@ static void read_capacity_error(struct scsi_disk *sdkp, struct scsi_device *sdp, | |||
2256 | 2256 | ||
2257 | #define READ_CAPACITY_RETRIES_ON_RESET 10 | 2257 | #define READ_CAPACITY_RETRIES_ON_RESET 10 |
2258 | 2258 | ||
2259 | /* | ||
2260 | * Ensure that we don't overflow sector_t when CONFIG_LBDAF is not set | ||
2261 | * and the reported logical block size is bigger than 512 bytes. Note | ||
2262 | * that last_sector is a u64 and therefore logical_to_sectors() is not | ||
2263 | * applicable. | ||
2264 | */ | ||
2265 | static bool sd_addressable_capacity(u64 lba, unsigned int sector_size) | ||
2266 | { | ||
2267 | u64 last_sector = (lba + 1ULL) << (ilog2(sector_size) - 9); | ||
2268 | |||
2269 | if (sizeof(sector_t) == 4 && last_sector > U32_MAX) | ||
2270 | return false; | ||
2271 | |||
2272 | return true; | ||
2273 | } | ||
2274 | |||
2275 | static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp, | 2259 | static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp, |
2276 | unsigned char *buffer) | 2260 | unsigned char *buffer) |
2277 | { | 2261 | { |
@@ -2337,14 +2321,6 @@ static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp, | |||
2337 | return -ENODEV; | 2321 | return -ENODEV; |
2338 | } | 2322 | } |
2339 | 2323 | ||
2340 | if (!sd_addressable_capacity(lba, sector_size)) { | ||
2341 | sd_printk(KERN_ERR, sdkp, "Too big for this kernel. Use a " | ||
2342 | "kernel compiled with support for large block " | ||
2343 | "devices.\n"); | ||
2344 | sdkp->capacity = 0; | ||
2345 | return -EOVERFLOW; | ||
2346 | } | ||
2347 | |||
2348 | /* Logical blocks per physical block exponent */ | 2324 | /* Logical blocks per physical block exponent */ |
2349 | sdkp->physical_block_size = (1 << (buffer[13] & 0xf)) * sector_size; | 2325 | sdkp->physical_block_size = (1 << (buffer[13] & 0xf)) * sector_size; |
2350 | 2326 | ||
@@ -2426,14 +2402,6 @@ static int read_capacity_10(struct scsi_disk *sdkp, struct scsi_device *sdp, | |||
2426 | return sector_size; | 2402 | return sector_size; |
2427 | } | 2403 | } |
2428 | 2404 | ||
2429 | if (!sd_addressable_capacity(lba, sector_size)) { | ||
2430 | sd_printk(KERN_ERR, sdkp, "Too big for this kernel. Use a " | ||
2431 | "kernel compiled with support for large block " | ||
2432 | "devices.\n"); | ||
2433 | sdkp->capacity = 0; | ||
2434 | return -EOVERFLOW; | ||
2435 | } | ||
2436 | |||
2437 | sdkp->capacity = lba + 1; | 2405 | sdkp->capacity = lba + 1; |
2438 | sdkp->physical_block_size = sector_size; | 2406 | sdkp->physical_block_size = sector_size; |
2439 | return sector_size; | 2407 | return sector_size; |
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index e7ae26e36c9c..38faf661e237 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c | |||
@@ -1760,8 +1760,6 @@ int ext4_group_extend(struct super_block *sb, struct ext4_super_block *es, | |||
1760 | ext4_msg(sb, KERN_ERR, | 1760 | ext4_msg(sb, KERN_ERR, |
1761 | "filesystem too large to resize to %llu blocks safely", | 1761 | "filesystem too large to resize to %llu blocks safely", |
1762 | n_blocks_count); | 1762 | n_blocks_count); |
1763 | if (sizeof(sector_t) < 8) | ||
1764 | ext4_warning(sb, "CONFIG_LBDAF not enabled"); | ||
1765 | return -EINVAL; | 1763 | return -EINVAL; |
1766 | } | 1764 | } |
1767 | 1765 | ||
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 6ed4eb81e674..d10e9e724bdd 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -2706,13 +2706,9 @@ static loff_t ext4_max_size(int blkbits, int has_huge_files) | |||
2706 | loff_t res; | 2706 | loff_t res; |
2707 | loff_t upper_limit = MAX_LFS_FILESIZE; | 2707 | loff_t upper_limit = MAX_LFS_FILESIZE; |
2708 | 2708 | ||
2709 | /* small i_blocks in vfs inode? */ | 2709 | BUILD_BUG_ON(sizeof(blkcnt_t) < sizeof(u64)); |
2710 | if (!has_huge_files || sizeof(blkcnt_t) < sizeof(u64)) { | 2710 | |
2711 | /* | 2711 | if (!has_huge_files) { |
2712 | * CONFIG_LBDAF is not enabled implies the inode | ||
2713 | * i_block represent total blocks in 512 bytes | ||
2714 | * 32 == size of vfs inode i_blocks * 8 | ||
2715 | */ | ||
2716 | upper_limit = (1LL << 32) - 1; | 2712 | upper_limit = (1LL << 32) - 1; |
2717 | 2713 | ||
2718 | /* total blocks in file system block size */ | 2714 | /* total blocks in file system block size */ |
@@ -2753,11 +2749,11 @@ static loff_t ext4_max_bitmap_size(int bits, int has_huge_files) | |||
2753 | * number of 512-byte sectors of the file. | 2749 | * number of 512-byte sectors of the file. |
2754 | */ | 2750 | */ |
2755 | 2751 | ||
2756 | if (!has_huge_files || sizeof(blkcnt_t) < sizeof(u64)) { | 2752 | if (!has_huge_files) { |
2757 | /* | 2753 | /* |
2758 | * !has_huge_files or CONFIG_LBDAF not enabled implies that | 2754 | * !has_huge_files or implies that the inode i_block field |
2759 | * the inode i_block field represents total file blocks in | 2755 | * represents total file blocks in 2^32 512-byte sectors == |
2760 | * 2^32 512-byte sectors == size of vfs inode i_blocks * 8 | 2756 | * size of vfs inode i_blocks * 8 |
2761 | */ | 2757 | */ |
2762 | upper_limit = (1LL << 32) - 1; | 2758 | upper_limit = (1LL << 32) - 1; |
2763 | 2759 | ||
@@ -2897,18 +2893,6 @@ static int ext4_feature_set_ok(struct super_block *sb, int readonly) | |||
2897 | ~EXT4_FEATURE_RO_COMPAT_SUPP)); | 2893 | ~EXT4_FEATURE_RO_COMPAT_SUPP)); |
2898 | return 0; | 2894 | return 0; |
2899 | } | 2895 | } |
2900 | /* | ||
2901 | * Large file size enabled file system can only be mounted | ||
2902 | * read-write on 32-bit systems if kernel is built with CONFIG_LBDAF | ||
2903 | */ | ||
2904 | if (ext4_has_feature_huge_file(sb)) { | ||
2905 | if (sizeof(blkcnt_t) < sizeof(u64)) { | ||
2906 | ext4_msg(sb, KERN_ERR, "Filesystem with huge files " | ||
2907 | "cannot be mounted RDWR without " | ||
2908 | "CONFIG_LBDAF"); | ||
2909 | return 0; | ||
2910 | } | ||
2911 | } | ||
2912 | if (ext4_has_feature_bigalloc(sb) && !ext4_has_feature_extents(sb)) { | 2896 | if (ext4_has_feature_bigalloc(sb) && !ext4_has_feature_extents(sb)) { |
2913 | ext4_msg(sb, KERN_ERR, | 2897 | ext4_msg(sb, KERN_ERR, |
2914 | "Can't support bigalloc feature without " | 2898 | "Can't support bigalloc feature without " |
@@ -4057,8 +4041,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) | |||
4057 | if (err) { | 4041 | if (err) { |
4058 | ext4_msg(sb, KERN_ERR, "filesystem" | 4042 | ext4_msg(sb, KERN_ERR, "filesystem" |
4059 | " too large to mount safely on this system"); | 4043 | " too large to mount safely on this system"); |
4060 | if (sizeof(sector_t) < 8) | ||
4061 | ext4_msg(sb, KERN_WARNING, "CONFIG_LBDAF not enabled"); | ||
4062 | goto failed_mount; | 4044 | goto failed_mount; |
4063 | } | 4045 | } |
4064 | 4046 | ||
diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig index 3ed2b088dcfd..6a1e499543f5 100644 --- a/fs/gfs2/Kconfig +++ b/fs/gfs2/Kconfig | |||
@@ -1,6 +1,5 @@ | |||
1 | config GFS2_FS | 1 | config GFS2_FS |
2 | tristate "GFS2 file system support" | 2 | tristate "GFS2 file system support" |
3 | depends on (64BIT || LBDAF) | ||
4 | select FS_POSIX_ACL | 3 | select FS_POSIX_ACL |
5 | select CRC32 | 4 | select CRC32 |
6 | select LIBCRC32C | 5 | select LIBCRC32C |
diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig index 5f93cfacb3d1..69d02cf8cf37 100644 --- a/fs/nfs/Kconfig +++ b/fs/nfs/Kconfig | |||
@@ -121,7 +121,6 @@ config PNFS_FILE_LAYOUT | |||
121 | config PNFS_BLOCK | 121 | config PNFS_BLOCK |
122 | tristate | 122 | tristate |
123 | depends on NFS_V4_1 && BLK_DEV_DM | 123 | depends on NFS_V4_1 && BLK_DEV_DM |
124 | depends on 64BIT || LBDAF | ||
125 | default NFS_V4 | 124 | default NFS_V4 |
126 | 125 | ||
127 | config PNFS_FLEXFILE_LAYOUT | 126 | config PNFS_FLEXFILE_LAYOUT |
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 96ae7cedd487..fc3d29eceb2f 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c | |||
@@ -600,7 +600,6 @@ static unsigned long long ocfs2_max_file_offset(unsigned int bbits, | |||
600 | */ | 600 | */ |
601 | 601 | ||
602 | #if BITS_PER_LONG == 32 | 602 | #if BITS_PER_LONG == 32 |
603 | # if defined(CONFIG_LBDAF) | ||
604 | BUILD_BUG_ON(sizeof(sector_t) != 8); | 603 | BUILD_BUG_ON(sizeof(sector_t) != 8); |
605 | /* | 604 | /* |
606 | * We might be limited by page cache size. | 605 | * We might be limited by page cache size. |
@@ -614,15 +613,6 @@ static unsigned long long ocfs2_max_file_offset(unsigned int bbits, | |||
614 | */ | 613 | */ |
615 | bitshift = 31; | 614 | bitshift = 31; |
616 | } | 615 | } |
617 | # else | ||
618 | /* | ||
619 | * We are limited by the size of sector_t. Use block size, as | ||
620 | * that's what we expose to the VFS. | ||
621 | */ | ||
622 | bytes = 1 << bbits; | ||
623 | trim = 1; | ||
624 | bitshift = 31; | ||
625 | # endif | ||
626 | #endif | 616 | #endif |
627 | 617 | ||
628 | /* | 618 | /* |
diff --git a/fs/stack.c b/fs/stack.c index a54e33ed10f1..664ed35558bd 100644 --- a/fs/stack.c +++ b/fs/stack.c | |||
@@ -21,11 +21,10 @@ void fsstack_copy_inode_size(struct inode *dst, struct inode *src) | |||
21 | i_size = i_size_read(src); | 21 | i_size = i_size_read(src); |
22 | 22 | ||
23 | /* | 23 | /* |
24 | * But if CONFIG_LBDAF (on 32-bit), we ought to make an effort to | 24 | * But on 32-bit, we ought to make an effort to keep the two halves of |
25 | * keep the two halves of i_blocks in sync despite SMP or PREEMPT - | 25 | * i_blocks in sync despite SMP or PREEMPT - though stat's |
26 | * though stat's generic_fillattr() doesn't bother, and we won't be | 26 | * generic_fillattr() doesn't bother, and we won't be applying quotas |
27 | * applying quotas (where i_blocks does become important) at the | 27 | * (where i_blocks does become important) at the upper level. |
28 | * upper level. | ||
29 | * | 28 | * |
30 | * We don't actually know what locking is used at the lower level; | 29 | * We don't actually know what locking is used at the lower level; |
31 | * but if it's a filesystem that supports quotas, it will be using | 30 | * but if it's a filesystem that supports quotas, it will be using |
@@ -44,9 +43,9 @@ void fsstack_copy_inode_size(struct inode *dst, struct inode *src) | |||
44 | * include/linux/fs.h). We don't necessarily hold i_mutex when this | 43 | * include/linux/fs.h). We don't necessarily hold i_mutex when this |
45 | * is called, so take i_lock for that case. | 44 | * is called, so take i_lock for that case. |
46 | * | 45 | * |
47 | * And if CONFIG_LBDAF (on 32-bit), continue our effort to keep the | 46 | * And if on 32-bit, continue our effort to keep the two halves of |
48 | * two halves of i_blocks in sync despite SMP or PREEMPT: use i_lock | 47 | * i_blocks in sync despite SMP or PREEMPT: use i_lock for that case |
49 | * for that case too, and do both at once by combining the tests. | 48 | * too, and do both at once by combining the tests. |
50 | * | 49 | * |
51 | * There is none of this locking overhead in the 64-bit case. | 50 | * There is none of this locking overhead in the 64-bit case. |
52 | */ | 51 | */ |
diff --git a/fs/xfs/Kconfig b/fs/xfs/Kconfig index 457ac9f97377..99af5e5bda9f 100644 --- a/fs/xfs/Kconfig +++ b/fs/xfs/Kconfig | |||
@@ -1,7 +1,6 @@ | |||
1 | config XFS_FS | 1 | config XFS_FS |
2 | tristate "XFS filesystem support" | 2 | tristate "XFS filesystem support" |
3 | depends on BLOCK | 3 | depends on BLOCK |
4 | depends on (64BIT || LBDAF) | ||
5 | select EXPORTFS | 4 | select EXPORTFS |
6 | select LIBCRC32C | 5 | select LIBCRC32C |
7 | select FS_IOMAP | 6 | select FS_IOMAP |
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index f093ea244849..703b6be063ef 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c | |||
@@ -539,26 +539,18 @@ xfs_max_file_offset( | |||
539 | 539 | ||
540 | /* Figure out maximum filesize, on Linux this can depend on | 540 | /* Figure out maximum filesize, on Linux this can depend on |
541 | * the filesystem blocksize (on 32 bit platforms). | 541 | * the filesystem blocksize (on 32 bit platforms). |
542 | * __block_write_begin does this in an [unsigned] long... | 542 | * __block_write_begin does this in an [unsigned] long long... |
543 | * page->index << (PAGE_SHIFT - bbits) | 543 | * page->index << (PAGE_SHIFT - bbits) |
544 | * So, for page sized blocks (4K on 32 bit platforms), | 544 | * So, for page sized blocks (4K on 32 bit platforms), |
545 | * this wraps at around 8Tb (hence MAX_LFS_FILESIZE which is | 545 | * this wraps at around 8Tb (hence MAX_LFS_FILESIZE which is |
546 | * (((u64)PAGE_SIZE << (BITS_PER_LONG-1))-1) | 546 | * (((u64)PAGE_SIZE << (BITS_PER_LONG-1))-1) |
547 | * but for smaller blocksizes it is less (bbits = log2 bsize). | 547 | * but for smaller blocksizes it is less (bbits = log2 bsize). |
548 | * Note1: get_block_t takes a long (implicit cast from above) | ||
549 | * Note2: The Large Block Device (LBD and HAVE_SECTOR_T) patch | ||
550 | * can optionally convert the [unsigned] long from above into | ||
551 | * an [unsigned] long long. | ||
552 | */ | 548 | */ |
553 | 549 | ||
554 | #if BITS_PER_LONG == 32 | 550 | #if BITS_PER_LONG == 32 |
555 | # if defined(CONFIG_LBDAF) | ||
556 | ASSERT(sizeof(sector_t) == 8); | 551 | ASSERT(sizeof(sector_t) == 8); |
557 | pagefactor = PAGE_SIZE; | 552 | pagefactor = PAGE_SIZE; |
558 | bitshift = BITS_PER_LONG; | 553 | bitshift = BITS_PER_LONG; |
559 | # else | ||
560 | pagefactor = PAGE_SIZE >> (PAGE_SHIFT - blockshift); | ||
561 | # endif | ||
562 | #endif | 554 | #endif |
563 | 555 | ||
564 | return (((uint64_t)pagefactor) << bitshift) - 1; | 556 | return (((uint64_t)pagefactor) << bitshift) - 1; |
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 06c0fd594097..98076b1b5e48 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h | |||
@@ -714,7 +714,7 @@ static inline void hd_free_part(struct hd_struct *part) | |||
714 | */ | 714 | */ |
715 | static inline sector_t part_nr_sects_read(struct hd_struct *part) | 715 | static inline sector_t part_nr_sects_read(struct hd_struct *part) |
716 | { | 716 | { |
717 | #if BITS_PER_LONG==32 && defined(CONFIG_LBDAF) && defined(CONFIG_SMP) | 717 | #if BITS_PER_LONG==32 && defined(CONFIG_SMP) |
718 | sector_t nr_sects; | 718 | sector_t nr_sects; |
719 | unsigned seq; | 719 | unsigned seq; |
720 | do { | 720 | do { |
@@ -722,7 +722,7 @@ static inline sector_t part_nr_sects_read(struct hd_struct *part) | |||
722 | nr_sects = part->nr_sects; | 722 | nr_sects = part->nr_sects; |
723 | } while (read_seqcount_retry(&part->nr_sects_seq, seq)); | 723 | } while (read_seqcount_retry(&part->nr_sects_seq, seq)); |
724 | return nr_sects; | 724 | return nr_sects; |
725 | #elif BITS_PER_LONG==32 && defined(CONFIG_LBDAF) && defined(CONFIG_PREEMPT) | 725 | #elif BITS_PER_LONG==32 && defined(CONFIG_PREEMPT) |
726 | sector_t nr_sects; | 726 | sector_t nr_sects; |
727 | 727 | ||
728 | preempt_disable(); | 728 | preempt_disable(); |
@@ -741,11 +741,11 @@ static inline sector_t part_nr_sects_read(struct hd_struct *part) | |||
741 | */ | 741 | */ |
742 | static inline void part_nr_sects_write(struct hd_struct *part, sector_t size) | 742 | static inline void part_nr_sects_write(struct hd_struct *part, sector_t size) |
743 | { | 743 | { |
744 | #if BITS_PER_LONG==32 && defined(CONFIG_LBDAF) && defined(CONFIG_SMP) | 744 | #if BITS_PER_LONG==32 && defined(CONFIG_SMP) |
745 | write_seqcount_begin(&part->nr_sects_seq); | 745 | write_seqcount_begin(&part->nr_sects_seq); |
746 | part->nr_sects = size; | 746 | part->nr_sects = size; |
747 | write_seqcount_end(&part->nr_sects_seq); | 747 | write_seqcount_end(&part->nr_sects_seq); |
748 | #elif BITS_PER_LONG==32 && defined(CONFIG_LBDAF) && defined(CONFIG_PREEMPT) | 748 | #elif BITS_PER_LONG==32 && defined(CONFIG_PREEMPT) |
749 | preempt_disable(); | 749 | preempt_disable(); |
750 | part->nr_sects = size; | 750 | part->nr_sects = size; |
751 | preempt_enable(); | 751 | preempt_enable(); |
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 34a5036debd3..24ef5a018a5e 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <asm/byteorder.h> | 17 | #include <asm/byteorder.h> |
18 | #include <asm/div64.h> | 18 | #include <asm/div64.h> |
19 | #include <uapi/linux/kernel.h> | 19 | #include <uapi/linux/kernel.h> |
20 | #include <asm/div64.h> | ||
20 | 21 | ||
21 | #define STACK_MAGIC 0xdeadbeef | 22 | #define STACK_MAGIC 0xdeadbeef |
22 | 23 | ||
@@ -175,18 +176,7 @@ | |||
175 | #define _RET_IP_ (unsigned long)__builtin_return_address(0) | 176 | #define _RET_IP_ (unsigned long)__builtin_return_address(0) |
176 | #define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; }) | 177 | #define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; }) |
177 | 178 | ||
178 | #ifdef CONFIG_LBDAF | 179 | #define sector_div(a, b) do_div(a, b) |
179 | # define sector_div(a, b) do_div(a, b) | ||
180 | #else | ||
181 | # define sector_div(n, b)( \ | ||
182 | { \ | ||
183 | int _res; \ | ||
184 | _res = (n) % (b); \ | ||
185 | (n) /= (b); \ | ||
186 | _res; \ | ||
187 | } \ | ||
188 | ) | ||
189 | #endif | ||
190 | 180 | ||
191 | /** | 181 | /** |
192 | * upper_32_bits - return bits 32-63 of a number | 182 | * upper_32_bits - return bits 32-63 of a number |
diff --git a/include/linux/types.h b/include/linux/types.h index cc0dbbe551d5..231114ae38f4 100644 --- a/include/linux/types.h +++ b/include/linux/types.h | |||
@@ -127,13 +127,8 @@ typedef s64 int64_t; | |||
127 | * | 127 | * |
128 | * blkcnt_t is the type of the inode's block count. | 128 | * blkcnt_t is the type of the inode's block count. |
129 | */ | 129 | */ |
130 | #ifdef CONFIG_LBDAF | ||
131 | typedef u64 sector_t; | 130 | typedef u64 sector_t; |
132 | typedef u64 blkcnt_t; | 131 | typedef u64 blkcnt_t; |
133 | #else | ||
134 | typedef unsigned long sector_t; | ||
135 | typedef unsigned long blkcnt_t; | ||
136 | #endif | ||
137 | 132 | ||
138 | /* | 133 | /* |
139 | * The type of an index into the pagecache. | 134 | * The type of an index into the pagecache. |
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 0d9e81779e37..d8781786cf63 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
@@ -1927,7 +1927,6 @@ config TEST_STATIC_KEYS | |||
1927 | config TEST_KMOD | 1927 | config TEST_KMOD |
1928 | tristate "kmod stress tester" | 1928 | tristate "kmod stress tester" |
1929 | depends on m | 1929 | depends on m |
1930 | depends on BLOCK && (64BIT || LBDAF) # for XFS, BTRFS | ||
1931 | depends on NETDEVICES && NET_CORE && INET # for TUN | 1930 | depends on NETDEVICES && NET_CORE && INET # for TUN |
1932 | select TEST_LKM | 1931 | select TEST_LKM |
1933 | select XFS_FS | 1932 | select XFS_FS |
diff --git a/tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/types.h b/tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/types.h index d27285f8ee82..8bc960e5e713 100644 --- a/tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/types.h +++ b/tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/types.h | |||
@@ -59,11 +59,7 @@ typedef __u32 uint32_t; | |||
59 | * | 59 | * |
60 | * blkcnt_t is the type of the inode's block count. | 60 | * blkcnt_t is the type of the inode's block count. |
61 | */ | 61 | */ |
62 | #ifdef CONFIG_LBDAF | ||
63 | typedef u64 sector_t; | 62 | typedef u64 sector_t; |
64 | #else | ||
65 | typedef unsigned long sector_t; | ||
66 | #endif | ||
67 | 63 | ||
68 | /* | 64 | /* |
69 | * The type of an index into the pagecache. | 65 | * The type of an index into the pagecache. |