6.4 release

This commit is contained in:
ferrreo 2023-06-26 14:03:02 +01:00
parent e027961441
commit aa7d9d711d
6 changed files with 43 additions and 61 deletions

36
config
View File

@ -1,8 +1,8 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86 6.4.0-rc1 Kernel Configuration # Linux/x86 6.4.0-rc7 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.1 20230504" CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.1 20230525"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=130101 CONFIG_GCC_VERSION=130101
CONFIG_CLANG_VERSION=0 CONFIG_CLANG_VERSION=0
@ -447,6 +447,7 @@ CONFIG_GENERIC_CPU=y
# CONFIG_MNATIVE_AMD is not set # CONFIG_MNATIVE_AMD is not set
CONFIG_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
CONFIG_X86_L1_CACHE_SHIFT=6 CONFIG_X86_L1_CACHE_SHIFT=6
CONFIG_X86_USE_PPRO_CHECKSUM=y
CONFIG_X86_TSC=y CONFIG_X86_TSC=y
CONFIG_X86_CMPXCHG64=y CONFIG_X86_CMPXCHG64=y
CONFIG_X86_CMOV=y CONFIG_X86_CMOV=y
@ -894,13 +895,10 @@ CONFIG_LTO=y
CONFIG_LTO_CLANG=y CONFIG_LTO_CLANG=y
CONFIG_ARCH_SUPPORTS_LTO_CLANG=y CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
CONFIG_ARCH_SUPPORTS_LTO_GCC=y
CONFIG_HAS_LTO_CLANG=y CONFIG_HAS_LTO_CLANG=y
CONFIG_LTO_NONE=y CONFIG_LTO_NONE=y
# CONFIG_LTO_CLANG_FULL is not set # CONFIG_LTO_CLANG_FULL is not set
# CONFIG_LTO_CLANG_THIN is not set # CONFIG_LTO_CLANG_THIN is not set
# CONFIG_LTO_GCC is not set
# CONFIG_LTO_CP_CLONE is not set
CONFIG_ARCH_SUPPORTS_CFI_CLANG=y CONFIG_ARCH_SUPPORTS_CFI_CLANG=y
CONFIG_ARCH_USES_CFI_TRAPS=y CONFIG_ARCH_USES_CFI_TRAPS=y
# CONFIG_CFI_CLANG is not set # CONFIG_CFI_CLANG is not set
@ -1241,7 +1239,7 @@ CONFIG_LRU_GEN=y
CONFIG_LRU_GEN_ENABLED=y CONFIG_LRU_GEN_ENABLED=y
# CONFIG_LRU_GEN_STATS is not set # CONFIG_LRU_GEN_STATS is not set
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
# CONFIG_PER_VMA_LOCK is not set CONFIG_PER_VMA_LOCK=y
# #
# Data Access Monitoring # Data Access Monitoring
@ -6923,7 +6921,7 @@ CONFIG_FB_EFI=y
# CONFIG_FB_UDL is not set # CONFIG_FB_UDL is not set
# CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FB_VIRTUAL is not set # CONFIG_FB_VIRTUAL is not set
# CONFIG_XEN_FBDEV_FRONTEND is not set CONFIG_XEN_FBDEV_FRONTEND=m
# CONFIG_FB_METRONOME is not set # CONFIG_FB_METRONOME is not set
# CONFIG_FB_MB862XX is not set # CONFIG_FB_MB862XX is not set
# CONFIG_FB_HYPERV is not set # CONFIG_FB_HYPERV is not set
@ -7863,8 +7861,6 @@ CONFIG_HID_SENSOR_HUB=m
CONFIG_HID_SENSOR_CUSTOM_SENSOR=m CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
CONFIG_HID_ALPS=m CONFIG_HID_ALPS=m
CONFIG_HID_MCP2221=m CONFIG_HID_MCP2221=m
CONFIG_HID_IPTS=m
CONFIG_HID_ITHC=m
# end of Special HID drivers # end of Special HID drivers
# #
@ -8949,17 +8945,7 @@ CONFIG_AD2S1210=m
# CONFIG_FB_SM750 is not set # CONFIG_FB_SM750 is not set
CONFIG_STAGING_MEDIA=y CONFIG_STAGING_MEDIA=y
CONFIG_INTEL_ATOMISP=y # CONFIG_INTEL_ATOMISP is not set
CONFIG_VIDEO_ATOMISP=m
CONFIG_VIDEO_ATOMISP_ISP2401=y
CONFIG_VIDEO_ATOMISP_OV2722=m
CONFIG_VIDEO_ATOMISP_GC2235=m
CONFIG_VIDEO_ATOMISP_MSRLIST_HELPER=m
CONFIG_VIDEO_ATOMISP_MT9M114=m
CONFIG_VIDEO_ATOMISP_GC0310=m
CONFIG_VIDEO_ATOMISP_OV2680=m
CONFIG_VIDEO_ATOMISP_OV5693=m
CONFIG_VIDEO_ATOMISP_LM3554=m
CONFIG_DVB_AV7110_IR=y CONFIG_DVB_AV7110_IR=y
CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110=m
CONFIG_DVB_AV7110_OSD=y CONFIG_DVB_AV7110_OSD=y
@ -9019,7 +9005,6 @@ CONFIG_SURFACE_AGGREGATOR_CDEV=m
CONFIG_SURFACE_AGGREGATOR_HUB=m CONFIG_SURFACE_AGGREGATOR_HUB=m
CONFIG_SURFACE_AGGREGATOR_REGISTRY=m CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
CONFIG_SURFACE_AGGREGATOR_TABLET_SWITCH=m CONFIG_SURFACE_AGGREGATOR_TABLET_SWITCH=m
CONFIG_SURFACE_BOOK1_DGPU_SWITCH=m
CONFIG_SURFACE_DTX=m CONFIG_SURFACE_DTX=m
CONFIG_SURFACE_GPE=m CONFIG_SURFACE_GPE=m
CONFIG_SURFACE_HOTPLUG=m CONFIG_SURFACE_HOTPLUG=m
@ -9033,7 +9018,6 @@ CONFIG_ACPI_WMI=m
CONFIG_WMI_BMOF=m CONFIG_WMI_BMOF=m
CONFIG_HUAWEI_WMI=m CONFIG_HUAWEI_WMI=m
CONFIG_MXM_WMI=m CONFIG_MXM_WMI=m
CONFIG_PEAQ_WMI=m
CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m
CONFIG_XIAOMI_WMI=m CONFIG_XIAOMI_WMI=m
CONFIG_GIGABYTE_WMI=m CONFIG_GIGABYTE_WMI=m
@ -10076,7 +10060,7 @@ CONFIG_USB4=m
# #
CONFIG_ANDROID_BINDER_IPC=y CONFIG_ANDROID_BINDER_IPC=y
CONFIG_ANDROID_BINDERFS=y CONFIG_ANDROID_BINDERFS=y
CONFIG_ANDROID_BINDER_DEVICES="" CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set # CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
# end of Android # end of Android
@ -10274,7 +10258,6 @@ CONFIG_FANOTIFY=y
CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
CONFIG_QUOTA=y CONFIG_QUOTA=y
CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_QUOTA_NETLINK_INTERFACE=y
# CONFIG_PRINT_QUOTA_WARNING is not set
# CONFIG_QUOTA_DEBUG is not set # CONFIG_QUOTA_DEBUG is not set
CONFIG_QUOTA_TREE=m CONFIG_QUOTA_TREE=m
CONFIG_QFMT_V1=m CONFIG_QFMT_V1=m
@ -10534,7 +10517,7 @@ CONFIG_SMB_SERVER=m
CONFIG_SMB_SERVER_SMBDIRECT=y CONFIG_SMB_SERVER_SMBDIRECT=y
CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y
CONFIG_SMB_SERVER_KERBEROS5=y CONFIG_SMB_SERVER_KERBEROS5=y
CONFIG_SMBFS_COMMON=m CONFIG_SMBFS=m
CONFIG_CODA_FS=m CONFIG_CODA_FS=m
CONFIG_AFS_FS=m CONFIG_AFS_FS=m
# CONFIG_AFS_DEBUG is not set # CONFIG_AFS_DEBUG is not set
@ -11284,7 +11267,6 @@ CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y
CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KASAN=y
CONFIG_HAVE_ARCH_KASAN_VMALLOC=y CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
CONFIG_CC_HAS_KASAN_GENERIC=y CONFIG_CC_HAS_KASAN_GENERIC=y
CONFIG_CC_HAS_KASAN_SW_TAGS=y
CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
# CONFIG_KASAN is not set # CONFIG_KASAN is not set
CONFIG_HAVE_ARCH_KFENCE=y CONFIG_HAVE_ARCH_KFENCE=y
@ -11294,8 +11276,6 @@ CONFIG_KFENCE_NUM_OBJECTS=255
CONFIG_KFENCE_DEFERRABLE=y CONFIG_KFENCE_DEFERRABLE=y
CONFIG_KFENCE_STRESS_TEST_FAULTS=0 CONFIG_KFENCE_STRESS_TEST_FAULTS=0
CONFIG_HAVE_ARCH_KMSAN=y CONFIG_HAVE_ARCH_KMSAN=y
CONFIG_HAVE_KMSAN_COMPILER=y
# CONFIG_KMSAN is not set
# end of Memory Debugging # end of Memory Debugging
CONFIG_DEBUG_SHIRQ=y CONFIG_DEBUG_SHIRQ=y

