Skip to contentSkip to conversation

Fix swsusp in 2.4.19-pre7-ac2 (fwd)

PATCH New Pavel Machek 1 participant 1 message Apr 20, 2002 Documentation

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix swsusp in 2.4.19-pre7-ac2 (fwd)

Hi!

Important fix was somehow lost in the noise. The init/main.c part is vital; it crashes on boot without that. Other pars are introducing of documentation and killing some unneccessary debugging.

Please apply,
Pavel

init/main.c +4 -4
@@ -524,15 +524,15 @@
 	tc_init();
 #endif
 
-	/* This has to be before mounting root, because even readonly mount of reiserfs would replay
-	   log corrupting stuff */
-	software_resume();
-
 	/* Networking initialization needs a process context */ 
 	sock_init();
 
 	start_context_thread();
 	do_initcalls();
+
+	/* This has to be before mounting root, because even readonly mount of reiserfs would replay
+	   log corrupting stuff */
+	software_resume();
 
 #ifdef CONFIG_IRDA
 	irda_proto_init();
Documentation/swsusp.txt +159 -0

159 lines not on this page · raw message

include/asm-i386/suspend.h +0 -8
@@ -123,17 +123,13 @@
 	int nr = smp_processor_id();
 	struct tss_struct * t = &init_tss[nr];
 
-	printk("Tss desc..."); mdelay(1000);
 	set_tss_desc(nr,t);	/* This just modifies memory; should not be neccessary. But... This is neccessary, because 386 hardware has concept of busy tsc or some similar stupidity. */
         gdt_table[__TSS(nr)].b &= 0xfffffdff;
 
-	printk("Tr..."); mdelay(1000);
 	load_TR(nr);		/* This does ltr */
 
-	printk("LDT..."); mdelay(1000);
 	load_LDT(current->active_mm);	/* This does lldt */
 
-	printk("Debug..."); mdelay(1000);
 	/*
 	 * Now maybe reload the debug registers
 	 */
@@ -154,7 +150,6 @@
 {
         /* restore FPU regs if necessary */
 	/* Do it out of line so that gcc does not move cr0 load to some stupid place */
-	printk("FPU..."); mdelay(1000);
         kernel_fpu_end();
 }
 
@@ -223,12 +218,9 @@
 	asm volatile ("lldt (%0)" :: "m" (saved_context.ldt));
 
 #if 0
-	printk("Reloading old TR..."); mdelay(1000);
-
 	asm volatile ("ltr (%0)"  :: "m" (saved_context.tr));
 #endif
 
-	printk("Calling fix_processor_context..."); mdelay(1000);
 	fix_processor_context();
 
 	/*
kernel/suspend.c +0 -14
@@ -32,20 +32,6 @@
  * More state savers are welcome. Especially for the scsi layer...
  *
  * For TODOs,FIXMEs also look in Documentation/swsusp.txt
- *
- * BIG FAT WARNING *********************************************************
- *
- * If you have unsupported (*) devices using DMA...
- *				...say goodbye to your data.
- *
- * If you touch anything on disk between suspend and resume...
- *				...kiss your data goodbye.
- *
- * If your disk driver does not support suspend... (IDE does)
- *				...you'd better find out how to get along
- *				   without your data.
- *
- * (*) pm interface support is needed to make it safe.
  */
 
 /*
Signature · 2 lines
(about SSSCA) "I don't say this lightly.  However, I really think that the U.S.
no longer is classifiable as a democracy, but rather as a plutocracy." --hpa