Удалено ядро 4.4, обновлены версии ядрер

mhiretskiy 1323
Alexander Tratsevskiy 6 years ago
parent 10a1f637c4
commit 6f099dbab7

@ -1 +0,0 @@
# Calculate append=skip merge(sys-kernel/calculate-sources)=>4.4,4.5

@ -1,104 +0,0 @@
# Calculate format=diff os_linux_system==desktop
From f54f3003586bf00ba0ee5974a92b732477b834e3 Mon Sep 17 00:00:00 2001
From: Paolo Valente <paolo.valente@unimore.it>
Date: Tue, 7 Apr 2015 13:39:12 +0200
Subject: [PATCH 1/3] block: cgroups, kconfig, build bits for BFQ-v7r11-4.4.0
Update Kconfig.iosched and do the related Makefile changes to include
kernel configuration options for BFQ. Also increase the number of
policies supported by the blkio controller so that BFQ can add its
own.
Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
Signed-off-by: Arianna Avanzini <avanzini@google.com>
---
block/Kconfig.iosched | 32 ++++++++++++++++++++++++++++++++
block/Makefile | 1 +
include/linux/blkdev.h | 2 +-
3 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
index 421bef9..0ee5f0f 100644
--- a/block/Kconfig.iosched
+++ b/block/Kconfig.iosched
@@ -39,6 +39,27 @@ config CFQ_GROUP_IOSCHED
---help---
Enable group IO scheduling in CFQ.
+config IOSCHED_BFQ
+ tristate "BFQ I/O scheduler"
+ default n
+ ---help---
+ The BFQ I/O scheduler tries to distribute bandwidth among
+ all processes according to their weights.
+ It aims at distributing the bandwidth as desired, independently of
+ the disk parameters and with any workload. It also tries to
+ guarantee low latency to interactive and soft real-time
+ applications. If compiled built-in (saying Y here), BFQ can
+ be configured to support hierarchical scheduling.
+
+config CGROUP_BFQIO
+ bool "BFQ hierarchical scheduling support"
+ depends on CGROUPS && IOSCHED_BFQ=y
+ default n
+ ---help---
+ Enable hierarchical scheduling in BFQ, using the cgroups
+ filesystem interface. The name of the subsystem will be
+ bfqio.
+
choice
prompt "Default I/O scheduler"
default DEFAULT_CFQ
@@ -52,6 +73,16 @@ choice
config DEFAULT_CFQ
bool "CFQ" if IOSCHED_CFQ=y
+ config DEFAULT_BFQ
+ bool "BFQ" if IOSCHED_BFQ=y
+ help
+ Selects BFQ as the default I/O scheduler which will be
+ used by default for all block devices.
+ The BFQ I/O scheduler aims at distributing the bandwidth
+ as desired, independently of the disk parameters and with
+ any workload. It also tries to guarantee low latency to
+ interactive and soft real-time applications.
+
config DEFAULT_NOOP
bool "No-op"
@@ -61,6 +92,7 @@ config DEFAULT_IOSCHED
string
default "deadline" if DEFAULT_DEADLINE
default "cfq" if DEFAULT_CFQ
+ default "bfq" if DEFAULT_BFQ
default "noop" if DEFAULT_NOOP
endmenu
diff --git a/block/Makefile b/block/Makefile
index 00ecc97..1ed86d5 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_BLK_DEV_THROTTLING) += blk-throttle.o
obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o
obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o
obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o
+obj-$(CONFIG_IOSCHED_BFQ) += bfq-iosched.o
obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o
obj-$(CONFIG_BLK_CMDLINE_PARSER) += cmdline-parser.o
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index c70e358..ae43492 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -44,7 +44,7 @@ struct pr_ops;
* Maximum number of blkcg policies allowed to be registered concurrently.
* Defined here to simplify include dependency.
*/
-#define BLKCG_MAX_POLS 2
+#define BLKCG_MAX_POLS 3
struct request;
typedef void (rq_end_io_fn)(struct request *, int);
--
1.9.1

