Hi!
Adding missing prototypes / changing code not to need
prototypes. Please apply,
Pavel
--- clean/arch/i386/kernel/suspend.c Wed Jun 26 20:18:53 2002
+++ linux-swsusp/arch/i386/kernel/suspend.c Wed Jun 12 08:39:31 2002
@@ -97,6 +97,14 @@
asm volatile ("pushfl ; popl (%0)" : "=m" (saved_context.eflags));
}
+static void
+do_fpu_end(void)
+{
+ /* restore FPU regs if necessary */
+ /* Do it out of line so that gcc does not move cr0 load to some stupid place */
+ kernel_fpu_end();
+}
+
/*
* restore_processor_context
*
@@ -220,13 +228,6 @@
}
-static void
-do_fpu_end(void)
-{
- /* restore FPU regs if necessary */
- /* Do it out of line so that gcc does not move cr0 load to some stupid place */
- kernel_fpu_end();
-}
#ifdef CONFIG_SOFTWARE_SUSPEND
/* Local variables for do_magic */
--- clean/include/asm-i386/suspend.h Mon Jun 10 17:17:48 2002
+++ linux-swsusp/include/asm-i386/suspend.h Wed Jun 12 08:42:43 2002
@@ -38,7 +38,6 @@
: /* no output */ \
:"r" ((thread)->debugreg[register]))
-extern void do_fpu_end(void);
extern void fix_processor_context(void);
extern void do_magic(int resume);
--- clean/include/linux/suspend.h Wed Jun 26 20:19:08 2002
+++ linux-swsusp/include/linux/suspend.h Wed Jun 12 08:43:51 2002
@@ -56,9 +56,22 @@
extern int unregister_suspend_notifier(struct notifier_block *);
extern void refrigerator(unsigned long);
+extern int freeze_processes(void);
+extern void thaw_processes(void);
+
extern unsigned int nr_copy_pages __nosavedata;
extern suspend_pagedir_t *pagedir_nosave __nosavedata;
+/* Communication between kernel/suspend.c and arch/i386/suspend.c */
+
+extern void do_magic_resume_1(void);
+extern void do_magic_resume_2(void);
+extern void do_magic_suspend_1(void);
+extern void do_magic_suspend_2(void);
+
+/* Communication between acpi and arch/i386/suspend.c */
+
+extern void do_suspend_lowlevel(int resume);
#else
#define software_suspend() do { } while(0)
-- Casualities in World Trade Center: ~3k dead inside the building, cryptography in U.S.A. and free speech in Czech Republic. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sun Jun 30 2002 - 22:00:11 EST