Skip to contentSkip to conversation

m68k: configs: Cleanup old Kconfig IO scheduler options

PATCH In review Krzysztof Kozlowski 2 participants 2 messages Jan 30, 2020 – Jan 31, 2020 m68k architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 m68k: configs: Cleanup old Kconfig IO scheduler options

CONFIG_IOSCHED_DEADLINE and CONFIG_IOSCHED_CFQ are gone since commit f382fb0bcef4 ("block: remove legacy IO schedulers").

The IOSCHED_DEADLINE was replaced by MQ_IOSCHED_DEADLINE and it will be now enabled by default (along with MQ_IOSCHED_KYBER).

---
 arch/m68k/configs/amcore_defconfig   | 1 -
 arch/m68k/configs/m5208evb_defconfig | 2 --
 arch/m68k/configs/m5249evb_defconfig | 2 --
 arch/m68k/configs/m5272c3_defconfig  | 2 --
 arch/m68k/configs/m5275evb_defconfig | 2 --
 arch/m68k/configs/m5307c3_defconfig  | 2 --
 arch/m68k/configs/m5407c3_defconfig  | 2 --
 arch/m68k/configs/m5475evb_defconfig | 2 --
 8 files changed, 15 deletions(-)
arch/m68k/configs/amcore_defconfig +0 -1
index d5e683dd885d..3a84f24d41c8 100644
@@ -13,7 +13,6 @@ CONFIG_EMBEDDED=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_CFQ is not set
 # CONFIG_MMU is not set
 CONFIG_M5307=y
 CONFIG_AMCORE=y
arch/m68k/configs/m5208evb_defconfig +0 -2
index a3102ff7e5ed..0ee3079f6ca9 100644
@@ -10,8 +10,6 @@ CONFIG_EXPERT=y
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 # CONFIG_MMU is not set
 # CONFIG_4KSTACKS is not set
 CONFIG_RAMBASE=0x40000000
arch/m68k/configs/m5249evb_defconfig +0 -2
index f7bb9ed3efa8..f84f68c04065 100644
@@ -10,8 +10,6 @@ CONFIG_EXPERT=y
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 # CONFIG_MMU is not set
 CONFIG_M5249=y
 CONFIG_M5249C3=y
arch/m68k/configs/m5272c3_defconfig +0 -2
index 1e679f6a400f..eca65020aae3 100644
@@ -10,8 +10,6 @@ CONFIG_EXPERT=y
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 # CONFIG_MMU is not set
 CONFIG_M5272=y
 CONFIG_M5272C3=y
arch/m68k/configs/m5275evb_defconfig +0 -2
index d2987b40423e..9402c7a3e9c7 100644
@@ -10,8 +10,6 @@ CONFIG_EXPERT=y
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 # CONFIG_MMU is not set
 CONFIG_M5275=y
 # CONFIG_4KSTACKS is not set
arch/m68k/configs/m5307c3_defconfig +0 -2
index 97a78c99eeee..bb8b0eb4bdfc 100644
@@ -10,8 +10,6 @@ CONFIG_EXPERT=y
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 # CONFIG_MMU is not set
 CONFIG_M5307=y
 CONFIG_M5307C3=y
arch/m68k/configs/m5407c3_defconfig +0 -2
index 766a97f39a3a..ce9ccf13c7c0 100644
@@ -11,8 +11,6 @@ CONFIG_EXPERT=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 # CONFIG_MMU is not set
 CONFIG_M5407=y
 CONFIG_M5407C3=y
arch/m68k/configs/m5475evb_defconfig +0 -2
index 579fd98afed6..93f7c7a07553 100644
@@ -11,8 +11,6 @@ CONFIG_LOG_BUF_SHIFT=14
 CONFIG_EMBEDDED=y
 CONFIG_MODULES=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_COLDFIRE=y
 # CONFIG_4KSTACKS is not set
 CONFIG_RAMBASE=0x0
Signature · 1 line
2.17.1
#1 lore raw

Hi Krzysztof,

Quoted 7 lines · Krzysztof Kozlowski

CONFIG_IOSCHED_DEADLINE and CONFIG_IOSCHED_CFQ are gone since commit f382fb0bcef4 ("block: remove legacy IO schedulers").

The IOSCHED_DEADLINE was replaced by MQ_IOSCHED_DEADLINE and it will be now enabled by default (along with MQ_IOSCHED_KYBER).