@ -1,6 +0,0 @@
# Calculate format=kernel name=.config os_linux_system==desktop
CONFIG_BFQ_GROUP_IOSCHED=y
CONFIG_DEFAULT_BFQ=y
# CONFIG_DEFAULT_CFQ is not set
CONFIG_DEFAULT_IOSCHED="bfq"
CONFIG_IOSCHED_BFQ=y

@ -1,2 +0,0 @@
# Calculate format=kernel name=.config
CONFIG_FB_CON_DECOR=y

@ -1,7 +0,0 @@
# Calculate format=kernel name=.config
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_DEBUG_PREEMPT=n
CONFIG_EXPERT=y
CONFIG_PROC_CHILDREN=y
CONFIG_SCHED_DEBUG=n
CONFIG_X86_DEBUG_FPU=n

@ -1,62 +0,0 @@
# Calculate format=kernel name=.config
CONFIG_DVB_AV7110_IR=y
CONFIG_DVB_AV7110=m
CONFIG_DVB_AV7110_OSD=y
CONFIG_DVB_B2C2_FLEXCOP=m
# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
CONFIG_DVB_B2C2_FLEXCOP_PCI=m
CONFIG_DVB_BCM3510=m
CONFIG_DVB_BUDGET_AV=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
CONFIG_DVB_BUDGET_PATCH=m
CONFIG_DVB_CX24120=m
CONFIG_DVB_CX24123=m
CONFIG_DVB_DDBRIDGE=m
CONFIG_DVB_L64781=m
CONFIG_DVB_NGENE=m
CONFIG_DVB_PLUTO2=m
CONFIG_DVB_PT1=m
CONFIG_DVB_PT3=m
CONFIG_DVB_S5H1420=m
CONFIG_DVB_SP8870=m
CONFIG_DVB_STB0899=m
CONFIG_DVB_STV0297=m
CONFIG_DVB_STV0299=m
CONFIG_DVB_STV090x=m
CONFIG_DVB_STV6110x=m
CONFIG_DVB_TC90522=m
CONFIG_DVB_TDA10021=m
CONFIG_DVB_TDA18271C2DD=m
CONFIG_DVB_TDA8083=m
CONFIG_DVB_TDA8261=m
CONFIG_DVB_TUA6100=m
CONFIG_DVB_TUNER_CX24113=m
CONFIG_DVB_TUNER_ITD1000=m
CONFIG_DVB_VES1820=m
CONFIG_DVB_VES1X93=m
CONFIG_MEDIA_TUNER_MT2131=m
CONFIG_MEDIA_TUNER_MXL301RF=m
CONFIG_MEDIA_TUNER_QM1D1C0042=m
CONFIG_TTPCI_EEPROM=m
CONFIG_VIDEO_CX25821_ALSA=m
CONFIG_VIDEO_CX25821=m
CONFIG_DVB_A8293=m
# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
CONFIG_DVB_B2C2_FLEXCOP_USB=m
CONFIG_DVB_CX22700=m
CONFIG_DVB_DRX39XYJ=m
CONFIG_DVB_DRXD=m
CONFIG_DVB_MB86A20S=m
CONFIG_DVB_PLATFORM_DRIVERS=y
CONFIG_DVB_S921=m
CONFIG_DVB_TDA10071=m
CONFIG_DVB_TTUSB_BUDGET=m
CONFIG_DVB_TTUSB_DEC=m
# CONFIG_SMS_SIANO_DEBUGFS is not set
CONFIG_SMS_USB_DRV=m
CONFIG_USB_AIRSPY=m
CONFIG_USB_GSPCA_KONICA=m
CONFIG_USB_GSPCA_XIRLINK_CIT=m
CONFIG_USB_HACKRF=m
CONFIG_VIDEO_EM28XX_DVB=m

