diff options
| -rw-r--r-- | disable-threading-in-compression-for-hibernate.patch | 17 | ||||
| -rw-r--r-- | kernel.spec | 9 |
2 files changed, 3 insertions, 23 deletions
diff --git a/disable-threading-in-compression-for-hibernate.patch b/disable-threading-in-compression-for-hibernate.patch deleted file mode 100644 index 685c294ef..000000000 --- a/disable-threading-in-compression-for-hibernate.patch +++ /dev/null @@ -1,17 +0,0 @@ -In attempt to find the cause of some of the hibernate issues we are seeing, -turn off threading for compression. - -Signed-off-by: Justin M. Forbes <jforbes@redhat.com> - -diff -ruNp a/kernel/power/swap.c b/kernel/power/swap.c ---- a/kernel/power/swap.c 2012-03-02 13:52:27.777485028 -0600 -+++ b/kernel/power/swap.c 2012-03-02 14:05:20.168115129 -0600 -@@ -401,7 +401,7 @@ static int swap_writer_finish(struct swa - #define LZO_CMP_SIZE (LZO_CMP_PAGES * PAGE_SIZE) - - /* Maximum number of threads for compression/decompression. */ --#define LZO_THREADS 3 -+#define LZO_THREADS 1 - - /* Maximum number of pages for read buffering. */ - #define LZO_READ_PAGES (MAP_PAGE_ENTRIES * 8) diff --git a/kernel.spec b/kernel.spec index e3ae5f7c3..f1b57966f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -772,9 +772,6 @@ Patch21300: ACPICA-Fix-regression-in-FADT-revision-checks.patch #rhbz 728478 Patch21302: sony-laptop-Enable-keyboard-backlight-by-default.patch -# Disable threading in hibernate compression -Patch21303: disable-threading-in-compression-for-hibernate.patch - #rhbz 803809 CVE-2012-1179 Patch21304: mm-thp-fix-pmd_bad-triggering.patch @@ -1482,9 +1479,6 @@ ApplyPatch ACPICA-Fix-regression-in-FADT-revision-checks.patch #rhbz 728478 ApplyPatch sony-laptop-Enable-keyboard-backlight-by-default.patch -#Disable threading in hibernate compression -ApplyPatch disable-threading-in-compression-for-hibernate.patch - ApplyPatch unhandled-irqs-switch-to-polling.patch ApplyPatch weird-root-dentry-name-debug.patch @@ -2350,6 +2344,9 @@ fi # ||----w | # || || %changelog +* Fri Mar 16 2012 Justin M. Forbes <jforbes@redhat.com> +- re-enable threading on hibernate compression/decompression + * Fri Mar 16 2012 Josh Boyer <jwboyer@redhat.com> - Fix irqpoll patch to really only apply for ASM108x machines (rhbz 800520) |