[prev in list] [next in list] [prev in thread] [next in thread] 

List:       swsusp-devel
Subject:    [Swsusp-devel] Incremental patch.
From:       Nigel Cunningham <ncunningham () clear ! net ! nz>
Date:       2003-06-28 10:08:10
[Download RAW message or body]

Hi all.

I'm not having a good time with this release. The incremental patch has
a problem that I've just noticed. It was prepared against a version that
has the bootsplash patch applied, with the result that the portion
against kernel/sysctl.c doesn't apply cleanly if you don't have the
bootsplash patch installed. The solution is easy. All the patch is doing
is deleting the two portions related to software suspend, so you should
be able to do this by hand. Failing that, here's a minipatch that does
the same thing for people without bootsplash...

--- 1.0-pre14/kernel/sysctl.c	2003-06-28 22:06:20.000000000 +1200
+++ 1.0-pre15/kernel/sysctl.c	2003-06-16 19:37:49.000000000 +1200
@@ -42,9 +42,6 @@
 /* External variables not in a header file. */
 extern int panic_timeout;
 extern int C_A_D;
-#ifdef CONFIG_SOFTWARE_SUSPEND
-extern int swsusp_state[];
-#endif
 extern int bdf_prm[], bdflush_min[], bdflush_max[];
 extern int sysctl_overcommit_memory;
 extern int max_threads;
@@ -201,14 +198,6 @@
 #endif
 	{KERN_CTLALTDEL, "ctrl-alt-del", &C_A_D, sizeof(int),
 	 0644, NULL, &proc_dointvec},
-#ifdef CONFIG_SOFTWARE_SUSPEND
-#ifdef CONFIG_SOFTWARE_SUSPEND_DEBUG
-	{KERN_SWSUSP, "swsusp", &swsusp_state, 6*sizeof(int),
-#else
-	{KERN_SWSUSP, "swsusp", &swsusp_state, 4*sizeof(int),
-#endif
-	 0644, NULL, &proc_dointvec},
-#endif
 	{KERN_PRINTK, "printk", &console_loglevel, 4*sizeof(int),
 	 0644, NULL, &proc_dointvec},
 #ifdef CONFIG_KMOD


-- 
Nigel Cunningham
495 St Georges Road South, Hastings 4201, New Zealand

You see, at just the right time, when we were still powerless,
Christ died for the ungodly.
	-- Romans 5:6, NIV.



-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100006ave/direct;at.asp_061203_01/01
_______________________________________________
swsusp-devel mailing list
swsusp-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/swsusp-devel
[prev in list] [next in list] [prev in thread] [next in thread]