@ -1,9 +0,0 @@
# Calculate format=kernel name=.config
CONFIG_FB_HYPERV=m
CONFIG_HID_HYPERV_MOUSE=m
CONFIG_HYPERV_BALLOON=m
CONFIG_HYPERV_KEYBOARD=m
CONFIG_HYPERV=m
CONFIG_HYPERV_NET=m
CONFIG_HYPERV_STORAGE=m
CONFIG_HYPERV_UTILS=m

@ -1,14 +0,0 @@
# Calculate format=kernel name=.config
# CONFIG_ACPI_IPMI is not set
CONFIG_HVC_DRIVER=y
CONFIG_IPMI_DEVICE_INTERFACE=m
CONFIG_IPMI_HANDLER=m
# CONFIG_IPMI_PANIC_EVENT is not set
# CONFIG_IPMI_POWEROFF is not set
CONFIG_IPMI_SI=m
# CONFIG_IPMI_SI_PROBE_DEFAULTS is not set
# CONFIG_IPMI_SSIF is not set
# CONFIG_IPMI_WATCHDOG is not set
# CONFIG_SENSORS_IBMAEM is not set
# CONFIG_SENSORS_IBMPEX is not set
# CONFIG_USBIP_DEBUG is not set

@ -1,19 +0,0 @@
# Calculate format=kernel name=.config
CONFIG_BLK_DEV_THROTTLING=y
CONFIG_CGROUP_DEVICE=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_PIDS=y
CONFIG_CPUSETS=y
CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
CONFIG_INET_DIAG=m
CONFIG_INET_TCP_DIAG=m
CONFIG_INET_UDP_DIAG=m
CONFIG_MEMCG_KMEM=y
CONFIG_MEMCG_SWAP_ENABLED=y
CONFIG_NETLINK_DIAG=m
CONFIG_PACKET_DIAG=m
CONFIG_PROC_PID_CPUSET=y
CONFIG_UNIX_DIAG=m
CONFIG_VETH=m
CONFIG_XFRM_USER=m

@ -1,2 +0,0 @@
# Calculate format=kernel name=.config
CONFIG_VIRTIO_CONSOLE=m

@ -1,4 +0,0 @@
# Calculate format=kernel name=.config
CONFIG_USBIP_CORE=m
CONFIG_USBIP_HOST=m
CONFIG_USBIP_VHCI_HCD=m

@ -1,14 +0,0 @@
# Calculate format=kernel name=.config os_linux_system==server
# CONFIG_BT is not set
# CONFIG_GAMEPORT is not set
# CONFIG_HZ_1000 is not set
# CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_MOUSE is not set
# CONFIG_INPUT_TABLET is not set
# CONFIG_INPUT_TOUCHSCREEN is not set
# CONFIG_MACINTOSH_DRIVERS is not set
# CONFIG_MEDIA_SUPPORT is not set
# CONFIG_PREEMPT is not set
# CONFIG_RC_CORE is not set
# CONFIG_SOUND is not set
# CONFIG_USB_GADGET is not set