Thanks, I will apply to the m68knommu git tree (for-next branch).

Regards
Greg

Quoted 115 lines
---
  arch/m68k/configs/amcore_defconfig   | 1 -
  arch/m68k/configs/m5208evb_defconfig | 2 --
  arch/m68k/configs/m5249evb_defconfig | 2 --
  arch/m68k/configs/m5272c3_defconfig  | 2 --
  arch/m68k/configs/m5275evb_defconfig | 2 --
  arch/m68k/configs/m5307c3_defconfig  | 2 --
  arch/m68k/configs/m5407c3_defconfig  | 2 --
  arch/m68k/configs/m5475evb_defconfig | 2 --
  8 files changed, 15 deletions(-)
arch/m68k/configs/amcore_defconfig +0 -1
index d5e683dd885d..3a84f24d41c8 100644
@@ -13,7 +13,6 @@ CONFIG_EMBEDDED=y
  # CONFIG_SLUB_DEBUG is not set
  # CONFIG_COMPAT_BRK is not set
  # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_CFQ is not set
  # CONFIG_MMU is not set
  CONFIG_M5307=y
  CONFIG_AMCORE=y
arch/m68k/configs/m5208evb_defconfig +0 -2
index a3102ff7e5ed..0ee3079f6ca9 100644
@@ -10,8 +10,6 @@ CONFIG_EXPERT=y
  # CONFIG_VM_EVENT_COUNTERS is not set
  # CONFIG_COMPAT_BRK is not set
  # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
  # CONFIG_MMU is not set
  # CONFIG_4KSTACKS is not set
  CONFIG_RAMBASE=0x40000000
arch/m68k/configs/m5249evb_defconfig +0 -2
index f7bb9ed3efa8..f84f68c04065 100644
@@ -10,8 +10,6 @@ CONFIG_EXPERT=y
  # CONFIG_VM_EVENT_COUNTERS is not set
  # CONFIG_SLUB_DEBUG is not set
  # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
  # CONFIG_MMU is not set
  CONFIG_M5249=y
  CONFIG_M5249C3=y
arch/m68k/configs/m5272c3_defconfig +0 -2
index 1e679f6a400f..eca65020aae3 100644
@@ -10,8 +10,6 @@ CONFIG_EXPERT=y
  # CONFIG_VM_EVENT_COUNTERS is not set
  # CONFIG_SLUB_DEBUG is not set
  # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
  # CONFIG_MMU is not set
  CONFIG_M5272=y
  CONFIG_M5272C3=y
arch/m68k/configs/m5275evb_defconfig +0 -2
index d2987b40423e..9402c7a3e9c7 100644
@@ -10,8 +10,6 @@ CONFIG_EXPERT=y
  # CONFIG_VM_EVENT_COUNTERS is not set
  # CONFIG_SLUB_DEBUG is not set
  # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
  # CONFIG_MMU is not set
  CONFIG_M5275=y
  # CONFIG_4KSTACKS is not set
arch/m68k/configs/m5307c3_defconfig +0 -2
index 97a78c99eeee..bb8b0eb4bdfc 100644
@@ -10,8 +10,6 @@ CONFIG_EXPERT=y
  # CONFIG_VM_EVENT_COUNTERS is not set
  # CONFIG_SLUB_DEBUG is not set
  # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
  # CONFIG_MMU is not set
  CONFIG_M5307=y
  CONFIG_M5307C3=y
arch/m68k/configs/m5407c3_defconfig +0 -2
index 766a97f39a3a..ce9ccf13c7c0 100644
@@ -11,8 +11,6 @@ CONFIG_EXPERT=y
  CONFIG_MODULES=y
  CONFIG_MODULE_UNLOAD=y
  # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
  # CONFIG_MMU is not set
  CONFIG_M5407=y
  CONFIG_M5407C3=y
arch/m68k/configs/m5475evb_defconfig +0 -2
index 579fd98afed6..93f7c7a07553 100644
@@ -11,8 +11,6 @@ CONFIG_LOG_BUF_SHIFT=14
  CONFIG_EMBEDDED=y
  CONFIG_MODULES=y
  # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
  CONFIG_COLDFIRE=y
  # CONFIG_4KSTACKS is not set
  CONFIG_RAMBASE=0x0