commit 7543edb34e1fd91a21be649f9206c70e5a14fb99 Author: Arkadiusz MiĆkiewicz <ar...@maven.pl> Date: Mon Jul 8 09:29:23 2019 +0200
- configs/patches updated for 5.2.0 kernel-multiarch.config | 341 ++++++++++++++++++++++++++------------ kernel-pom-ng-IPV4OPTSSTRIP.patch | 12 +- kernel-small_fixes.patch | 321 +++++++++++++++++------------------ kernel.spec | 8 +- 4 files changed, 407 insertions(+), 275 deletions(-) --- diff --git a/kernel.spec b/kernel.spec index cc090e85..b8e3abf0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,9 +67,9 @@ %define have_pcmcia 0 %endif -%define rel 1 -%define basever 5.1 -%define postver .15 +%define rel 0.1 +%define basever 5.2 +%define postver .0 # define this to '-%{basever}' for longterm branch %define versuffix %{nil} @@ -120,7 +120,7 @@ Epoch: 3 License: GPL v2 Group: Base/Kernel Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz -# Source0-md5: 15fbdff95ff98483069ac6e215b9f4f9 +# Source0-md5: ddf994de00d7b18395886dd9b30b9262 %if "%{postver}" != ".0" Patch0: https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz # Patch0-md5: aed4686410e23561f67f5c512d0a6245 diff --git a/kernel-multiarch.config b/kernel-multiarch.config index 1f02f15c..350a3bbf 100644 --- a/kernel-multiarch.config +++ b/kernel-multiarch.config @@ -18,6 +18,8 @@ KEXEC_FILE all=y KEXEC_VERIFY_SIG all=n KVM_AMD_SEV all=y KVM_DEBUG_FS all=n +LOCK_EVENT_COUNTS all=n +MICROCODE_OLD_INTERFACE all=n PERF_EVENTS_AMD_POWER all=m PERF_EVENTS_INTEL_CSTATE all=m PERF_EVENTS_INTEL_RAPL all=m @@ -48,7 +50,6 @@ XEN_PVHVM all=y #- *** FILE: block/Kconfig *** #- BLOCK all=y -LBDAF i386=y ppc=y sparc=y sparc64= BLK_DEV_BSG all=y BLK_DEV_BSGLIB all=y BLK_DEV_INTEGRITY all=y @@ -126,9 +127,6 @@ CRYPTO_AEAD all=m CRYPTO_BLKCIPHER all=y CRYPTO_HASH all=y CRYPTO_AKCIPHER all=y -CRYPTO_RSA all=y -CRYPTO_DH all=y -CRYPTO_ECDH all=m CRYPTO_MANAGER all=y CRYPTO_USER all=m CRYPTO_MANAGER_DISABLE_TESTS all=y @@ -138,6 +136,11 @@ CRYPTO_PCRYPT all=m CRYPTO_CRYPTD all=m CRYPTO_AUTHENC all=m CRYPTO_TEST all=m +#- Public-key cryptography +CRYPTO_RSA all=y +CRYPTO_DH all=y +CRYPTO_ECDH all=m +CRYPTO_ECRDSA all=m #- Authenticated Encryption with Associated Data CRYPTO_CCM all=m CRYPTO_GCM all=m @@ -316,6 +319,7 @@ ACPI_SBS x86=m ACPI_CUSTOM_METHOD all=m ACPI_BGRT all=y #- file drivers/acpi/nfit/Kconfig goes here +#- file drivers/acpi/hmat/Kconfig goes here #- file drivers/acpi/apei/Kconfig goes here #- file drivers/acpi/dptf/Kconfig goes here ACPI_EXTLOG all=m @@ -342,6 +346,11 @@ ACPI_APEI_ERST_DEBUG all=m #- DPTF_POWER all=m +#- +#- *** FILE: drivers/acpi/hmat/Kconfig *** +#- +ACPI_HMAT all=y + #- #- *** FILE: drivers/acpi/nfit/Kconfig *** #- @@ -668,6 +677,7 @@ BT_MRVL all=m BT_MRVL_SDIO all=m BT_ATH3K all=m BT_WILINK all=m +BT_MTKSDIO all=m BT_MTKUART all=m #- @@ -824,6 +834,7 @@ COMMON_CLK_CS2000_CP all=m COMMON_CLK_PWM all=m COMMON_CLK_OXNAS all=n #- file drivers/clk/actions/Kconfig goes here +#- file drivers/clk/analogbits/Kconfig goes here #- file drivers/clk/bcm/Kconfig goes here #- file drivers/clk/hisilicon/Kconfig goes here #- file drivers/clk/imgtec/Kconfig goes here @@ -836,7 +847,9 @@ COMMON_CLK_OXNAS all=n #- file drivers/clk/qcom/Kconfig goes here #- file drivers/clk/renesas/Kconfig goes here #- file drivers/clk/samsung/Kconfig goes here +#- file drivers/clk/sifive/Kconfig goes here #- file drivers/clk/sprd/Kconfig goes here +#- file drivers/clk/sunxi/Kconfig goes here #- file drivers/clk/sunxi-ng/Kconfig goes here #- file drivers/clk/tegra/Kconfig goes here #- file drivers/clk/ti/Kconfig goes here @@ -866,6 +879,12 @@ SUN8I_H3_CCU all=y CONNECTOR all=y PROC_EVENTS all=y +#- +#- *** FILE: drivers/counter/Kconfig *** +#- +COUNTER all=m +104_QUAD_8 all=m + #- #- *** FILE: drivers/cpufreq/Kconfig *** #- @@ -1129,6 +1148,7 @@ ISCSI_IBFT_FIND all=y ISCSI_IBFT all=m FW_CFG_SYSFS all=m FW_CFG_SYSFS_CMDLINE all=y +#- file drivers/firmware/psci/Kconfig goes here #- file drivers/firmware/broadcom/Kconfig goes here #- file drivers/firmware/google/Kconfig goes here #- file drivers/firmware/efi/Kconfig goes here @@ -1225,7 +1245,6 @@ GPIO_ICH all=m GPIO_LYNXPOINT all=y GPIO_MB86S7X all=m GPIO_MENZ127 all=m -GPIO_MOCKUP all=m GPIO_SIOX all=m GPIO_STA2X11 all=y GPIO_VX855 all=m @@ -1286,6 +1305,7 @@ GPIO_MC33880 all=m GPIO_PISOSR all=m GPIO_XRA1403 all=m GPIO_VIPERBOARD all=m +GPIO_MOCKUP all=m #- #- *** FILE: drivers/gpu/drm/Kconfig *** @@ -1303,7 +1323,6 @@ DRM_RADEON all=m #- file drivers/gpu/drm/radeon/Kconfig goes here DRM_AMDGPU all=m #- file drivers/gpu/drm/amd/amdgpu/Kconfig goes here -#- file drivers/gpu/drm/amd/lib/Kconfig goes here #- file drivers/gpu/drm/nouveau/Kconfig goes here #- file drivers/gpu/drm/i915/Kconfig goes here DRM_VGEM all=m @@ -1347,6 +1366,10 @@ DRM_VKMS all=m #- file drivers/gpu/drm/pl111/Kconfig goes here #- file drivers/gpu/drm/tve200/Kconfig goes here #- file drivers/gpu/drm/xen/Kconfig goes here +#- file drivers/gpu/drm/vboxvideo/Kconfig goes here +#- file drivers/gpu/drm/lima/Kconfig goes here +#- file drivers/gpu/drm/panfrost/Kconfig goes here +#- file drivers/gpu/drm/aspeed/Kconfig goes here DRM_LEGACY all=n DRM_TDFX all=m DRM_R128 all=m @@ -1384,12 +1407,6 @@ DRM_AMD_DC all=y DRM_AMD_DC_DCN1_0 all=y DEBUG_KERNEL_DC all=n -#- -#- *** FILE: drivers/gpu/drm/amd/lib/Kconfig *** -#- -CHASH_STATS all=n -CHASH_SELFTEST all=n - #- #- *** FILE: drivers/gpu/drm/ast/Kconfig *** #- @@ -1465,12 +1482,12 @@ DRM_MGAG200 all=m #- *** FILE: drivers/gpu/drm/nouveau/Kconfig *** #- DRM_NOUVEAU all=m +NOUVEAU_LEGACY_CTX_SUPPORT all=y NOUVEAU_DEBUG all=5 NOUVEAU_DEBUG_DEFAULT all=3 NOUVEAU_DEBUG_MMU all=n DRM_NOUVEAU_BACKLIGHT all=y DRM_NOUVEAU_SVM all=y -NOUVEAU_LEGACY_CTX_SUPPORT all=y #- #- *** FILE: drivers/gpu/drm/panel/Kconfig *** @@ -1504,6 +1521,11 @@ TINYDRM_ST7735R all=m #- DRM_UDL all=m +#- +#- *** FILE: drivers/gpu/drm/vboxvideo/Kconfig *** +#- +DRM_VBOXVIDEO all=m + #- #- *** FILE: drivers/gpu/drm/virtio/Kconfig *** #- @@ -1551,6 +1573,7 @@ HID_CHERRY all=m HID_CHICONY all=m HID_CORSAIR all=m HID_COUGAR all=m +HID_MACALLY all=m HID_PRODIKEYS all=m HID_CMEDIA all=m HID_CP2112 all=m @@ -1631,6 +1654,7 @@ HID_THINGM all=m HID_THRUSTMASTER all=m THRUSTMASTER_FF all=y HID_UDRAW_PS3 all=m +HID_U2FZERO all=m HID_WACOM all=m HID_WIIMOTE all=m HID_XINMO all=m @@ -1653,6 +1677,7 @@ I2C_HID all=m #- *** FILE: drivers/hid/intel-ish-hid/Kconfig *** #- INTEL_ISH_HID all=m +INTEL_ISH_FIRMWARE_DOWNLOADER all=m #- #- *** FILE: drivers/hid/usbhid/Kconfig *** @@ -1861,6 +1886,8 @@ SENSORS_PMBUS all=m SENSORS_ADM1275 all=m SENSORS_IBM_CFFPS all=m SENSORS_IR35221 all=m +SENSORS_IR38064 all=m +SENSORS_ISL68137 all=m SENSORS_LM25066 all=m SENSORS_LTC2978 all=m SENSORS_LTC2978_REGULATOR all=y @@ -1941,6 +1968,7 @@ I2C_ALI15X3 all=m I2C_AMD756 all=m sparc=n I2C_AMD756_S4882 all=m sparc= I2C_AMD8111 all=m +I2C_AMD_MP2 all=m I2C_I801 all=m I2C_ISCH all=m I2C_ISMT all=m @@ -2109,7 +2137,6 @@ IIO_SW_TRIGGER all=m #- file drivers/iio/amplifiers/Kconfig goes here #- file drivers/iio/chemical/Kconfig goes here #- file drivers/iio/common/Kconfig goes here -#- file drivers/iio/counter/Kconfig goes here #- file drivers/iio/dac/Kconfig goes here #- file drivers/iio/dummy/Kconfig goes here #- file drivers/iio/frequency/Kconfig goes here @@ -2176,6 +2203,7 @@ AD7606_IFACE_PARALLEL all=m AD7606_IFACE_SPI all=m AD7766 all=m AD7768_1 all=m +AD7780 all=m AD7791 all=m AD7793 all=m AD7887 all=m @@ -2256,11 +2284,6 @@ IIO_CROS_EC_SENSORS all=m IIO_SSP_SENSORS_COMMONS all=m IIO_SSP_SENSORHUB all=m -#- -#- *** FILE: drivers/iio/counter/Kconfig *** -#- -104_QUAD_8 all=m - #- #- *** FILE: drivers/iio/dac/Kconfig *** #- @@ -2319,6 +2342,7 @@ ADIS16136 all=m ADIS16260 all=m ADXRS450 all=m BMG160 all=m +FXAS21002C all=m HID_SENSOR_GYRO_3D all=m MPU3050_I2C all=m IIO_ST_GYRO_3AXIS all=m @@ -2490,6 +2514,7 @@ ZPA2326 all=m AS3935 all=m ISL29501 all=m LIDAR_LITE_V2 all=m +MB1232 all=m RFD77402 all=m SRF04 all=m SX9500 all=m @@ -2513,6 +2538,7 @@ TMP006 all=m TMP007 all=m TSYS01 all=m TSYS02D all=m +MAX31856 all=m #- #- *** FILE: drivers/iio/trigger/Kconfig *** @@ -2536,6 +2562,7 @@ INFINIBAND_ADDR_TRANS all=y sparc= #- file drivers/infiniband/hw/qib/Kconfig goes here #- file drivers/infiniband/hw/cxgb3/Kconfig goes here #- file drivers/infiniband/hw/cxgb4/Kconfig goes here +#- file drivers/infiniband/hw/efa/Kconfig goes here #- file drivers/infiniband/hw/i40iw/Kconfig goes here #- file drivers/infiniband/hw/mlx4/Kconfig goes here #- file drivers/infiniband/hw/mlx5/Kconfig goes here @@ -2571,6 +2598,11 @@ INFINIBAND_CXGB3 all=m sparc= #- INFINIBAND_CXGB4 all=m +#- +#- *** FILE: drivers/infiniband/hw/efa/Kconfig *** +#- +INFINIBAND_EFA all=m + #- #- *** FILE: drivers/infiniband/hw/hfi1/Kconfig *** #- @@ -2761,6 +2793,7 @@ KEYBOARD_ADC all=m KEYBOARD_ADP5588 all=m KEYBOARD_ADP5589 all=m KEYBOARD_ATKBD all=y sparc=m sparc64=m +KEYBOARD_QT1050 all=m KEYBOARD_QT1070 all=m KEYBOARD_QT2160 all=m KEYBOARD_DLINK_DIR685 all=m @@ -2811,6 +2844,7 @@ INPUT_APANEL all=m INPUT_GP2A all=m INPUT_GPIO_BEEPER all=m INPUT_GPIO_DECODER all=m +INPUT_GPIO_VIBRA all=m INPUT_WISTRON_BTNS i386=m INPUT_ATLAS_BTNS i386=m x86_64=m INPUT_ATI_REMOTE2 all=m sparc=n @@ -3029,6 +3063,7 @@ TOUCHSCREEN_TPS6507X all=m TOUCHSCREEN_ZET6223 all=m TOUCHSCREEN_ZFORCE all=m TOUCHSCREEN_ROHM_BU21023 all=m +TOUCHSCREEN_IQS5XX all=m #- #- *** FILE: drivers/interconnect/Kconfig *** @@ -3180,6 +3215,7 @@ LEDS_BRIGHTNESS_HW_CHANGED all=y LEDS_APU all=m LEDS_AS3645A all=m LEDS_LM3530 all=m +LEDS_LM3532 all=m LEDS_LM3533 all=m LEDS_LM3642 all=m LEDS_LM3601X all=m @@ -3329,6 +3365,7 @@ DM_MULTIPATH all=m DM_MULTIPATH_QL all=m DM_MULTIPATH_ST all=m DM_DELAY all=m +DM_DUST all=m DM_UEVENT all=y DM_FLAKEY all=m DM_VERITY all=m @@ -3548,6 +3585,7 @@ VIDEO_NOON010PC30 all=m #- file drivers/media/i2c/m5mols/Kconfig goes here #- file drivers/media/i2c/smiapp/Kconfig goes here #- file drivers/media/i2c/et8ek8/Kconfig goes here +#- Lens drivers #- Flash devices #- Video improvement chips VIDEO_UPD64031A all=m @@ -4536,6 +4574,11 @@ SENSORS_LIS3_I2C all=m INTEL_MEI all=m INTEL_MEI_ME all=m INTEL_MEI_TXE all=m +#- file drivers/misc/mei/hdcp/Kconfig goes here + +#- +#- *** FILE: drivers/misc/mei/hdcp/Kconfig *** +#- INTEL_MEI_HDCP all=m #- @@ -4743,28 +4786,30 @@ MTD_ONENAND_2X_PROGRAM all=y #- #- *** FILE: drivers/mtd/nand/raw/Kconfig *** #- -MTD_NAND_ECC_SMC all=y -MTD_NAND all=m -MTD_NAND_BCH all=m -MTD_NAND_ECC_BCH all=y +MTD_NAND_ECC_SW_HAMMING_SMC all=y +MTD_RAW_NAND all=m +MTD_NAND_ECC_SW_BCH all=y +#- Raw/parallel NAND flash controllers MTD_NAND_DENALI all=m MTD_NAND_DENALI_PCI all=m MTD_NAND_DENALI_DT all=m -MTD_NAND_GPIO all=m -MTD_NAND_RICOH all=m -MTD_NAND_DISKONCHIP all=m -MTD_NAND_DISKONCHIP_PROBE_ADVANCED all=n -MTD_NAND_DISKONCHIP_PROBE_ADDRESS all=0 -MTD_NAND_DISKONCHIP_BBTWRITE all=y MTD_NAND_CAFE all=m ppc=n ppc64=n sparc=n MTD_NAND_CS553X i386=m MTD_NAND_PASEMI ppc64=m -MTD_NAND_NANDSIM all=m ppc=n ppc64=n sparc=n -MTD_NAND_PLATFORM all=m sparc=n MTD_NAND_OXNAS all=m MTD_NAND_FSL_ELBC ppc=m ppc64=m +#- file drivers/mtd/nand/raw/ingenic/Kconfig goes here MTD_NAND_HISI504 all=m MTD_NAND_MTK all=m +MTD_NAND_GPIO all=m +MTD_NAND_PLATFORM all=m sparc=n +#- Misc +MTD_NAND_NANDSIM all=m ppc=n ppc64=n sparc=n +MTD_NAND_RICOH all=m +MTD_NAND_DISKONCHIP all=m +MTD_NAND_DISKONCHIP_PROBE_ADVANCED all=n +MTD_NAND_DISKONCHIP_PROBE_ADDRESS all=0 +MTD_NAND_DISKONCHIP_BBTWRITE all=y #- #- *** FILE: drivers/mtd/nand/spi/Kconfig *** @@ -5000,6 +5045,7 @@ NET_DSA_MT7530 all=m NET_DSA_MV88E6060 all=m #- file drivers/net/dsa/microchip/Kconfig goes here #- file drivers/net/dsa/mv88e6xxx/Kconfig goes here +#- file drivers/net/dsa/sja1105/Kconfig goes here NET_DSA_QCA8K all=m NET_DSA_REALTEK_SMI all=m NET_DSA_SMSC_LAN9303_I2C all=m @@ -5028,6 +5074,11 @@ NET_DSA_MV88E6XXX all=m NET_DSA_MV88E6XXX_GLOBAL2 all=y NET_DSA_MV88E6XXX_PTP all=y +#- +#- *** FILE: drivers/net/dsa/sja1105/Kconfig *** +#- +NET_DSA_SJA1105 all=m + #- #- *** FILE: drivers/net/ethernet/3com/Kconfig *** #- @@ -5747,7 +5798,6 @@ TEHUTI all=m #- NET_VENDOR_TI all=y TI_CPSW_PHY_SEL all=n -TI_CPSW_ALE all=m TLAN all=m sparc=n #- @@ -5779,7 +5829,9 @@ WIZNET_W5100_SPI all=m #- #- *** FILE: drivers/net/ethernet/xilinx/Kconfig *** #- +NET_VENDOR_XILINX all=y XILINX_EMACLITE powerpc=m +XILINX_LL_TEMAC all=m #- #- *** FILE: drivers/net/ethernet/xircom/Kconfig *** @@ -5855,7 +5907,7 @@ LED_TRIGGER_PHY all=y SFP all=m AMD_PHY all=m AQUANTIA_PHY all=m -ASIX_PHY all=m +AX88796B_PHY all=m AT803X_PHY all=m BCM63XX_PHY all=m BCM7XXX_PHY all=m @@ -6327,6 +6379,11 @@ WLAN_VENDOR_MEDIATEK all=y #- MT7603E all=m +#- +#- *** FILE: drivers/net/wireless/mediatek/mt76/mt7615/Kconfig *** +#- +MT7615E all=m + #- #- *** FILE: drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig *** #- @@ -6391,6 +6448,7 @@ WLAN_VENDOR_REALTEK all=y #- file drivers/net/wireless/realtek/rtl818x/Kconfig goes here #- file drivers/net/wireless/realtek/rtlwifi/Kconfig goes here #- file drivers/net/wireless/realtek/rtl8xxxu/Kconfig goes here +#- file drivers/net/wireless/realtek/rtw88/Kconfig goes here #- #- *** FILE: drivers/net/wireless/realtek/rtl818x/Kconfig *** @@ -6421,6 +6479,13 @@ RTLWIFI all=m RTLWIFI_DEBUG all=n RTL8192C_COMMON all=m +#- +#- *** FILE: drivers/net/wireless/realtek/rtw88/Kconfig *** +#- +RTW88 all=m +RTW88_8822BE all=n +RTW88_8822CE all=n + #- #- *** FILE: drivers/net/wireless/rsi/Kconfig *** #- @@ -6641,6 +6706,7 @@ NVME_TARGET_TCP all=m #- *** FILE: drivers/nvmem/Kconfig *** #- NVMEM all=y +NVMEM_SYSFS all=y RAVE_SP_EEPROM all=m #- @@ -6893,6 +6959,7 @@ CROS_KBD_LED_BACKLIGHT all=m CROS_EC_LIGHTBAR all=m CROS_EC_DEBUGFS all=m CROS_EC_SYSFS all=m +CROS_USBPD_LOGGER all=m #- file drivers/platform/chrome/wilco_ec/Kconfig goes here #- @@ -7086,7 +7153,7 @@ CHARGER_MAX8903 all=m CHARGER_LP8727 all=m CHARGER_GPIO all=m CHARGER_MANAGER all=y -CHARGER_LTC3651 all=m +CHARGER_LT3651 all=m CHARGER_MAX14577 all=m CHARGER_MAX77693 all=m CHARGER_BQ2415X all=m @@ -7694,6 +7761,12 @@ SLIM_QCOM_CTRL all=m #- SGI_IOC3 ia64=m +#- +#- *** FILE: drivers/soc/ixp4xx/Kconfig *** +#- +IXP4XX_QMGR all=m +IXP4XX_NPE all=m + #- #- *** FILE: drivers/soc/ti/Kconfig *** #- @@ -7783,7 +7856,6 @@ STAGING all=y #- file drivers/staging/rtl8723bs/Kconfig goes here #- file drivers/staging/rtl8712/Kconfig goes here #- file drivers/staging/rtl8188eu/Kconfig goes here -#- file drivers/staging/rtlwifi/Kconfig goes here #- file drivers/staging/rts5208/Kconfig goes here #- file drivers/staging/octeon/Kconfig goes here #- file drivers/staging/octeon-usb/Kconfig goes here @@ -7811,19 +7883,18 @@ STAGING all=y #- file drivers/staging/ks7010/Kconfig goes here #- file drivers/staging/greybus/Kconfig goes here #- file drivers/staging/vc04_services/Kconfig goes here -#- file drivers/staging/vboxvideo/Kconfig goes here #- file drivers/staging/pi433/Kconfig goes here #- file drivers/staging/mt7621-pci/Kconfig goes here #- file drivers/staging/mt7621-pci-phy/Kconfig goes here #- file drivers/staging/mt7621-pinctrl/Kconfig goes here -#- file drivers/staging/mt7621-spi/Kconfig goes here #- file drivers/staging/mt7621-dma/Kconfig goes here #- file drivers/staging/ralink-gdma/Kconfig goes here -#- file drivers/staging/mt7621-mmc/Kconfig goes here #- file drivers/staging/mt7621-dts/Kconfig goes here #- file drivers/staging/gasket/Kconfig goes here #- file drivers/staging/axis-fifo/Kconfig goes here #- file drivers/staging/erofs/Kconfig goes here +#- file drivers/staging/fieldbus/Kconfig goes here +#- file drivers/staging/kpc2000/Kconfig goes here #- #- *** FILE: drivers/staging/axis-fifo/Kconfig *** @@ -8015,6 +8086,12 @@ FB_TFT_WATTEROTT all=m FB_FLEX all=m FB_TFT_FBTFT_DEVICE all=m +#- +#- *** FILE: drivers/staging/fieldbus/Kconfig *** +#- +FIELDBUS_DEV all=m +#- file drivers/staging/fieldbus/anybuss/Kconfig goes here + #- #- *** FILE: drivers/staging/fwserial/Kconfig *** #- @@ -8076,7 +8153,6 @@ ADIS16240 all=m #- #- *** FILE: drivers/staging/iio/adc/Kconfig *** #- -AD7780 all=m AD7816 all=m AD7192 all=m AD7280 all=m @@ -8117,6 +8193,11 @@ ADE7854_SPI all=m #- AD2S1210 all=m +#- +#- *** FILE: drivers/staging/kpc2000/Kconfig *** +#- +KPC2000 all=n + #- #- *** FILE: drivers/staging/ks7010/Kconfig *** #- @@ -8133,7 +8214,6 @@ STAGING_MEDIA all=y #- file drivers/staging/media/rockchip/vpu/Kconfig goes here #- file drivers/staging/media/sunxi/Kconfig goes here #- file drivers/staging/media/tegra-vde/Kconfig goes here -#- file drivers/staging/media/zoran/Kconfig goes here #- file drivers/staging/media/ipu3/Kconfig goes here #- file drivers/staging/media/soc_camera/Kconfig goes here @@ -8147,11 +8227,6 @@ I2C_BCM2048 all=m #- VIDEO_IPU3_IMGU all=m -#- -#- *** FILE: drivers/staging/media/mt9t031/Kconfig *** -#- -SOC_CAMERA_MT9T031 all=m - #- #- *** FILE: drivers/staging/media/soc_camera/Kconfig *** #- @@ -8162,18 +8237,7 @@ SOC_CAMERA_MT9V022 all=m SOC_CAMERA_OV5642 all=m SOC_CAMERA_OV9740 all=m SOC_CAMERA_IMX074 all=m - -#- -#- *** FILE: drivers/staging/media/zoran/Kconfig *** -#- -VIDEO_ZORAN all=m ppc=n sparc=n -VIDEO_ZORAN_DC30 all=m -VIDEO_ZORAN_ZR36060 all=m -VIDEO_ZORAN_BUZ all=m -VIDEO_ZORAN_DC10 all=m -VIDEO_ZORAN_LML33 all=m -VIDEO_ZORAN_LML33R10 all=m -VIDEO_ZORAN_AVS6EYES all=m +SOC_CAMERA_MT9T031 all=m #- #- *** FILE: drivers/staging/most/Kconfig *** @@ -8222,13 +8286,6 @@ MOST_USB all=m #- MOST_VIDEO all=m -#- -#- *** FILE: drivers/staging/mt7621-mmc/Kconfig *** -#- -MTK_MMC all=m -MTK_AEE_KDUMP all=y -MTK_MMC_CD_POLL all=y - #- #- *** FILE: drivers/staging/pi433/Kconfig *** #- @@ -8269,11 +8326,6 @@ R8712U all=m #- RTL8723BS all=m -#- -#- *** FILE: drivers/staging/rtlwifi/Kconfig *** -#- -R8822BE all=m - #- #- *** FILE: drivers/staging/rts5208/Kconfig *** #- @@ -8327,11 +8379,6 @@ UNISYS_VISORINPUT all=m #- UNISYS_VISORNIC all=m -#- -#- *** FILE: drivers/staging/vboxvideo/Kconfig *** -#- -DRM_VBOXVIDEO all=m - #- #- *** FILE: drivers/staging/vme/devices/Kconfig *** #- @@ -8475,6 +8522,7 @@ N_HDLC all=m N_GSM all=m TRACE_ROUTER all=m TRACE_SINK all=m +NULL_TTY all=m GOLDFISH_TTY all=m LDISC_AUTOLOAD all=y @@ -9015,6 +9063,7 @@ TYPEC_TPS6598X all=m #- *** FILE: drivers/usb/typec/altmodes/Kconfig *** #- TYPEC_DP_ALTMODE all=m +TYPEC_NVIDIA_ALTMODE all=m #- #- *** FILE: drivers/usb/typec/mux/Kconfig *** @@ -9111,7 +9160,6 @@ VGASTATE all=m #- #- *** FILE: drivers/video/backlight/Kconfig *** #- -BACKLIGHT_LCD_SUPPORT all=y LCD_CLASS_DEVICE all=m LCD_L4F00242T03 all=m LCD_LMS283GF05 all=m @@ -9410,6 +9458,12 @@ WATCHDOG_CORE all=y WATCHDOG_NOWAYOUT all=n WATCHDOG_HANDLE_BOOT_ENABLED all=y WATCHDOG_SYSFS all=y +#- Watchdog Pretimeout Governors +WATCHDOG_PRETIMEOUT_GOV all=y +WATCHDOG_PRETIMEOUT_GOV_NOOP all=m +WATCHDOG_PRETIMEOUT_GOV_PANIC all=y +WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP all=n +WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC all=y #- Watchdog Device Drivers SOFT_WATCHDOG all=m SOFT_WATCHDOG_PRETIMEOUT all=y @@ -9452,8 +9506,8 @@ ITCO_VENDOR_SUPPORT all=y IT8712F_WDT all=m IT87_WDT all=m HP_WATCHDOG all=m -KEMPLD_WDT all=m HPWDT_NMI_DECODING all=y +KEMPLD_WDT all=m SC1200_WDT i386=m x86_64=m SCx200_WDT i386=m PC87413_WDT i386=m x86_64=m @@ -9490,11 +9544,6 @@ PCIPCWATCHDOG all=m WDTPCI all=m #- USB-based Watchdog Cards USBPCWATCHDOG all=m -#- Watchdog Pretimeout Governors -WATCHDOG_PRETIMEOUT_GOV all=y -WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP all=n -WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC all=y -WATCHDOG_PRETIMEOUT_GOV_NOOP all=m #- #- *** FILE: drivers/xen/Kconfig *** @@ -9610,6 +9659,7 @@ NFS_COMMON all=y #- file fs/9p/Kconfig goes here #- file fs/nls/Kconfig goes here #- file fs/dlm/Kconfig goes here +#- file fs/unicode/Kconfig goes here #- #- *** FILE: fs/Kconfig.binfmt *** @@ -10141,6 +10191,12 @@ UFS_FS all=m UFS_FS_WRITE all=n UFS_DEBUG all=n +#- +#- *** FILE: fs/unicode/Kconfig *** +#- +UNICODE all=y +UNICODE_NORMALIZATION_SELFTEST all=m + #- #- *** FILE: fs/xfs/Kconfig *** #- @@ -10197,6 +10253,7 @@ CPU_ISOLATION all=y #- file kernel/rcu/Kconfig goes here IKCONFIG all=m IKCONFIG_PROC all=y +IKHEADERS all=m LOG_BUF_SHIFT all=18 LOG_CPU_MAX_BUF_SHIFT all=12 PRINTK_SAFE_LOG_BUF_SHIFT all=13 @@ -10240,7 +10297,6 @@ BLK_DEV_INITRD all=y CC_OPTIMIZE_FOR_PERFORMANCE all=y CC_OPTIMIZE_FOR_SIZE all=n SYSCTL all=y -ANON_INODES all=y EXPERT all=n UID16 all=y FHANDLE all=y @@ -10275,6 +10331,7 @@ SLOB all=n SLAB_MERGE_DEFAULT all=y SLAB_FREELIST_RANDOM all=y SLAB_FREELIST_HARDENED all=y +SHUFFLE_PAGE_ALLOCATOR all=y SLUB_CPU_PARTIAL all=y PROFILING all=y #- file arch/Kconfig goes here @@ -10430,13 +10487,13 @@ RING_BUFFER_BENCHMARK all=m RING_BUFFER_STARTUP_TEST all=n PREEMPTIRQ_DELAY_TEST all=m TRACE_EVAL_MAP_FILE all=n -TRACING_EVENTS_GPIO all=y #- #- *** FILE: lib/Kconfig *** #- RAID6_PQ_BENCHMARK all=y BITREVERSE all=y +#- file lib/math/Kconfig goes here CRC_CCITT all=y CRC16 all=m CRC_T10DIF all=y @@ -10472,7 +10529,6 @@ HAS_IOMEM all=y CHECK_SIGNATURE all=y CPU_RMAP all=y GLOB_SELFTEST all=n -CORDIC all=m DDR all=y #- file lib/fonts/Kconfig goes here STRING_SELFTEST all=n @@ -10491,6 +10547,7 @@ DEBUG_INFO all=y DEBUG_INFO_REDUCED all=n DEBUG_INFO_SPLIT all=y DEBUG_INFO_DWARF4 all=y +DEBUG_INFO_BTF all=n GDB_SCRIPTS all=y ENABLE_MUST_CHECK all=y FRAME_WARN all=2048 @@ -10509,6 +10566,7 @@ MAGIC_SYSRQ all=y MAGIC_SYSRQ_DEFAULT_ENABLE all=0x1 MAGIC_SYSRQ_SERIAL all=y DEBUG_KERNEL all=y +DEBUG_MISC all=y #- file mm/Kconfig.debug goes here DEBUG_OBJECTS all=n DEBUG_SLAB all=n @@ -10556,7 +10614,7 @@ DEBUG_KOBJECT all=n DEBUG_KOBJECT_RELEASE all=n DEBUG_BUGVERBOSE all=y DEBUG_LIST all=n -DEBUG_PI_LIST all=n +DEBUG_PLIST all=n DEBUG_SG all=n DEBUG_NOTIFIERS all=n DEBUG_CREDENTIALS all=n @@ -10584,6 +10642,7 @@ ATOMIC64_SELFTEST all=n ASYNC_RAID6_TEST all=m TEST_HEXDUMP all=m TEST_STRING_HELPERS all=m +TEST_STRSCPY all=m TEST_KSTRTOX all=m TEST_PRINTF all=m TEST_BITMAP all=m @@ -10652,6 +10711,11 @@ FONT_10x18 all=n FONT_SUN8x16 ppc=n ppc64=n sparc=y sparc64=y FONT_SUN12x22 ppc=n ppc64=n sparc=y sparc64=y +#- +#- *** FILE: lib/math/Kconfig *** +#- +CORDIC all=m + #- #- *** FILE: lib/xz/Kconfig *** #- @@ -10875,6 +10939,7 @@ BATMAN_ADV_NC all=y BATMAN_ADV_MCAST all= all=y BATMAN_ADV_DEBUGFS all=y BATMAN_ADV_DEBUG all=n +BATMAN_ADV_SYSFS all=y BATMAN_ADV_TRACING all=n #- @@ -11023,7 +11088,9 @@ DNS_RESOLVER all=m #- *** FILE: net/dsa/Kconfig *** #- NET_DSA all=m -NET_DSA_LEGACY all=y +NET_DSA_TAG_8021Q all=m +NET_DSA_TAG_KSZ all=m +NET_DSA_TAG_SJA1105 all=m #- #- *** FILE: net/hsr/Kconfig *** @@ -11080,9 +11147,6 @@ INET_ESP_OFFLOAD all=m INET_IPCOMP all=m INET_XFRM_TUNNEL all=m INET_TUNNEL all=m -INET_XFRM_MODE_TRANSPORT all=m -INET_XFRM_MODE_TUNNEL all=m -INET_XFRM_MODE_BEET all=m INET_DIAG all=m INET_TCP_DIAG all=m INET_UDP_DIAG all=m @@ -11120,7 +11184,6 @@ TCP_MD5SIG all=y NF_SOCKET_IPV4 all=m NF_TPROXY_IPV4 all=m NF_TABLES_IPV4 all=y -NFT_CHAIN_ROUTE_IPV4 all=m NFT_REJECT_IPV4 all=m NFT_DUP_IPV4 all=m NFT_FIB_IPV4 all=m @@ -11167,10 +11230,6 @@ IPV6_MIP6 all=y IPV6_ILA all=m INET6_XFRM_TUNNEL all=m INET6_TUNNEL all=m -INET6_XFRM_MODE_TRANSPORT all=m -INET6_XFRM_MODE_TUNNEL all=m -INET6_XFRM_MODE_BEET all=m -INET6_XFRM_MODE_ROUTEOPTIMIZATION all=m IPV6_VTI all=m IPV6_SIT all=m IPV6_SIT_6RD all=y @@ -11190,7 +11249,6 @@ IPV6_SEG6_HMAC all=y NF_SOCKET_IPV6 all=m NF_TPROXY_IPV6 all=m NF_TABLES_IPV6 all=y -NFT_CHAIN_ROUTE_IPV6 all=m NFT_DUP_IPV6 all=m NFT_FIB_IPV6 all=m NF_FLOW_TABLE_IPV6 all=m @@ -11683,6 +11741,7 @@ SMC_DIAG all=m SUNRPC all=m SUNRPC_GSS all=m RPCSEC_GSS_KRB5 all=m +SUNRPC_DISABLE_INSECURE_ENCTYPES all=y SUNRPC_DEBUG all=y SUNRPC_XPRT_RDMA all=m @@ -11773,17 +11832,8 @@ SAMPLES all=n GCC_PLUGINS all=y GCC_PLUGIN_CYC_COMPLEXITY all=n GCC_PLUGIN_LATENT_ENTROPY all=n -GCC_PLUGIN_STRUCTLEAK all=y -GCC_PLUGIN_STRUCTLEAK_USER all=n -GCC_PLUGIN_STRUCTLEAK_BYREF all=n -GCC_PLUGIN_STRUCTLEAK_BYREF_ALL all=y -GCC_PLUGIN_STRUCTLEAK_VERBOSE all=n GCC_PLUGIN_RANDSTRUCT all=y GCC_PLUGIN_RANDSTRUCT_PERFORMANCE all=y -GCC_PLUGIN_STACKLEAK all=y -STACKLEAK_TRACK_MIN_SIZE all=100 -STACKLEAK_METRICS all=y -STACKLEAK_RUNTIME_DISABLE all=y #- #- *** FILE: security/Kconfig *** @@ -11815,6 +11865,21 @@ DEFAULT_SECURITY_TOMOYO all=n DEFAULT_SECURITY_APPARMOR=n DEFAULT_SECURITY_DAC all=y LSM all="yama,loadpin,safesetid,integrity" +#- file security/Kconfig.hardening goes here + +#- +#- *** FILE: security/Kconfig.hardening *** +#- +GCC_PLUGIN_STRUCTLEAK all=y +INIT_STACK_NONE all=n +GCC_PLUGIN_STRUCTLEAK_USER all=n +GCC_PLUGIN_STRUCTLEAK_BYREF all=n +GCC_PLUGIN_STRUCTLEAK_BYREF_ALL all=y +GCC_PLUGIN_STRUCTLEAK_VERBOSE all=n +GCC_PLUGIN_STACKLEAK all=y +STACKLEAK_TRACK_MIN_SIZE all=100 +STACKLEAK_METRICS all=y +STACKLEAK_RUNTIME_DISABLE all=y #- #- *** FILE: security/apparmor/Kconfig *** @@ -11899,6 +11964,7 @@ SECURITY_TOMOYO_MAX_AUDIT_LOG all=1024 SECURITY_TOMOYO_OMIT_USERSPACE_LOADER all=n SECURITY_TOMOYO_POLICY_LOADER all="/sbin/tomoyo-init" SECURITY_TOMOYO_ACTIVATION_TRIGGER all="/sbin/init" +SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING all=n #- #- *** FILE: security/yama/Kconfig *** @@ -12233,6 +12299,7 @@ SND_SOC all=m #- file sound/soc/samsung/Kconfig goes here #- file sound/soc/sh/Kconfig goes here #- file sound/soc/sirf/Kconfig goes here +#- file sound/soc/sof/Kconfig goes here #- file sound/soc/spear/Kconfig goes here #- file sound/soc/sprd/Kconfig goes here #- file sound/soc/sti/Kconfig goes here @@ -12420,6 +12487,7 @@ SND_DESIGNWARE_PCM all=y #- Common SoC Audio options for Freescale CPUs: SND_SOC_FSL_ASRC all=m SND_SOC_FSL_SAI all=m +SND_SOC_FSL_AUDMIX all=m SND_SOC_FSL_SSI all=m SND_SOC_FSL_SPDIF all=m SND_SOC_FSL_ESAI all=m @@ -12498,6 +12566,7 @@ SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH all=m SND_SOC_INTEL_KBL_RT5660_MACH all=m SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH all=m SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH all=m +SND_SOC_INTEL_SOF_RT5682_MACH all=m #- #- *** FILE: sound/soc/mediatek/Kconfig *** @@ -12509,6 +12578,33 @@ SND_SOC_MTK_BTCVSD all=m #- SND_SOC_QCOM all=m +#- +#- *** FILE: sound/soc/sof/Kconfig *** +#- +SND_SOC_SOF_TOPLEVEL all=y +SND_SOC_SOF_PCI all=m +SND_SOC_SOF_ACPI all=m +SND_SOC_SOF_NOCODEC_SUPPORT all=n +SND_SOC_SOF_STRICT_ABI_CHECKS all=n +SND_SOC_SOF_DEBUG all=n +#- file sound/soc/sof/intel/Kconfig goes here +#- file sound/soc/sof/xtensa/Kconfig goes here + +#- +#- *** FILE: sound/soc/sof/intel/Kconfig *** +#- +SND_SOC_SOF_INTEL_TOPLEVEL all=y +SND_SOC_SOF_BAYTRAIL_SUPPORT all=y +SND_SOC_SOF_BROADWELL_SUPPORT all=y +SND_SOC_SOF_MERRIFIELD_SUPPORT all=y +SND_SOC_SOF_APOLLOLAKE_SUPPORT all=y +SND_SOC_SOF_GEMINILAKE_SUPPORT all=y +SND_SOC_SOF_CANNONLAKE_SUPPORT all=y +SND_SOC_SOF_COFFEELAKE_SUPPORT all=y +SND_SOC_SOF_ICELAKE_SUPPORT all=y +SND_SOC_SOF_HDA_LINK all=y +SND_SOC_SOF_HDA_AUDIO_CODEC all=y + #- #- *** FILE: sound/soc/sunxi/Kconfig *** #- @@ -12596,9 +12692,16 @@ RD_LZ4 all=y #- *** PROBABLY REMOVED OPTIONS *** #- AD7152 all=m +ANON_INODES all=y +ASIX_PHY all=m +BACKLIGHT_LCD_SUPPORT all=y BLK_WBT_SQ all=y CAPI_EICON all=y CFQ_GROUP_IOSCHED all=y +CHARGER_LTC3651 all=m +CHASH_SELFTEST all=n +CHASH_STATS all=n +DEBUG_PI_LIST all=n DEFAULT_CFQ all=y DEFAULT_DEADLINE all=n DEFAULT_IOSCHED all="cfq" @@ -12610,6 +12713,13 @@ EXOFS_FS all=m EXT4_ENCRYPTION all=y F2FS_FS_ENCRYPTION all=y FB_XGI all=m +INET6_XFRM_MODE_BEET all=m +INET6_XFRM_MODE_ROUTEOPTIMIZATION all=m +INET6_XFRM_MODE_TRANSPORT all=m +INET6_XFRM_MODE_TUNNEL all=m +INET_XFRM_MODE_BEET all=m +INET_XFRM_MODE_TRANSPORT all=m +INET_XFRM_MODE_TUNNEL all=m INTEL_RDT all=y IOSCHED_CFQ all=y IOSCHED_DEADLINE all=y @@ -12620,6 +12730,7 @@ ISDN_DIVAS_DIVACAPI all=m ISDN_DIVAS_MAINT all=m ISDN_DIVAS_PRIPCI all=y ISDN_DIVAS_USERIDI all=m +LBDAF i386=y ppc=y sparc=y sparc64= LCD_OTM3225A all=m MAY_USE_DEVLINK all=m MICROCHIP_KSZ all=m @@ -12627,10 +12738,20 @@ MICROCHIP_KSZ_SPI_DRIVER all=m MTD_GPIO_ADDR all=m MTD_LATCH_ADDR all=m MTD_MT81xx_NOR all=m +MTD_NAND all=m +MTD_NAND_BCH all=m +MTD_NAND_ECC_BCH all=y +MTD_NAND_ECC_SMC all=y MTD_SPINAND_MT29F all=m MTD_SPINAND_ONDIEECC all=y +MTK_AEE_KDUMP all=y +MTK_MMC all=m +MTK_MMC_CD_POLL all=y +NET_DSA_LEGACY all=y NFT_CHAIN_NAT_IPV4 all=m NFT_CHAIN_NAT_IPV6 all=m +NFT_CHAIN_ROUTE_IPV4 all=m +NFT_CHAIN_ROUTE_IPV6 all=m NFT_MASQ_IPV4 all=m NFT_MASQ_IPV6 all=m NFT_REDIR_IPV4 all=m @@ -12639,6 +12760,7 @@ NF_NAT_IPV4 all=m NF_NAT_IPV6 all=m PSW_PHY_SEL all=n QTNFMAC_PEARL_PCIE all=m +R8822BE all=m SCSI_MQ_DEFAULT all=y SCSI_OSD_DEBUG all=n SCSI_OSD_DPRINT_SENSE all=1 @@ -12653,6 +12775,15 @@ SOC_CAMERA_OV9640 all=m SOC_CAMERA_PLATFORM all=m SOC_CAMERA_RJ54N1 all=m SOC_CAMERA_TW9910 all=m -SUNRPC_DISABLE_INSECURE_ENCTYPES all=y +TI_CPSW_ALE all=m +TRACING_EVENTS_GPIO all=y UBIFS_FS_ENCRYPTION all=y VIDEO_SH_MOBILE_CEU all=m +VIDEO_ZORAN all=m ppc=n sparc=n +VIDEO_ZORAN_AVS6EYES all=m +VIDEO_ZORAN_BUZ all=m +VIDEO_ZORAN_DC10 all=m +VIDEO_ZORAN_DC30 all=m +VIDEO_ZORAN_LML33 all=m +VIDEO_ZORAN_LML33R10 all=m +VIDEO_ZORAN_ZR36060 all=m diff --git a/kernel-pom-ng-IPV4OPTSSTRIP.patch b/kernel-pom-ng-IPV4OPTSSTRIP.patch index 9fe3fb32..cb970ec2 100644 --- a/kernel-pom-ng-IPV4OPTSSTRIP.patch +++ b/kernel-pom-ng-IPV4OPTSSTRIP.patch @@ -17,16 +17,16 @@ diff -NurpP --minimal linux-2.6.21.b/net/ipv4/netfilter/Kconfig linux-2.6.21.a/n + endmenu ---- linux-3.4/net/ipv4/netfilter/Makefile~ 2012-05-21 08:42:02.000000000 +0200 -+++ linux-3.4/net/ipv4/netfilter/Makefile 2012-05-21 08:45:09.247956356 +0200 -@@ -54,6 +54,7 @@ +--- linux-5.2/net/ipv4/netfilter/Makefile~ 2019-07-08 00:41:56.000000000 +0200 ++++ linux-5.2/net/ipv4/netfilter/Makefile 2019-07-08 09:01:35.241471623 +0200 +@@ -48,6 +48,7 @@ obj-$(CONFIG_IP_NF_MATCH_RPFILTER) += ip # targets obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o +obj-$(CONFIG_IP_NF_TARGET_IPV4OPTSSTRIP) += ipt_IPV4OPTSSTRIP.o - obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o - obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o - obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o + obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o + obj-$(CONFIG_IP_NF_TARGET_SYNPROXY) += ipt_SYNPROXY.o + diff -NurpP --minimal linux-2.6.21.b/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c linux-2.6.21.a/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c --- linux-2.6.21.b/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.21.a/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c 2007-05-30 11:18:08.000000000 +0200 diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch index 0eb6a215..227c0eb3 100644 --- a/kernel-small_fixes.patch +++ b/kernel-small_fixes.patch @@ -9,163 +9,164 @@ bool "Secure RPC: Disable insecure Kerberos encryption types" depends on RPCSEC_GSS_KRB5 default n -Move setting up operation and write hint to xfs_alloc_ioend, and -then just copy over all needed information from the previous bio -in xfs_chain_bio and stop passing various parameters to it. - -Signed-off-by: Christoph Hellwig <h...@lst.de> ---- - fs/xfs/xfs_aops.c | 35 +++++++++++++++++------------------ - 1 file changed, 17 insertions(+), 18 deletions(-) - -diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c -index a6f0f4761a37..9cceb90e77c5 100644 ---- a/fs/xfs/xfs_aops.c -+++ b/fs/xfs/xfs_aops.c -@@ -665,7 +665,6 @@ xfs_submit_ioend( - - ioend->io_bio->bi_private = ioend; - ioend->io_bio->bi_end_io = xfs_end_bio; -- ioend->io_bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc); - - /* - * If we are failing the IO now, just mark the ioend with an -@@ -679,7 +678,6 @@ xfs_submit_ioend( - return status; - } - -- ioend->io_bio->bi_write_hint = ioend->io_inode->i_write_hint; - submit_bio(ioend->io_bio); - return 0; - } -@@ -691,7 +689,8 @@ xfs_alloc_ioend( - xfs_exntst_t state, - xfs_off_t offset, - struct block_device *bdev, -- sector_t sector) -+ sector_t sector, -+ struct writeback_control *wbc) - { - struct xfs_ioend *ioend; - struct bio *bio; -@@ -699,6 +698,8 @@ xfs_alloc_ioend( - bio = bio_alloc_bioset(GFP_NOFS, BIO_MAX_PAGES, &xfs_ioend_bioset); - bio_set_dev(bio, bdev); - bio->bi_iter.bi_sector = sector; -+ bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc); -+ bio->bi_write_hint = inode->i_write_hint; - - ioend = container_of(bio, struct xfs_ioend, io_inline_bio); - INIT_LIST_HEAD(&ioend->io_list); -@@ -719,24 +720,22 @@ xfs_alloc_ioend( - * so that the bi_private linkage is set up in the right direction for the - * traversal in xfs_destroy_ioend(). - */ --static void -+static struct bio * - xfs_chain_bio( -- struct xfs_ioend *ioend, -- struct writeback_control *wbc, -- struct block_device *bdev, -- sector_t sector) -+ struct bio *prev) - { - struct bio *new; - - new = bio_alloc(GFP_NOFS, BIO_MAX_PAGES); -- bio_set_dev(new, bdev); -- new->bi_iter.bi_sector = sector; -- bio_chain(ioend->io_bio, new); -- bio_get(ioend->io_bio); /* for xfs_destroy_ioend */ -- ioend->io_bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc); -- ioend->io_bio->bi_write_hint = ioend->io_inode->i_write_hint; -- submit_bio(ioend->io_bio); -- ioend->io_bio = new; -+ bio_copy_dev(new, prev); -+ new->bi_iter.bi_sector = bio_end_sector(prev); -+ new->bi_opf = prev->bi_opf; -+ new->bi_write_hint = prev->bi_write_hint; -+ -+ bio_chain(prev, new); -+ bio_get(prev); /* for xfs_destroy_ioend */ -+ submit_bio(prev); -+ return new; - } - - /* -@@ -771,14 +770,14 @@ xfs_add_to_ioend( - if (wpc->ioend) - list_add(&wpc->ioend->io_list, iolist); - wpc->ioend = xfs_alloc_ioend(inode, wpc->fork, -- wpc->imap.br_state, offset, bdev, sector); -+ wpc->imap.br_state, offset, bdev, sector, wbc); - } - - if (!__bio_try_merge_page(wpc->ioend->io_bio, page, len, poff, true)) { - if (iop) - atomic_inc(&iop->write_count); - if (bio_full(wpc->ioend->io_bio)) -- xfs_chain_bio(wpc->ioend, wbc, bdev, sector); -+ wpc->ioend->io_bio = xfs_chain_bio(wpc->ioend->io_bio); - bio_add_page(wpc->ioend->io_bio, page, len, poff); - } - --- -2.20.1 - - -Link every newly allocated writeback bio to cgroup pointed to by the -writeback control structure, and charge every byte written back to it. - -Tested-by: Stefan Priebe - Profihost AG <s.pri...@profihost.ag> -Signed-off-by: Christoph Hellwig <h...@lst.de> ---- - fs/xfs/xfs_aops.c | 4 +++- - fs/xfs/xfs_super.c | 2 ++ - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c -index 9cceb90e77c5..73c291aeae17 100644 ---- a/fs/xfs/xfs_aops.c -+++ b/fs/xfs/xfs_aops.c -@@ -700,6 +700,7 @@ xfs_alloc_ioend( - bio->bi_iter.bi_sector = sector; - bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc); - bio->bi_write_hint = inode->i_write_hint; -+ wbc_init_bio(wbc, bio); - - ioend = container_of(bio, struct xfs_ioend, io_inline_bio); - INIT_LIST_HEAD(&ioend->io_list); -@@ -727,7 +728,7 @@ xfs_chain_bio( - struct bio *new; - - new = bio_alloc(GFP_NOFS, BIO_MAX_PAGES); -- bio_copy_dev(new, prev); -+ bio_copy_dev(new, prev);/* also copies over blkcg information */ - new->bi_iter.bi_sector = bio_end_sector(prev); - new->bi_opf = prev->bi_opf; - new->bi_write_hint = prev->bi_write_hint; -@@ -782,6 +783,7 @@ xfs_add_to_ioend( - } - - wpc->ioend->io_size += len; -+ wbc_account_io(wbc, page, len); - } - - STATIC void -diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c -index 594c119824cc..ee0df8f611ff 100644 ---- a/fs/xfs/xfs_super.c -+++ b/fs/xfs/xfs_super.c -@@ -1685,6 +1685,8 @@ xfs_fs_fill_super( - sb->s_maxbytes = xfs_max_file_offset(sb->s_blocksize_bits); - sb->s_max_links = XFS_MAXLINK; - sb->s_time_gran = 1; -+ sb->s_iflags |= SB_I_CGROUPWB; -+ - set_posix_acl_flag(sb); - - /* version 5 superblocks support inode version counters. */ --- -2.20.1 - +Move setting up operation and write hint to xfs_alloc_ioend, and +then just copy over all needed information from the previous bio +in xfs_chain_bio and stop passing various parameters to it. + +Signed-off-by: Christoph Hellwig <h...@lst.de> +--- + fs/xfs/xfs_aops.c | 35 +++++++++++++++++------------------ + 1 file changed, 17 insertions(+), 18 deletions(-) + +diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c +index a6f0f4761a37..9cceb90e77c5 100644 +--- a/fs/xfs/xfs_aops.c ++++ b/fs/xfs/xfs_aops.c +@@ -665,7 +665,6 @@ xfs_submit_ioend( + + ioend->io_bio->bi_private = ioend; + ioend->io_bio->bi_end_io = xfs_end_bio; +- ioend->io_bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc); + + /* + * If we are failing the IO now, just mark the ioend with an +@@ -679,7 +678,6 @@ xfs_submit_ioend( + return status; + } + +- ioend->io_bio->bi_write_hint = ioend->io_inode->i_write_hint; + submit_bio(ioend->io_bio); + return 0; + } +@@ -691,7 +689,8 @@ xfs_alloc_ioend( + xfs_exntst_t state, + xfs_off_t offset, + struct block_device *bdev, +- sector_t sector) ++ sector_t sector, ++ struct writeback_control *wbc) + { + struct xfs_ioend *ioend; + struct bio *bio; +@@ -699,6 +698,8 @@ xfs_alloc_ioend( + bio = bio_alloc_bioset(GFP_NOFS, BIO_MAX_PAGES, &xfs_ioend_bioset); + bio_set_dev(bio, bdev); + bio->bi_iter.bi_sector = sector; ++ bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc); ++ bio->bi_write_hint = inode->i_write_hint; + + ioend = container_of(bio, struct xfs_ioend, io_inline_bio); + INIT_LIST_HEAD(&ioend->io_list); +@@ -719,24 +720,22 @@ xfs_alloc_ioend( + * so that the bi_private linkage is set up in the right direction for the + * traversal in xfs_destroy_ioend(). + */ +-static void ++static struct bio * + xfs_chain_bio( +- struct xfs_ioend *ioend, +- struct writeback_control *wbc, +- struct block_device *bdev, +- sector_t sector) ++ struct bio *prev) + { + struct bio *new; + + new = bio_alloc(GFP_NOFS, BIO_MAX_PAGES); +- bio_set_dev(new, bdev); +- new->bi_iter.bi_sector = sector; +- bio_chain(ioend->io_bio, new); +- bio_get(ioend->io_bio); /* for xfs_destroy_ioend */ +- ioend->io_bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc); +- ioend->io_bio->bi_write_hint = ioend->io_inode->i_write_hint; +- submit_bio(ioend->io_bio); +- ioend->io_bio = new; ++ bio_copy_dev(new, prev); ++ new->bi_iter.bi_sector = bio_end_sector(prev); ++ new->bi_opf = prev->bi_opf; ++ new->bi_write_hint = prev->bi_write_hint; ++ ++ bio_chain(prev, new); ++ bio_get(prev); /* for xfs_destroy_ioend */ ++ submit_bio(prev); ++ return new; + } + + /* +@@ -772,7 +772,7 @@ xfs_add_to_ioend( + if (wpc->ioend) + list_add(&wpc->ioend->io_list, iolist); + wpc->ioend = xfs_alloc_ioend(inode, wpc->fork, +- wpc->imap.br_state, offset, bdev, sector); ++ wpc->imap.br_state, offset, bdev, sector, wbc); + } + + merged = __bio_try_merge_page(wpc->ioend->io_bio, page, len, poff, +@@ -783,7 +783,7 @@ xfs_add_to_ioend( + + if (!merged) { + if (bio_full(wpc->ioend->io_bio)) +- xfs_chain_bio(wpc->ioend, wbc, bdev, sector); ++ wpc->ioend->io_bio = xfs_chain_bio(wpc->ioend->io_bio); + bio_add_page(wpc->ioend->io_bio, page, len, poff); + } + +-- +2.20.1 + + +Link every newly allocated writeback bio to cgroup pointed to by the +writeback control structure, and charge every byte written back to it. + +Tested-by: Stefan Priebe - Profihost AG <s.pri...@profihost.ag> +Signed-off-by: Christoph Hellwig <h...@lst.de> +--- + fs/xfs/xfs_aops.c | 4 +++- + fs/xfs/xfs_super.c | 2 ++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c +index 9cceb90e77c5..73c291aeae17 100644 +--- a/fs/xfs/xfs_aops.c ++++ b/fs/xfs/xfs_aops.c +@@ -700,6 +700,7 @@ xfs_alloc_ioend( + bio->bi_iter.bi_sector = sector; + bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc); + bio->bi_write_hint = inode->i_write_hint; ++ wbc_init_bio(wbc, bio); + + ioend = container_of(bio, struct xfs_ioend, io_inline_bio); + INIT_LIST_HEAD(&ioend->io_list); +@@ -727,7 +728,7 @@ xfs_chain_bio( + struct bio *new; + + new = bio_alloc(GFP_NOFS, BIO_MAX_PAGES); +- bio_copy_dev(new, prev); ++ bio_copy_dev(new, prev);/* also copies over blkcg information */ + new->bi_iter.bi_sector = bio_end_sector(prev); + new->bi_opf = prev->bi_opf; + new->bi_write_hint = prev->bi_write_hint; +@@ -782,6 +783,7 @@ xfs_add_to_ioend( + } + + wpc->ioend->io_size += len; ++ wbc_account_io(wbc, page, len); + } + + STATIC void +diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c +index 594c119824cc..ee0df8f611ff 100644 +--- a/fs/xfs/xfs_super.c ++++ b/fs/xfs/xfs_super.c +@@ -1685,6 +1685,8 @@ xfs_fs_fill_super( + sb->s_maxbytes = xfs_max_file_offset(sb->s_blocksize_bits); + sb->s_max_links = XFS_MAXLINK; + sb->s_time_gran = 1; ++ sb->s_iflags |= SB_I_CGROUPWB; ++ + set_posix_acl_flag(sb); + + /* version 5 superblocks support inode version counters. */ +-- +2.20.1 + ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/7543edb34e1fd91a21be649f9206c70e5a14fb99 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit