[TuxOnIce-devel] UserUI SVN: r1080 - trunk

[nigel at tuxonice.net]

Author: nigel
Date: 2009-12-19 07:23:54 +0000 (Sat, 19 Dec 2009)
New Revision: 1080

Modified:
   trunk/ChangeLog
   trunk/userui.h
Log:
Update userui.h to match the kernel code.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-12-08 23:17:24 UTC (rev 1079)
+++ trunk/ChangeLog	2009-12-19 07:23:54 UTC (rev 1080)
@@ -5,6 +5,7 @@
   - Make the backwards compatible fade_logo definition non-static, to avoid
     the static declaration of 'fade'logo' follows non-static declaration
     message Whoopie reported (thanks!).
+  - Update userui.h to make the kernel code.
 
 1.0 (1 April 2009)
   - Small changes in preparation for the 1.0 release, coinciding with

Modified: trunk/userui.h
===================================================================
--- trunk/userui.h	2009-12-08 23:17:24 UTC (rev 1079)
+++ trunk/userui.h	2009-12-19 07:23:54 UTC (rev 1080)
@@ -54,40 +54,35 @@
 enum {
 	SUSPEND_REBOOT,
 	SUSPEND_PAUSE,
-	SUSPEND_SLOW,
-	SUSPEND_NOPAGESET2,
 	SUSPEND_LOGALL,
 	SUSPEND_CAN_CANCEL,
 	SUSPEND_KEEP_IMAGE,
 	SUSPEND_FREEZER_TEST,
-	SUSPEND_FREEZER_TEST_SHOWALL,
 	SUSPEND_SINGLESTEP,
 	SUSPEND_PAUSE_NEAR_PAGESET_END,
-	SUSPEND_USE_ACPI_S4,
-	SUSPEND_KEEP_METADATA,
 	SUSPEND_TEST_FILTER_SPEED,
-	SUSPEND_FREEZE_TIMERS,
-	SUSPEND_DISABLE_SYSDEV_SUPPORT,
-	SUSPEND_VGA_POST
+	SUSPEND_TEST_BIO,
+	SUSPEND_NOPAGESET2,
+	SUSPEND_IGNORE_ROOTFS,
+	SUSPEND_REPLACE_SWSUSP,
+	SUSPEND_PAGESET2_FULL,
+	SUSPEND_ABORT_ON_RESAVE_NEEDED,
+	SUSPEND_NO_MULTITHREADED_IO,
+	SUSPEND_NO_DIRECT_LOAD,
+	SUSPEND_LATE_CPU_HUTPLUG,
+	SUSPEND_GET_MAX_MEM_ALLOCD,
+	SUSPEND_NO_FLUSHER_THREAD,
+	SUSPEND_NO_PS2_IF_NEEDED
 };
 
 /* Debug sections  - if debugging compiled in */
 enum {
 	SUSPEND_ANY_SECTION,
-	SUSPEND_FREEZER,
 	SUSPEND_EAT_MEMORY,
-	SUSPEND_PAGESETS,
 	SUSPEND_IO,
-	SUSPEND_BMAP,
 	SUSPEND_HEADER,
 	SUSPEND_WRITER,
 	SUSPEND_MEMORY,
-	SUSPEND_EXTENTS,
-	SUSPEND_SPINLOCKS,
-	SUSPEND_MEM_POOL,
-	SUSPEND_RANGE_PARANOIA,
-	SUSPEND_NOSAVE,
-	SUSPEND_INTEGRITY
 };
 
 /* excerpts from include/linux/bitops.h */