summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--disable-threading-in-compression-for-hibernate.patch17
-rw-r--r--kernel.spec9
2 files changed, 26 insertions, 0 deletions
diff --git a/disable-threading-in-compression-for-hibernate.patch b/disable-threading-in-compression-for-hibernate.patch
new file mode 100644
index 0000000..685c294
--- /dev/null
+++ b/disable-threading-in-compression-for-hibernate.patch
@@ -0,0 +1,17 @@
+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 8ac728b..8020c7d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -781,6 +781,9 @@ Patch21301: cifs-fix-dentry-refcount-leak-when-opening-a-FIFO.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
+
Patch21400: unhandled-irqs-switch-to-polling.patch
# compat-wireless patches
@@ -1509,6 +1512,9 @@ ApplyPatch cifs-fix-dentry-refcount-leak-when-opening-a-FIFO.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
# END OF PATCH APPLICATIONS
@@ -2382,6 +2388,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Mar 02 2012 Justin M. Forbes <jforbes@redhat.com>
+- Disable threading in hibernate compression/decompression
+
* Fri Mar 02 2012 Adam Jackson <ajax@redhat.com>
- drm-intel-crtc-dpms-fix.patch: Fix system hang on gen2 kit on DPMS (#730853)