diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-08-31 19:02:25 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-08-31 19:02:25 +0200 |
commit | 6fddf73d6b1009d82258d4269d7fb5a48b79a7c2 (patch) | |
tree | 698a9680a53246d366a732ea97dcfed582c4983f /patch-5.19-redhat.patch | |
parent | 4a4d6c80e9084e22b5aa9e7f46c6d485c35f5175 (diff) | |
parent | 62fb066ca38589437aa82fe9eda055b89291223e (diff) | |
download | kernel-6fddf73d6b1009d82258d4269d7fb5a48b79a7c2.tar.gz kernel-6fddf73d6b1009d82258d4269d7fb5a48b79a7c2.tar.xz kernel-6fddf73d6b1009d82258d4269d7fb5a48b79a7c2.zip |
Diffstat (limited to 'patch-5.19-redhat.patch')
-rw-r--r-- | patch-5.19-redhat.patch | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/patch-5.19-redhat.patch b/patch-5.19-redhat.patch index cc73ad29f..f5d5aee6a 100644 --- a/patch-5.19-redhat.patch +++ b/patch-5.19-redhat.patch @@ -16,6 +16,7 @@ arch/s390/kernel/ipl.c | 5 + arch/s390/kernel/setup.c | 4 + arch/x86/kernel/setup.c | 22 +- + block/genhd.c | 3 +- drivers/acpi/apei/hest.c | 8 + drivers/acpi/irq.c | 17 +- drivers/acpi/scan.c | 9 + @@ -58,7 +59,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 60 files changed, 1727 insertions(+), 313 deletions(-) + 61 files changed, 1729 insertions(+), 314 deletions(-) diff --git a/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml b/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml index e6485f7b046f..217c42874f41 100644 @@ -250,7 +251,7 @@ index 000000000000..733a26bd887a + +endmenu diff --git a/Makefile b/Makefile -index 65dc4f93ffdb..f305e434bc0c 100644 +index cb68101ea070..da893ccb2025 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -495,6 +496,27 @@ index bd6c6fd373ae..3333b08a778d 100644 reserve_initrd(); +diff --git a/block/genhd.c b/block/genhd.c +index 278227ba1d53..e0675772178b 100644 +--- a/block/genhd.c ++++ b/block/genhd.c +@@ -623,7 +623,6 @@ void del_gendisk(struct gendisk *disk) + * Prevent new I/O from crossing bio_queue_enter(). + */ + blk_queue_start_drain(q); +- blk_mq_freeze_queue_wait(q); + + if (!(disk->flags & GENHD_FL_HIDDEN)) { + sysfs_remove_link(&disk_to_dev(disk)->kobj, "bdi"); +@@ -647,6 +646,8 @@ void del_gendisk(struct gendisk *disk) + pm_runtime_set_memalloc_noio(disk_to_dev(disk), false); + device_del(disk_to_dev(disk)); + ++ blk_mq_freeze_queue_wait(q); ++ + blk_throtl_cancel_bios(disk->queue); + + blk_sync_queue(q); diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c index 6aef1ee5e1bd..8f146b1b4972 100644 --- a/drivers/acpi/apei/hest.c |