@ -1,10 +1,9 @@
DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
DIST linux-4.15.tar.xz 102181404 BLAKE2B 5fd831356c2174d2779ab31033caec6929b2f47857f0bb82ef43ad1140c639d0dc5553e64d062f67486eeff780d5df8d971051fd5a626b51bed170067fea11e0 SHA512 c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
DIST linux-4.16.tar.xz 103020152 BLAKE2B c7f7b36280b74b2112a098733680e1e93c4f99571099d471b2dde5f7a746d9b9fab5112fffe3b7978c40f15ecaa33203eeeeea98c2158fab2d5857ece5d74f9f SHA512 ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662
DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
DIST patch-4.14.37.xz 1044456 BLAKE2B 4afbaae8b349a6194b6c7d38cfd9e6cc682285a0d0f644ea996aa20765a91fec857cfa184741384cb90413441c59196519ab240474938a330b7fdd8ca447942b SHA512 611e7baa71529ccd2d35d8643f5fb553af795a7b24f677ae0239c96f8c19669f49b7135194b29149212ff6bf0983768a8074c0b107e73bf111f3e0527cfacdad
DIST patch-4.14.39.xz 1091116 BLAKE2B 5b3b9d1f2a02eb0eb4713f571acd0ae78a4b66dea671ef06519f980c373a5c9632047bd74078ce7366c7a0d49d3f98363b0f5cd7aae3e179c74b205380015ff9 SHA512 28568e50fc70016426b65706f3de12cd723d7e5d5d88a23bbb02915b221db904744108328c3a63bb3f620e059f116930bb0b2d16271b53ed70dc320f6f3daf69
DIST patch-4.15.18.xz 456456 BLAKE2B 94b41c7ada6547c6e2823602e11504f8ba57c9b1ac9bfcfb156a35ec42415df55fb1faeb6f548f6d52cf435bd5109ec03d35c599ca742160672ae814281f91db SHA512 c40dfeedce4876fa4df51ae93978b2a8d9844ca04cf890a6d708fd85786dcda99a6611066977d5a4d841a03af8838d6aa6e1bc69084720fbf7147058b8394fb8
DIST patch-4.16.5.xz 110556 BLAKE2B 46733d177862e5c590c56e734a754468ef257d8483a1316fb55854c21a947d6e34a9a6b6b9f02d409480849e6ebd20b5b1b0ded39b9a5906ab9f283475b9b274 SHA512 15c0f85c5f35c2d87a0b63767e18c52a469a81154d915c50b7c7b1c0aed81229e86b3e1cf6e021539c100b29766c47c459adb7d2fcce0da165090206832f62f9
DIST patch-4.4.129.xz 1847944 BLAKE2B a432c311082e366a269d864467d8a3fd14ddc1c81a7d3b2d79b22fcb3c512b7b4c611e63dfa05008a1b8a3a28274d7479e51abc828bbc4d981f0b6d97e475a54 SHA512 8f611e8a9ec7e419438de5809983e9adda2e4ec18038f5d09b49a92fe2ed54074a31fd0aabd2ead82cc13932472cca216fdeb31d6b8f8dea84c50311c1841154
DIST patch-4.9.96.xz 1778892 BLAKE2B 32028f5fb2927a03fe19025bb48a43d4bcc553b7f7a642e24cc06dbf4054f8bdef9206273059f6abf9948198da47f4f18692fec1c3a0aa8ce1ba7173e7cd87d3 SHA512 bd07cdebf0c9afa1f777853fe8edd968e35dd5628eeb18015aeaf0b293a5c1e0fb1194efedf1bf58ee565a400665e1d768a60e1a736a6a88c80ffa8c9f8f508b
DIST patch-4.16.7.xz 170468 BLAKE2B 899c2268face620ee9ccf7f713b8db9a321e0cdec09abd42a8bad891acaa9d1807e35d15880641a9afbe1cda60cd4d5dab3c76f6ee98694f52d2e449c8c1b7b8 SHA512 576c2b520d444e11a9ca45ed3ed03822007ab6ff778a1759aa0f65c96946fe3e169e71d48d11e6d3b8627a99cdc20abfb0c84d7b6c9b0d2afa4d5fee9ed3aa41
DIST patch-4.9.98.xz 1811528 BLAKE2B f6244076779eeef08399128daf07d4a9ceb42065bff4f89b5f40ef3dd9dbdcf36daa5cb064ad13635c91e73b3d9bbdb57dd64dc4d5adf07042b1f96c7e8733f4 SHA512 e1aa814fac33ae6dbfbf2e0cda40a1bebbf420d33c6448de718726f94d2ba0c9538b18c3251fb46202d90da6aa56add466d4328696faa1a05c50478aa3f99a5e

@ -13,7 +13,7 @@ HOMEPAGE="http://www.calculate-linux.org"
SRC_URI="${KERNEL_URI} ${ARCH_URI}"
IUSE="uksm"
IUSE="uksm muqss"
src_unpack() {
calculate-kernel-7_src_unpack
Loading…
Cancel
Save