Skip to contentSkip to conversation

swsusp: kill bogus wakeup warning

PATCH Pavel Machek 3 participants 3 messages Feb 21, 2003 – Feb 24, 2003 Memory management

lore
Share & tools
lore
#0 lore raw

Hi!

This kills 'bogus wakeup' warning from pdflush. Patch from Nigel, please apply.
Pavel

mm/pdflush.c +4 -2
@@ -103,9 +103,11 @@
 		my_work->when_i_went_to_sleep = jiffies;
 		spin_unlock_irq(&pdflush_lock);
 
-		if (current->flags & PF_FREEZE)
-			refrigerator(PF_IOTHREAD);
 		schedule();
+		if (current->flags & PF_FREEZE) {
+			refrigerator(PF_IOTHREAD);
+			continue;
+		}
 
 		spin_lock_irq(&pdflush_lock);
 		if (!list_empty(&my_work->list)) {
Signature · 2 lines
When do you have a heart between your knees?
[Johanka's followup: and *two* hearts?]
#1 lore raw

Re: swsusp and S3 fixes

Pavel,
your patch causes

arch/i386/kernel/dmi_scan.c:482: warning: reset_videobios_after_s3' defined but not used make[1]: warning: jobserver unavailable: using -j1. Add +' to parent make rule. arch/i386/kernel/built-in.o: In function `reset_videomode_after_s3':
arch/i386/kernel/built-in.o(.init.text+0x1e07): undefined reference to acpi_video_flags' arch/i386/kernel/built-in.o: In function reset_videobios_after_s3':
arch/i386/kernel/built-in.o(.init.text+0x1e17): undefined reference to `acpi_video_flags'
make: *** [.tmp_vmlinux1] Error 1

for me, with neither ACPI not SW_SUSPEND configured.

Don't call patches like this "trivial" if they haven't even been properly tested.

Linus

#2 lore raw

Re: swsusp and S3 fixes

Hi!

Quoted 10 lines

your patch causes

arch/i386/kernel/dmi_scan.c:482: warning: reset_videobios_after_s3' defined but not used make[1]: warning: jobserver unavailable: using -j1. Add +' to parent make rule. arch/i386/kernel/built-in.o: In function `reset_videomode_after_s3':
arch/i386/kernel/built-in.o(.init.text+0x1e07): undefined reference to acpi_video_flags' arch/i386/kernel/built-in.o: In function reset_videobios_after_s3':
arch/i386/kernel/built-in.o(.init.text+0x1e17): undefined reference to `acpi_video_flags'
make: *** [.tmp_vmlinux1] Error 1

Quoted 4 lines

for me, with neither ACPI not SW_SUSPEND configured.

Don't call patches like this "trivial" if they haven't even been properly tested.

I wanted to mail you a fix but I see its already fixed in bk tree. Sorry about that.
Pavel

Signature · 2 lines
Horseback riding is like software...
...vgf orggre jura vgf serr.