From 68e7a2a0b7d8730933d3788806c3480c8f0d09de Mon Sep 17 00:00:00 2001 From: Sergey Ryazanov Date: Wed, 31 May 2017 00:46:40 +0300 Subject: [PATCH] kernel: disable CONFIG_SG_POOL by default CONFIG_SG_POOL symbol is selected only by CONFIG_SCSI, since the last one is disabled by default then disable CONFIG_SG_POOL by default too. And explicitly enable it only for platforms that use CONFIG_SCSI. Signed-off-by: Sergey Ryazanov --- target/linux/apm821xx/config-4.9 | 1 - target/linux/arc770/config-4.9 | 1 - target/linux/archs38/config-4.9 | 1 - target/linux/bcm53xx/config-4.9 | 1 - target/linux/brcm2708/bcm2708/config-4.9 | 1 + target/linux/brcm2708/bcm2709/config-4.9 | 1 + target/linux/brcm2708/bcm2710/config-4.9 | 1 + target/linux/cns3xxx/config-4.9 | 1 + target/linux/generic/config-4.9 | 2 +- target/linux/imx6/config-4.9 | 1 + target/linux/ipq806x/config-4.9 | 1 - target/linux/lantiq/config-4.9 | 1 - target/linux/mediatek/config-4.9 | 1 - target/linux/mpc85xx/config-4.9 | 1 - target/linux/mvebu/config-4.9 | 1 + target/linux/octeon/config-4.9 | 1 + target/linux/pistachio/config-4.9 | 1 + target/linux/ramips/mt7620/config-4.9 | 1 - target/linux/ramips/mt7621/config-4.9 | 1 - target/linux/ramips/mt7628/config-4.9 | 1 - target/linux/ramips/mt7688/config-4.9 | 1 - target/linux/ramips/rt288x/config-4.9 | 1 - target/linux/ramips/rt305x/config-4.9 | 1 - target/linux/ramips/rt3883/config-4.9 | 1 - target/linux/x86/config-4.9 | 1 + 25 files changed, 10 insertions(+), 16 deletions(-) diff --git a/target/linux/apm821xx/config-4.9 b/target/linux/apm821xx/config-4.9 index b31df63083..2446a7bdb9 100644 --- a/target/linux/apm821xx/config-4.9 +++ b/target/linux/apm821xx/config-4.9 @@ -301,7 +301,6 @@ CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_FSL=y CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_OF_PLATFORM=y -# CONFIG_SG_POOL is not set CONFIG_SIMPLE_GPIO=y CONFIG_SPARSE_IRQ=y CONFIG_SRCU=y diff --git a/target/linux/arc770/config-4.9 b/target/linux/arc770/config-4.9 index 2472ce28e4..fb5cd439e1 100644 --- a/target/linux/arc770/config-4.9 +++ b/target/linux/arc770/config-4.9 @@ -185,7 +185,6 @@ CONFIG_SERIAL_ARC=y CONFIG_SERIAL_ARC_CONSOLE=y CONFIG_SERIAL_ARC_NR_PORTS=1 CONFIG_SERIAL_OF_PLATFORM=y -# CONFIG_SG_POOL is not set CONFIG_SRCU=y CONFIG_STACKTRACE=y CONFIG_STMMAC_ETH=y diff --git a/target/linux/archs38/config-4.9 b/target/linux/archs38/config-4.9 index 311315e44c..997a3c2338 100644 --- a/target/linux/archs38/config-4.9 +++ b/target/linux/archs38/config-4.9 @@ -198,7 +198,6 @@ CONFIG_SERIAL_ARC=y CONFIG_SERIAL_ARC_CONSOLE=y CONFIG_SERIAL_ARC_NR_PORTS=1 CONFIG_SERIAL_OF_PLATFORM=y -# CONFIG_SG_POOL is not set CONFIG_SMP=y CONFIG_SRCU=y CONFIG_STACKTRACE=y diff --git a/target/linux/bcm53xx/config-4.9 b/target/linux/bcm53xx/config-4.9 index 3f6b7c32db..2859f03cad 100644 --- a/target/linux/bcm53xx/config-4.9 +++ b/target/linux/bcm53xx/config-4.9 @@ -293,7 +293,6 @@ CONFIG_SERIAL_8250_FSL=y # CONFIG_SERIAL_AMBA_PL010 is not set # CONFIG_SERIAL_AMBA_PL011 is not set CONFIG_SERIAL_OF_PLATFORM=y -# CONFIG_SG_POOL is not set CONFIG_SMP=y CONFIG_SMP_ON_UP=y CONFIG_SPARSE_IRQ=y diff --git a/target/linux/brcm2708/bcm2708/config-4.9 b/target/linux/brcm2708/bcm2708/config-4.9 index 7eb5a72bc9..b766b742b4 100644 --- a/target/linux/brcm2708/bcm2708/config-4.9 +++ b/target/linux/brcm2708/bcm2708/config-4.9 @@ -342,6 +342,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_SG_POOL=y CONFIG_SPARSE_IRQ=y # CONFIG_SQUASHFS is not set CONFIG_SRCU=y diff --git a/target/linux/brcm2708/bcm2709/config-4.9 b/target/linux/brcm2708/bcm2709/config-4.9 index 9ee233817c..26b2c6c8e5 100644 --- a/target/linux/brcm2708/bcm2709/config-4.9 +++ b/target/linux/brcm2708/bcm2709/config-4.9 @@ -370,6 +370,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_SG_POOL=y CONFIG_SMP=y CONFIG_SMP_ON_UP=y CONFIG_SPARSE_IRQ=y diff --git a/target/linux/brcm2708/bcm2710/config-4.9 b/target/linux/brcm2708/bcm2710/config-4.9 index f672c400ec..f2f27cf9af 100644 --- a/target/linux/brcm2708/bcm2710/config-4.9 +++ b/target/linux/brcm2708/bcm2710/config-4.9 @@ -388,6 +388,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_SG_POOL=y CONFIG_SMP=y CONFIG_SPARSEMEM=y CONFIG_SPARSEMEM_EXTREME=y diff --git a/target/linux/cns3xxx/config-4.9 b/target/linux/cns3xxx/config-4.9 index 2fec4f0f13..6c07465948 100644 --- a/target/linux/cns3xxx/config-4.9 +++ b/target/linux/cns3xxx/config-4.9 @@ -260,6 +260,7 @@ CONFIG_SENSORS_AD7418=y CONFIG_SERIAL_8250_FSL=y CONFIG_SERIAL_8250_NR_UARTS=3 CONFIG_SERIAL_8250_RUNTIME_UARTS=3 +CONFIG_SG_POOL=y CONFIG_SMP=y CONFIG_SMP_ON_UP=y CONFIG_SPARSE_IRQ=y diff --git a/target/linux/generic/config-4.9 b/target/linux/generic/config-4.9 index a979487367..f50f0f0e80 100644 --- a/target/linux/generic/config-4.9 +++ b/target/linux/generic/config-4.9 @@ -3967,7 +3967,7 @@ CONFIG_SERIAL_EARLYCON=y # CONFIG_SGI_IP28 is not set # CONFIG_SGI_IP32 is not set # CONFIG_SGI_PARTITION is not set -CONFIG_SG_POOL=y +# CONFIG_SG_POOL is not set # CONFIG_SG_SPLIT is not set CONFIG_SHMEM=y # CONFIG_SH_ETH is not set diff --git a/target/linux/imx6/config-4.9 b/target/linux/imx6/config-4.9 index 701bb53e4b..590e192041 100644 --- a/target/linux/imx6/config-4.9 +++ b/target/linux/imx6/config-4.9 @@ -425,6 +425,7 @@ CONFIG_SERIAL_8250_FSL=y CONFIG_SERIAL_IMX=y CONFIG_SERIAL_IMX_CONSOLE=y CONFIG_SERIAL_MCTRL_GPIO=y +CONFIG_SG_POOL=y CONFIG_SMP=y CONFIG_SMP_ON_UP=y CONFIG_SOC_BUS=y diff --git a/target/linux/ipq806x/config-4.9 b/target/linux/ipq806x/config-4.9 index 072ab6a897..7e6ec70488 100644 --- a/target/linux/ipq806x/config-4.9 +++ b/target/linux/ipq806x/config-4.9 @@ -447,7 +447,6 @@ CONFIG_SERIAL_8250_FSL=y # CONFIG_SERIAL_AMBA_PL011 is not set CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CONSOLE=y -# CONFIG_SG_POOL is not set CONFIG_SMP=y CONFIG_SMP_ON_UP=y CONFIG_SPARSE_IRQ=y diff --git a/target/linux/lantiq/config-4.9 b/target/linux/lantiq/config-4.9 index edfc1c10dc..52e58ab1f4 100644 --- a/target/linux/lantiq/config-4.9 +++ b/target/linux/lantiq/config-4.9 @@ -183,7 +183,6 @@ CONFIG_SCHED_HRTICK=y # CONFIG_SENSORS_LTQ_CPUTEMP is not set # CONFIG_SERIAL_8250 is not set CONFIG_SERIAL_LANTIQ=y -# CONFIG_SG_POOL is not set # CONFIG_SOC_AMAZON_SE is not set # CONFIG_SOC_FALCON is not set CONFIG_SOC_TYPE_XWAY=y diff --git a/target/linux/mediatek/config-4.9 b/target/linux/mediatek/config-4.9 index 9f5b200040..268154b45e 100644 --- a/target/linux/mediatek/config-4.9 +++ b/target/linux/mediatek/config-4.9 @@ -397,7 +397,6 @@ CONFIG_SERIAL_8250_FSL=y CONFIG_SERIAL_8250_MT6577=y CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -# CONFIG_SG_POOL is not set CONFIG_SMP=y # CONFIG_SMP_ON_UP is not set CONFIG_SPARSE_IRQ=y diff --git a/target/linux/mpc85xx/config-4.9 b/target/linux/mpc85xx/config-4.9 index 9bd8a5d6db..33b8a519a3 100644 --- a/target/linux/mpc85xx/config-4.9 +++ b/target/linux/mpc85xx/config-4.9 @@ -315,7 +315,6 @@ CONFIG_SERIAL_8250_FSL=y CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_OF_PLATFORM=y # CONFIG_SERIAL_QE is not set -# CONFIG_SG_POOL is not set CONFIG_SIMPLE_GPIO=y # CONFIG_SOCRATES is not set CONFIG_SPARSE_IRQ=y diff --git a/target/linux/mvebu/config-4.9 b/target/linux/mvebu/config-4.9 index a84a7b9baf..bc7e91eba8 100644 --- a/target/linux/mvebu/config-4.9 +++ b/target/linux/mvebu/config-4.9 @@ -397,6 +397,7 @@ CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_8250_FSL=y CONFIG_SERIAL_MVEBU_CONSOLE=y CONFIG_SERIAL_MVEBU_UART=y +CONFIG_SG_POOL=y CONFIG_SFP=y CONFIG_SMP=y CONFIG_SMP_ON_UP=y diff --git a/target/linux/octeon/config-4.9 b/target/linux/octeon/config-4.9 index 7e959f11b2..2802446692 100644 --- a/target/linux/octeon/config-4.9 +++ b/target/linux/octeon/config-4.9 @@ -245,6 +245,7 @@ CONFIG_SECCOMP=y CONFIG_SECCOMP_FILTER=y CONFIG_SERIAL_8250_DW=y # CONFIG_SERIAL_8250_FSL is not set +CONFIG_SG_POOL=y CONFIG_SMP=y CONFIG_SPARSEMEM=y CONFIG_SPARSEMEM_STATIC=y diff --git a/target/linux/pistachio/config-4.9 b/target/linux/pistachio/config-4.9 index 00af5875b2..0a882e4565 100644 --- a/target/linux/pistachio/config-4.9 +++ b/target/linux/pistachio/config-4.9 @@ -284,6 +284,7 @@ CONFIG_SCSI_SPI_ATTRS=y CONFIG_SERIAL_8250_DW=y # CONFIG_SERIAL_8250_FSL is not set CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_SG_POOL=y CONFIG_SMP=y CONFIG_SMP_UP=y CONFIG_SPI=y diff --git a/target/linux/ramips/mt7620/config-4.9 b/target/linux/ramips/mt7620/config-4.9 index 508f5487d9..2c1d1bc5a9 100644 --- a/target/linux/ramips/mt7620/config-4.9 +++ b/target/linux/ramips/mt7620/config-4.9 @@ -187,7 +187,6 @@ CONFIG_SCHED_HRTICK=y # CONFIG_SERIAL_8250_FSL is not set CONFIG_SERIAL_8250_RT288X=y CONFIG_SERIAL_OF_PLATFORM=y -# CONFIG_SG_POOL is not set CONFIG_SOC_MT7620=y # CONFIG_SOC_MT7621 is not set # CONFIG_SOC_RT288X is not set diff --git a/target/linux/ramips/mt7621/config-4.9 b/target/linux/ramips/mt7621/config-4.9 index 40477c98c5..6e954680b7 100644 --- a/target/linux/ramips/mt7621/config-4.9 +++ b/target/linux/ramips/mt7621/config-4.9 @@ -241,7 +241,6 @@ CONFIG_SCHED_SMT=y CONFIG_SERIAL_8250_NR_UARTS=3 CONFIG_SERIAL_8250_RUNTIME_UARTS=3 CONFIG_SERIAL_OF_PLATFORM=y -# CONFIG_SG_POOL is not set CONFIG_SMP=y CONFIG_SMP_UP=y # CONFIG_SOC_MT7620 is not set diff --git a/target/linux/ramips/mt7628/config-4.9 b/target/linux/ramips/mt7628/config-4.9 index 6f8e7f17d3..6f0962f40a 100644 --- a/target/linux/ramips/mt7628/config-4.9 +++ b/target/linux/ramips/mt7628/config-4.9 @@ -183,7 +183,6 @@ CONFIG_SCHED_HRTICK=y CONFIG_SERIAL_8250_NR_UARTS=3 CONFIG_SERIAL_8250_RUNTIME_UARTS=3 CONFIG_SERIAL_OF_PLATFORM=y -# CONFIG_SG_POOL is not set CONFIG_SOC_MT7620=y # CONFIG_SOC_MT7621 is not set # CONFIG_SOC_RT288X is not set diff --git a/target/linux/ramips/mt7688/config-4.9 b/target/linux/ramips/mt7688/config-4.9 index 5e1290b742..1e89b77da9 100644 --- a/target/linux/ramips/mt7688/config-4.9 +++ b/target/linux/ramips/mt7688/config-4.9 @@ -183,7 +183,6 @@ CONFIG_SCHED_HRTICK=y CONFIG_SERIAL_8250_NR_UARTS=3 CONFIG_SERIAL_8250_RUNTIME_UARTS=3 CONFIG_SERIAL_OF_PLATFORM=y -# CONFIG_SG_POOL is not set CONFIG_SOC_MT7620=y # CONFIG_SOC_MT7621 is not set # CONFIG_SOC_RT288X is not set diff --git a/target/linux/ramips/rt288x/config-4.9 b/target/linux/ramips/rt288x/config-4.9 index 5864009fe9..01f4f21e7c 100644 --- a/target/linux/ramips/rt288x/config-4.9 +++ b/target/linux/ramips/rt288x/config-4.9 @@ -175,7 +175,6 @@ CONFIG_SCHED_HRTICK=y # CONFIG_SERIAL_8250_FSL is not set CONFIG_SERIAL_8250_RT288X=y CONFIG_SERIAL_OF_PLATFORM=y -# CONFIG_SG_POOL is not set # CONFIG_SOC_MT7620 is not set # CONFIG_SOC_MT7621 is not set CONFIG_SOC_RT288X=y diff --git a/target/linux/ramips/rt305x/config-4.9 b/target/linux/ramips/rt305x/config-4.9 index feacc95aed..0009a58bdf 100644 --- a/target/linux/ramips/rt305x/config-4.9 +++ b/target/linux/ramips/rt305x/config-4.9 @@ -172,7 +172,6 @@ CONFIG_SCHED_HRTICK=y # CONFIG_SERIAL_8250_FSL is not set CONFIG_SERIAL_8250_RT288X=y CONFIG_SERIAL_OF_PLATFORM=y -# CONFIG_SG_POOL is not set # CONFIG_SOC_MT7620 is not set # CONFIG_SOC_MT7621 is not set # CONFIG_SOC_RT288X is not set diff --git a/target/linux/ramips/rt3883/config-4.9 b/target/linux/ramips/rt3883/config-4.9 index eb77d3421c..c632ea5517 100644 --- a/target/linux/ramips/rt3883/config-4.9 +++ b/target/linux/ramips/rt3883/config-4.9 @@ -180,7 +180,6 @@ CONFIG_SCHED_HRTICK=y # CONFIG_SERIAL_8250_FSL is not set CONFIG_SERIAL_8250_RT288X=y CONFIG_SERIAL_OF_PLATFORM=y -# CONFIG_SG_POOL is not set # CONFIG_SOC_MT7620 is not set # CONFIG_SOC_MT7621 is not set # CONFIG_SOC_RT288X is not set diff --git a/target/linux/x86/config-4.9 b/target/linux/x86/config-4.9 index a9de3d20ec..9747e536eb 100644 --- a/target/linux/x86/config-4.9 +++ b/target/linux/x86/config-4.9 @@ -386,6 +386,7 @@ CONFIG_SERIO=y CONFIG_SERIO_I8042=y CONFIG_SERIO_LIBPS2=y CONFIG_SERIO_SERPORT=y +CONFIG_SG_POOL=y # CONFIG_SMSC37B787_WDT is not set # CONFIG_SMSC_SCH311X_WDT is not set CONFIG_SPARSEMEM_STATIC=y