summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--kernels/linux-libre-grsec-knock/0001-4.4-revert-btrfs.patch78
-rw-r--r--kernels/linux-libre-grsec-knock/0001-4.4-revert-xfs.patch39
-rw-r--r--kernels/linux-libre-grsec-knock/PKGBUILD8
-rw-r--r--libre/linux-libre-grsec/0001-4.4-revert-btrfs.patch78
-rw-r--r--libre/linux-libre-grsec/0001-4.4-revert-xfs.patch39
-rw-r--r--libre/linux-libre-grsec/PKGBUILD8
6 files changed, 0 insertions, 250 deletions
diff --git a/kernels/linux-libre-grsec-knock/0001-4.4-revert-btrfs.patch b/kernels/linux-libre-grsec-knock/0001-4.4-revert-btrfs.patch
deleted file mode 100644
index 4b56e242e..000000000
--- a/kernels/linux-libre-grsec-knock/0001-4.4-revert-btrfs.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 80ad623edd2d0ccb47d85357ee31c97e6c684e82 Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.com>
-Date: Mon, 25 Jan 2016 11:02:06 +0100
-Subject: Revert "btrfs: clear PF_NOFREEZE in cleaner_kthread()"
-
-This reverts commit 696249132158014d594896df3a81390616069c5c. The
-cleaner thread can block freezing when there's a snapshot cleaning in
-progress and the other threads get suspended first. From the logs
-provided by Martin we're waiting for reading extent pages:
-
-kernel: PM: Syncing filesystems ... done.
-kernel: Freezing user space processes ... (elapsed 0.015 seconds) done.
-kernel: Freezing remaining freezable tasks ...
-kernel: Freezing of tasks failed after 20.003 seconds (1 tasks refusing to freeze, wq_busy=0):
-kernel: btrfs-cleaner D ffff88033dd13bc0 0 152 2 0x00000000
-kernel: ffff88032ebc2e00 ffff88032e750000 ffff88032e74fa50 7fffffffffffffff
-kernel: ffffffff814a58df 0000000000000002 ffffea000934d580 ffffffff814a5451
-kernel: 7fffffffffffffff ffffffff814a6e8f 0000000000000000 0000000000000020
-kernel: Call Trace:
-kernel: [<ffffffff814a58df>] ? bit_wait+0x2c/0x2c
-kernel: [<ffffffff814a5451>] ? schedule+0x6f/0x7c
-kernel: [<ffffffff814a6e8f>] ? schedule_timeout+0x2f/0xd8
-kernel: [<ffffffff81076f94>] ? timekeeping_get_ns+0xa/0x2e
-kernel: [<ffffffff81077603>] ? ktime_get+0x36/0x44
-kernel: [<ffffffff814a4f6c>] ? io_schedule_timeout+0x94/0xf2
-kernel: [<ffffffff814a4f6c>] ? io_schedule_timeout+0x94/0xf2
-kernel: [<ffffffff814a590b>] ? bit_wait_io+0x2c/0x30
-kernel: [<ffffffff814a5694>] ? __wait_on_bit+0x41/0x73
-kernel: [<ffffffff8109eba8>] ? wait_on_page_bit+0x6d/0x72
-kernel: [<ffffffff8105d718>] ? autoremove_wake_function+0x2a/0x2a
-kernel: [<ffffffff811a02d7>] ? read_extent_buffer_pages+0x1bd/0x203
-kernel: [<ffffffff8117d9e9>] ? free_root_pointers+0x4c/0x4c
-kernel: [<ffffffff8117e831>] ? btree_read_extent_buffer_pages.constprop.57+0x5a/0xe9
-kernel: [<ffffffff8117f4f3>] ? read_tree_block+0x2d/0x45
-kernel: [<ffffffff8116782a>] ? read_block_for_search.isra.34+0x22a/0x26b
-kernel: [<ffffffff811656c3>] ? btrfs_set_path_blocking+0x1e/0x4a
-kernel: [<ffffffff8116919b>] ? btrfs_search_slot+0x648/0x736
-kernel: [<ffffffff81170559>] ? btrfs_lookup_extent_info+0xb7/0x2c7
-kernel: [<ffffffff81170ee5>] ? walk_down_proc+0x9c/0x1ae
-kernel: [<ffffffff81171c9d>] ? walk_down_tree+0x40/0xa4
-kernel: [<ffffffff8117375f>] ? btrfs_drop_snapshot+0x2da/0x664
-kernel: [<ffffffff8104ff21>] ? finish_task_switch+0x126/0x167
-kernel: [<ffffffff811850f8>] ? btrfs_clean_one_deleted_snapshot+0xa6/0xb0
-kernel: [<ffffffff8117eaba>] ? cleaner_kthread+0x13e/0x17b
-kernel: [<ffffffff8117e97c>] ? btrfs_item_end+0x33/0x33
-kernel: [<ffffffff8104d256>] ? kthread+0x95/0x9d
-kernel: [<ffffffff8104d1c1>] ? kthread_parkme+0x16/0x16
-kernel: [<ffffffff814a7b5f>] ? ret_from_fork+0x3f/0x70
-kernel: [<ffffffff8104d1c1>] ? kthread_parkme+0x16/0x16
-
-As this affects a released kernel (4.4) we need a minimal fix for
-stable kernels.
-
-Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=108361
-Reported-by: Martin Ziegler <ziegler@uni-freiburg.de>
-CC: stable@vger.kernel.org # 4.4
-CC: Jiri Kosina <jkosina@suse.cz>
-Signed-off-by: David Sterba <dsterba@suse.com>
-Signed-off-by: Chris Mason <clm@fb.com>
----
- fs/btrfs/disk-io.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
-index 26ef141..404e894 100644
---- a/fs/btrfs/disk-io.c
-+++ b/fs/btrfs/disk-io.c
-@@ -1787,7 +1787,6 @@ static int cleaner_kthread(void *arg)
- int again;
- struct btrfs_trans_handle *trans;
-
-- set_freezable();
- do {
- again = 0;
-
---
-cgit v0.12
-
diff --git a/kernels/linux-libre-grsec-knock/0001-4.4-revert-xfs.patch b/kernels/linux-libre-grsec-knock/0001-4.4-revert-xfs.patch
deleted file mode 100644
index 93eb1929f..000000000
--- a/kernels/linux-libre-grsec-knock/0001-4.4-revert-xfs.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 3e85286e75224fa3f08bdad20e78c8327742634e Mon Sep 17 00:00:00 2001
-From: Dave Chinner <david@fromorbit.com>
-Date: Tue, 19 Jan 2016 08:21:46 +1100
-Subject: Revert "xfs: clear PF_NOFREEZE for xfsaild kthread"
-
-This reverts commit 24ba16bb3d499c49974669cd8429c3e4138ab102 as it
-prevents machines from suspending. This regression occurs when the
-xfsaild is idle on entry to suspend, and so there s no activity to
-wake it from it's idle sleep and hence see that it is supposed to
-freeze. Hence the freezer times out waiting for it and suspend is
-cancelled.
-
-There is no obvious fix for this short of freezing the filesystem
-properly, so revert this change for now.
-
-cc: <stable@vger.kernel.org> # 4.4
-Signed-off-by: Dave Chinner <david@fromorbit.com>
-Acked-by: Jiri Kosina <jkosina@suse.cz>
-Reviewed-by: Brian Foster <bfoster@redhat.com>
-Signed-off-by: Dave Chinner <david@fromorbit.com>
----
- fs/xfs/xfs_trans_ail.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c
-index aa67339..4f18fd9 100644
---- a/fs/xfs/xfs_trans_ail.c
-+++ b/fs/xfs/xfs_trans_ail.c
-@@ -497,7 +497,6 @@ xfsaild(
- long tout = 0; /* milliseconds */
-
- current->flags |= PF_MEMALLOC;
-- set_freezable();
-
- while (!kthread_should_stop()) {
- if (tout && tout <= 20)
---
-cgit v0.12
-
diff --git a/kernels/linux-libre-grsec-knock/PKGBUILD b/kernels/linux-libre-grsec-knock/PKGBUILD
index e9c4d6634..f4b02da09 100644
--- a/kernels/linux-libre-grsec-knock/PKGBUILD
+++ b/kernels/linux-libre-grsec-knock/PKGBUILD
@@ -53,8 +53,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
# standard config files for mkinitcpio ramdisk
'linux.preset'
'change-default-console-loglevel.patch'
- '0001-4.4-revert-btrfs.patch'
- '0001-4.4-revert-xfs.patch'
'0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch'
'0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch'
# armv7h patches
@@ -88,8 +86,6 @@ sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0'
'5d412c1c1992979b37d4980cc8a930d806ed1cf05d5341cdeda27596800df718'
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
- '51586b733e9f178bebe577258b6057b035eded516ffe8bf8bbb26cb0b26c4958'
- 'ffbfaa192d17bfc7c6293aa9a07efe57f65177051ae3d8033d5e45a7bca2e0ad'
'61370b766e0c60b407c29d2c44b3f55fc352e9049c448bc8fcddb0efc53e42fc'
'3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808'
'5a8d8fe270a5423fb5f712aebf55d367906a8f44f1ca343341ab67619479a319'
@@ -158,10 +154,6 @@ prepare() {
# add latest fixes from stable queue, if needed
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
- # #47757 fix broken suspend from btrfs and xfs
- patch -Np1 -i "${srcdir}/0001-4.4-revert-xfs.patch"
- patch -Np1 -i "${srcdir}/0001-4.4-revert-btrfs.patch"
-
# set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
# remove this when a Kconfig knob is made available by upstream
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
diff --git a/libre/linux-libre-grsec/0001-4.4-revert-btrfs.patch b/libre/linux-libre-grsec/0001-4.4-revert-btrfs.patch
deleted file mode 100644
index 4b56e242e..000000000
--- a/libre/linux-libre-grsec/0001-4.4-revert-btrfs.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 80ad623edd2d0ccb47d85357ee31c97e6c684e82 Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.com>
-Date: Mon, 25 Jan 2016 11:02:06 +0100
-Subject: Revert "btrfs: clear PF_NOFREEZE in cleaner_kthread()"
-
-This reverts commit 696249132158014d594896df3a81390616069c5c. The
-cleaner thread can block freezing when there's a snapshot cleaning in
-progress and the other threads get suspended first. From the logs
-provided by Martin we're waiting for reading extent pages:
-
-kernel: PM: Syncing filesystems ... done.
-kernel: Freezing user space processes ... (elapsed 0.015 seconds) done.
-kernel: Freezing remaining freezable tasks ...
-kernel: Freezing of tasks failed after 20.003 seconds (1 tasks refusing to freeze, wq_busy=0):
-kernel: btrfs-cleaner D ffff88033dd13bc0 0 152 2 0x00000000
-kernel: ffff88032ebc2e00 ffff88032e750000 ffff88032e74fa50 7fffffffffffffff
-kernel: ffffffff814a58df 0000000000000002 ffffea000934d580 ffffffff814a5451
-kernel: 7fffffffffffffff ffffffff814a6e8f 0000000000000000 0000000000000020
-kernel: Call Trace:
-kernel: [<ffffffff814a58df>] ? bit_wait+0x2c/0x2c
-kernel: [<ffffffff814a5451>] ? schedule+0x6f/0x7c
-kernel: [<ffffffff814a6e8f>] ? schedule_timeout+0x2f/0xd8
-kernel: [<ffffffff81076f94>] ? timekeeping_get_ns+0xa/0x2e
-kernel: [<ffffffff81077603>] ? ktime_get+0x36/0x44
-kernel: [<ffffffff814a4f6c>] ? io_schedule_timeout+0x94/0xf2
-kernel: [<ffffffff814a4f6c>] ? io_schedule_timeout+0x94/0xf2
-kernel: [<ffffffff814a590b>] ? bit_wait_io+0x2c/0x30
-kernel: [<ffffffff814a5694>] ? __wait_on_bit+0x41/0x73
-kernel: [<ffffffff8109eba8>] ? wait_on_page_bit+0x6d/0x72
-kernel: [<ffffffff8105d718>] ? autoremove_wake_function+0x2a/0x2a
-kernel: [<ffffffff811a02d7>] ? read_extent_buffer_pages+0x1bd/0x203
-kernel: [<ffffffff8117d9e9>] ? free_root_pointers+0x4c/0x4c
-kernel: [<ffffffff8117e831>] ? btree_read_extent_buffer_pages.constprop.57+0x5a/0xe9
-kernel: [<ffffffff8117f4f3>] ? read_tree_block+0x2d/0x45
-kernel: [<ffffffff8116782a>] ? read_block_for_search.isra.34+0x22a/0x26b
-kernel: [<ffffffff811656c3>] ? btrfs_set_path_blocking+0x1e/0x4a
-kernel: [<ffffffff8116919b>] ? btrfs_search_slot+0x648/0x736
-kernel: [<ffffffff81170559>] ? btrfs_lookup_extent_info+0xb7/0x2c7
-kernel: [<ffffffff81170ee5>] ? walk_down_proc+0x9c/0x1ae
-kernel: [<ffffffff81171c9d>] ? walk_down_tree+0x40/0xa4
-kernel: [<ffffffff8117375f>] ? btrfs_drop_snapshot+0x2da/0x664
-kernel: [<ffffffff8104ff21>] ? finish_task_switch+0x126/0x167
-kernel: [<ffffffff811850f8>] ? btrfs_clean_one_deleted_snapshot+0xa6/0xb0
-kernel: [<ffffffff8117eaba>] ? cleaner_kthread+0x13e/0x17b
-kernel: [<ffffffff8117e97c>] ? btrfs_item_end+0x33/0x33
-kernel: [<ffffffff8104d256>] ? kthread+0x95/0x9d
-kernel: [<ffffffff8104d1c1>] ? kthread_parkme+0x16/0x16
-kernel: [<ffffffff814a7b5f>] ? ret_from_fork+0x3f/0x70
-kernel: [<ffffffff8104d1c1>] ? kthread_parkme+0x16/0x16
-
-As this affects a released kernel (4.4) we need a minimal fix for
-stable kernels.
-
-Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=108361
-Reported-by: Martin Ziegler <ziegler@uni-freiburg.de>
-CC: stable@vger.kernel.org # 4.4
-CC: Jiri Kosina <jkosina@suse.cz>
-Signed-off-by: David Sterba <dsterba@suse.com>
-Signed-off-by: Chris Mason <clm@fb.com>
----
- fs/btrfs/disk-io.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
-index 26ef141..404e894 100644
---- a/fs/btrfs/disk-io.c
-+++ b/fs/btrfs/disk-io.c
-@@ -1787,7 +1787,6 @@ static int cleaner_kthread(void *arg)
- int again;
- struct btrfs_trans_handle *trans;
-
-- set_freezable();
- do {
- again = 0;
-
---
-cgit v0.12
-
diff --git a/libre/linux-libre-grsec/0001-4.4-revert-xfs.patch b/libre/linux-libre-grsec/0001-4.4-revert-xfs.patch
deleted file mode 100644
index 93eb1929f..000000000
--- a/libre/linux-libre-grsec/0001-4.4-revert-xfs.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 3e85286e75224fa3f08bdad20e78c8327742634e Mon Sep 17 00:00:00 2001
-From: Dave Chinner <david@fromorbit.com>
-Date: Tue, 19 Jan 2016 08:21:46 +1100
-Subject: Revert "xfs: clear PF_NOFREEZE for xfsaild kthread"
-
-This reverts commit 24ba16bb3d499c49974669cd8429c3e4138ab102 as it
-prevents machines from suspending. This regression occurs when the
-xfsaild is idle on entry to suspend, and so there s no activity to
-wake it from it's idle sleep and hence see that it is supposed to
-freeze. Hence the freezer times out waiting for it and suspend is
-cancelled.
-
-There is no obvious fix for this short of freezing the filesystem
-properly, so revert this change for now.
-
-cc: <stable@vger.kernel.org> # 4.4
-Signed-off-by: Dave Chinner <david@fromorbit.com>
-Acked-by: Jiri Kosina <jkosina@suse.cz>
-Reviewed-by: Brian Foster <bfoster@redhat.com>
-Signed-off-by: Dave Chinner <david@fromorbit.com>
----
- fs/xfs/xfs_trans_ail.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c
-index aa67339..4f18fd9 100644
---- a/fs/xfs/xfs_trans_ail.c
-+++ b/fs/xfs/xfs_trans_ail.c
-@@ -497,7 +497,6 @@ xfsaild(
- long tout = 0; /* milliseconds */
-
- current->flags |= PF_MEMALLOC;
-- set_freezable();
-
- while (!kthread_should_stop()) {
- if (tout && tout <= 20)
---
-cgit v0.12
-
diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD
index 21461f6f4..da974e663 100644
--- a/libre/linux-libre-grsec/PKGBUILD
+++ b/libre/linux-libre-grsec/PKGBUILD
@@ -48,8 +48,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
# standard config files for mkinitcpio ramdisk
'linux.preset'
'change-default-console-loglevel.patch'
- '0001-4.4-revert-btrfs.patch'
- '0001-4.4-revert-xfs.patch'
'0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch'
'0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch'
# armv7h patches
@@ -81,8 +79,6 @@ sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0'
'7ae63e764048587ad5e78adee9cc4a0e9c77e0ff6aeb8391aa8f83f899d7a2d3'
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
- '51586b733e9f178bebe577258b6057b035eded516ffe8bf8bbb26cb0b26c4958'
- 'ffbfaa192d17bfc7c6293aa9a07efe57f65177051ae3d8033d5e45a7bca2e0ad'
'61370b766e0c60b407c29d2c44b3f55fc352e9049c448bc8fcddb0efc53e42fc'
'3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808'
'5a8d8fe270a5423fb5f712aebf55d367906a8f44f1ca343341ab67619479a319'
@@ -147,10 +143,6 @@ prepare() {
# add latest fixes from stable queue, if needed
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
- # #47757 fix broken suspend from btrfs and xfs
- patch -Np1 -i "${srcdir}/0001-4.4-revert-xfs.patch"
- patch -Np1 -i "${srcdir}/0001-4.4-revert-btrfs.patch"
-
# set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
# remove this when a Kconfig knob is made available by upstream
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-18 12:13:09 +0000