> These are only cleanups.
> Pavel
>
> Index: linux/kernel/suspend.c
> ===================================================================
> --- linux.orig/kernel/suspend.c 2003-07-22 13:39:43.000000000 +0200
> +++ linux/kernel/suspend.c 2003-07-22 13:46:26.000000000 +0200
> @@ -139,40 +139,45 @@
>
> static const char name_suspend[] = "Suspend Machine: ";
> static const char name_resume[] = "Resume Machine: ";
> #endif
>
> /*
> * Debug
> */
> -#define DEBUG_DEFAULT
> -#undef DEBUG_PROCESS
> +#undef DEBUG_DEFAULT
> #undef DEBUG_SLOW
> -#define TEST_SWSUSP 0 /* Set to 1 to reboot instead of halt machine after suspension */
> +#define TEST_SWSUSP 1 /* Set to 1 to reboot instead of halt machine after suspension */
This is not a cleanup, it changes behavior, so I didn't apply this first
part (since I had to make the other changes by hand anyway).
> @@ -283,17 +329,6 @@
This part was applied.
> @@ -906,7 +898,7 @@
> return;
>
> software_suspend_enabled = 0;
> - BUG_ON(in_interrupt());
> + BUG_ON(in_atomic());
> do_software_suspend();
> }
I replaced the BUG() with might_sleep(), since it will produce a stack
trace, and is a bit friendlier.
Thanks,
-pat
-
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 : Thu Aug 07 2003 - 22:00:26 EST