View File

@ -3,5 +3,5 @@
. ./scripts/source.sh . ./scripts/source.sh
. ../scripts/patch.sh . ../scripts/patch.sh
. ../scripts/config.sh . ../scripts/config.sh
. ../scripts/build.sh #. ../scripts/build.sh
. ../scripts/output.sh #. ../scripts/output.sh

View File

@ -1,4 +1,4 @@
From 8b27eca196447f74bfa5a346df10212b900ce82a Mon Sep 17 00:00:00 2001 From 0833da2cefba11f45493563a0b57684221cfbc8e Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev> From: Peter Jung <admin@ptr1337.dev>
Date: Tue, 9 May 2023 18:38:36 +0200 Date: Tue, 9 May 2023 18:38:36 +0200
Subject: [PATCH 1/8] bbr2 Subject: [PATCH 1/8] bbr2
@ -3283,7 +3283,7 @@ index 39eb947fe392..61ab4ee55b22 100644
-- --
2.41.0 2.41.0
From 4b326373e0295ad142c417ef510d28cc491e0e73 Mon Sep 17 00:00:00 2001 From 271f0df366472a8b63a07d421c6145d72091b489 Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev> From: Peter Jung <admin@ptr1337.dev>
Date: Thu, 1 Jun 2023 16:35:02 +0200 Date: Thu, 1 Jun 2023 16:35:02 +0200
Subject: [PATCH 2/8] cachy Subject: [PATCH 2/8] cachy
@ -3411,7 +3411,7 @@ index 3c399f132e2d..a62ad01e6d11 100644
vmlinuz vmlinuz
voffset.h voffset.h
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 0d3a9d3e73c1..f6ec2f6c57ca 100644 index b68b43c19072..89540b323fb1 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -818,6 +818,9 @@ KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member) @@ -818,6 +818,9 @@ KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
@ -9758,7 +9758,7 @@ index ab0c5bd1a60f..f4989f706d7f 100644
-- --
2.41.0 2.41.0
From d66ae67f1a8580742fdd5cda2e6dcade3cc770e0 Mon Sep 17 00:00:00 2001 From 13baac7f5319c6b85ee69ae74277e91f3af31dbe Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev> From: Peter Jung <admin@ptr1337.dev>
Date: Tue, 9 May 2023 18:39:03 +0200 Date: Tue, 9 May 2023 18:39:03 +0200
Subject: [PATCH 3/8] ddcci Subject: [PATCH 3/8] ddcci
@ -12558,9 +12558,9 @@ index 000000000000..a219f031e584
-- --
2.41.0 2.41.0
From 72c060c5d2883853d8530a436380a788f74248b1 Mon Sep 17 00:00:00 2001 From 9b6b6e782a55bd588ad14e1dfbbd488b020cdea5 Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev> From: Peter Jung <admin@ptr1337.dev>
Date: Thu, 1 Jun 2023 16:35:21 +0200 Date: Tue, 20 Jun 2023 20:17:12 +0200
Subject: [PATCH 4/8] fixes Subject: [PATCH 4/8] fixes
Signed-off-by: Peter Jung <admin@ptr1337.dev> Signed-off-by: Peter Jung <admin@ptr1337.dev>
@ -12573,7 +12573,7 @@ Signed-off-by: Peter Jung <admin@ptr1337.dev>
drivers/leds/trigger/Kconfig | 9 + drivers/leds/trigger/Kconfig | 9 +
drivers/leds/trigger/Makefile | 1 + drivers/leds/trigger/Makefile | 1 +
drivers/leds/trigger/ledtrig-blkdev.c | 1221 +++++++++++++++++ drivers/leds/trigger/ledtrig-blkdev.c | 1221 +++++++++++++++++
fs/eventpoll.c | 2 +- fs/eventpoll.c | 4 -
include/linux/pageblock-flags.h | 2 +- include/linux/pageblock-flags.h | 2 +-
kernel/padata.c | 4 +- kernel/padata.c | 4 +-
lib/decompress_inflate.c | 2 +- lib/decompress_inflate.c | 2 +-
@ -12581,7 +12581,7 @@ Signed-off-by: Peter Jung <admin@ptr1337.dev>
lib/decompress_unzstd.c | 2 + lib/decompress_unzstd.c | 2 +
scripts/Makefile.vmlinux_o | 2 +- scripts/Makefile.vmlinux_o | 2 +-
sound/pci/hda/cs35l41_hda.c | 2 +- sound/pci/hda/cs35l41_hda.c | 2 +-
16 files changed, 1490 insertions(+), 8 deletions(-) 16 files changed, 1489 insertions(+), 11 deletions(-)
create mode 100644 Documentation/ABI/testing/sysfs-class-led-trigger-blkdev create mode 100644 Documentation/ABI/testing/sysfs-class-led-trigger-blkdev
create mode 100644 Documentation/leds/ledtrig-blkdev.rst create mode 100644 Documentation/leds/ledtrig-blkdev.rst
create mode 100644 drivers/leds/trigger/ledtrig-blkdev.c create mode 100644 drivers/leds/trigger/ledtrig-blkdev.c
@ -14135,18 +14135,20 @@ index 000000000000..067eedb003b5
+MODULE_AUTHOR("Ian Pilcher <arequipeno@gmail.com>"); +MODULE_AUTHOR("Ian Pilcher <arequipeno@gmail.com>");
+MODULE_LICENSE("GPL v2"); +MODULE_LICENSE("GPL v2");
diff --git a/fs/eventpoll.c b/fs/eventpoll.c diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 980483455cc0..fb561fd0b443 100644 index 266d45c7685b..fb561fd0b443 100644
--- a/fs/eventpoll.c --- a/fs/eventpoll.c
+++ b/fs/eventpoll.c +++ b/fs/eventpoll.c
@@ -1805,7 +1805,7 @@ static int ep_autoremove_wake_function(struct wait_queue_entry *wq_entry, @@ -1805,10 +1805,6 @@ static int ep_autoremove_wake_function(struct wait_queue_entry *wq_entry,
{ {
int ret = default_wake_function(wq_entry, mode, sync, key); int ret = default_wake_function(wq_entry, mode, sync, key);
- list_del_init(&wq_entry->entry); - /*
+ list_del_init_careful(&wq_entry->entry); - * Pairs with list_empty_careful in ep_poll, and ensures future loop
- * iterations see the cause of this wakeup.
- */
list_del_init_careful(&wq_entry->entry);
return ret; return ret;
} }
diff --git a/include/linux/pageblock-flags.h b/include/linux/pageblock-flags.h diff --git a/include/linux/pageblock-flags.h b/include/linux/pageblock-flags.h
index e83c4c095041..21b8dfa5d828 100644 index e83c4c095041..21b8dfa5d828 100644
--- a/include/linux/pageblock-flags.h --- a/include/linux/pageblock-flags.h
@ -14250,7 +14252,7 @@ index b5210abb5141..4d8936e1f769 100644
-- --
2.41.0 2.41.0
From 5cce371c10c8c702dda5f1f0ca4428ff0d336662 Mon Sep 17 00:00:00 2001 From d6bcf3350fc13686d0455250963cfb48198b94f4 Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev> From: Peter Jung <admin@ptr1337.dev>
Date: Thu, 1 Jun 2023 16:35:38 +0200 Date: Thu, 1 Jun 2023 16:35:38 +0200
Subject: [PATCH 5/8] ksm Subject: [PATCH 5/8] ksm
@ -14702,7 +14704,7 @@ index 860b2dcf3ac4..96fe36a6d0f5 100644
-- --
2.41.0 2.41.0
From 21d2dc84c885c791c47d30838a265cf6c532d567 Mon Sep 17 00:00:00 2001 From 3ca4e04f357011b4b6cc75ac320402d44b462097 Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev> From: Peter Jung <admin@ptr1337.dev>
Date: Thu, 1 Jun 2023 16:35:57 +0200 Date: Thu, 1 Jun 2023 16:35:57 +0200
Subject: [PATCH 6/8] sched Subject: [PATCH 6/8] sched
@ -15515,7 +15517,7 @@ index 6682535e37c8..ca4472281c28 100644
-- --
2.41.0 2.41.0
From de932d02ee465828c5f4902165e38d9fb74f7758 Mon Sep 17 00:00:00 2001 From 1eee00317d9f6bc1c9e8998dd3a5973a20300d29 Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev> From: Peter Jung <admin@ptr1337.dev>
Date: Wed, 14 Jun 2023 19:42:38 +0200 Date: Wed, 14 Jun 2023 19:42:38 +0200
Subject: [PATCH 7/8] vma Subject: [PATCH 7/8] vma
@ -15593,7 +15595,7 @@ index e4399983c50c..ef62ab2fd211 100644
if (!(fault & VM_FAULT_RETRY)) { if (!(fault & VM_FAULT_RETRY)) {
count_vm_vma_lock_event(VMA_LOCK_SUCCESS); count_vm_vma_lock_event(VMA_LOCK_SUCCESS);
diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c
index 0fd96d6e39ce..23c3a4ce45d9 100644 index 4e800bb7d2ab..11b24367dad7 100644
--- a/fs/userfaultfd.c --- a/fs/userfaultfd.c
+++ b/fs/userfaultfd.c +++ b/fs/userfaultfd.c
@@ -277,17 +277,17 @@ static inline struct uffd_msg userfault_msg(unsigned long address, @@ -277,17 +277,17 @@ static inline struct uffd_msg userfault_msg(unsigned long address,
@ -15758,7 +15760,7 @@ index 08328b5793b5..dae69cf0a7a3 100644
/* /*
diff --git a/mm/filemap.c b/mm/filemap.c diff --git a/mm/filemap.c b/mm/filemap.c
index b4c9bd368b7e..838955635fbc 100644 index 83dda76d1fc3..b53cea0c09a5 100644
--- a/mm/filemap.c --- a/mm/filemap.c
+++ b/mm/filemap.c +++ b/mm/filemap.c
@@ -1701,31 +1701,35 @@ static int __folio_lock_async(struct folio *folio, struct wait_page_queue *wait) @@ -1701,31 +1701,35 @@ static int __folio_lock_async(struct folio *folio, struct wait_page_queue *wait)
@ -16025,7 +16027,7 @@ index b76a65ac28b3..a3839de71f3f 100644
-- --
2.41.0 2.41.0
From 8af5970aac59ebe84af695501c91e8c7f2a1b91d Mon Sep 17 00:00:00 2001 From c7c87ceda937a30ab79f394b6cb2e758b5182891 Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev> From: Peter Jung <admin@ptr1337.dev>
Date: Tue, 9 May 2023 18:40:05 +0200 Date: Tue, 9 May 2023 18:40:05 +0200
Subject: [PATCH 8/8] zstd 1.5.5 Subject: [PATCH 8/8] zstd 1.5.5

View File

@ -1,6 +1,6 @@
From 74b3a8a51481e8c38adb4954398fc7325cf42634 Mon Sep 17 00:00:00 2001 From 5e3bbb489086974a823af55f23cc17d2ea032f8b Mon Sep 17 00:00:00 2001
From: Piotr Gorski <lucjan.lucjanov@gmail.com> From: Piotr Gorski <lucjan.lucjanov@gmail.com>
Date: Thu, 8 Jun 2023 10:59:00 +0200 Date: Sun, 18 Jun 2023 11:05:43 +0200
Subject: [PATCH] bore-eevdf Subject: [PATCH] bore-eevdf
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com> Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
@ -74,7 +74,7 @@ index 0147b4a33..4ab7e154b 100644
bool "Automatic process group scheduling" bool "Automatic process group scheduling"
select CGROUPS select CGROUPS
diff --git a/kernel/sched/core.c b/kernel/sched/core.c diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 3bcb77b00..c7ceffc14 100644 index 3bcb77b00..65469bc43 100644
--- a/kernel/sched/core.c --- a/kernel/sched/core.c
+++ b/kernel/sched/core.c +++ b/kernel/sched/core.c
@@ -4490,6 +4490,57 @@ int wake_up_state(struct task_struct *p, unsigned int state) @@ -4490,6 +4490,57 @@ int wake_up_state(struct task_struct *p, unsigned int state)
@ -161,7 +161,7 @@ index 3bcb77b00..c7ceffc14 100644
+#ifdef CONFIG_SCHED_BORE +#ifdef CONFIG_SCHED_BORE
+ sched_init_bore(); + sched_init_bore();
+ printk(KERN_INFO "BORE (Burst-Oriented Response Enhancer) CPU Scheduler modification 2.4.0 by Masahito Suzuki"); + printk(KERN_INFO "BORE (Burst-Oriented Response Enhancer) CPU Scheduler modification 2.4.1 by Masahito Suzuki");
+#endif // CONFIG_SCHED_BORE +#endif // CONFIG_SCHED_BORE
+ +
wait_bit_init(); wait_bit_init();
@ -190,7 +190,7 @@ index e7e83181f..c29500314 100644
SEQ_printf(m, " %d %d", task_node(p), task_numa_group_id(p)); SEQ_printf(m, " %d %d", task_node(p), task_numa_group_id(p));
#endif #endif
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 97678b9b4..b0acc7126 100644 index 97678b9b4..c3d632800 100644
--- a/kernel/sched/fair.c --- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c +++ b/kernel/sched/fair.c
@@ -19,6 +19,9 @@ @@ -19,6 +19,9 @@
@ -377,7 +377,7 @@ index 97678b9b4..b0acc7126 100644
delta = __calc_delta(delta, NICE_0_LOAD, &se->load); delta = __calc_delta(delta, NICE_0_LOAD, &se->load);
+#ifdef CONFIG_SCHED_BORE +#ifdef CONFIG_SCHED_BORE
+ if (bscale && sched_bore) delta = penalty_scale(delta, se); + if (bscale && likely(sched_bore)) delta = penalty_scale(delta, se);
+#endif // CONFIG_SCHED_BORE +#endif // CONFIG_SCHED_BORE
return delta; return delta;
} }
@ -462,7 +462,7 @@ index 97678b9b4..b0acc7126 100644
+{ +{
+ s64 gran, vdiff = curr->vruntime - se->vruntime; + s64 gran, vdiff = curr->vruntime - se->vruntime;
+#ifdef CONFIG_SCHED_BORE +#ifdef CONFIG_SCHED_BORE
+ if (sched_bore) { + if (likely(sched_bore)) {
+ u64 rtime = curr->sum_exec_runtime - curr->prev_sum_exec_runtime; + u64 rtime = curr->sum_exec_runtime - curr->prev_sum_exec_runtime;
+ vdiff += wakeup_preempt_backstep_delta(rtime, curr) + vdiff += wakeup_preempt_backstep_delta(rtime, curr)
+ - wakeup_preempt_backstep_delta(rtime, se); + - wakeup_preempt_backstep_delta(rtime, se);
@ -540,4 +540,4 @@ index 0ea13cfac..34cb2fbbb 100644
#ifdef CONFIG_SCHED_DEBUG #ifdef CONFIG_SCHED_DEBUG
extern int sysctl_resched_latency_warn_ms; extern int sysctl_resched_latency_warn_ms;
-- --
2.41.0.rc2 2.41.0

View File

@ -2,4 +2,4 @@
echo "Pika Kernel - Building" echo "Pika Kernel - Building"
make -j`nproc` bindeb-pkg LOCALVERSION=-pikaos KDEB_PKGVERSION=$(make kernelversion)-2 make -j`nproc` bindeb-pkg LOCALVERSION=-pikaos KDEB_PKGVERSION=$(make kernelversion)-1

View File

@ -2,7 +2,7 @@
echo "Pika Kernel - Getting source" echo "Pika Kernel - Getting source"
wget -nv https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/snapshot/linux-6.4-rc6.tar.gz wget -nv https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.4.tar.gz
tar -xf ./linux-6.4-rc6.tar.gz tar -xf ./linux-6.4.tar.gz
cd linux-6.4-rc6 cd linux-6.4