2003-05-29 22:23:54

by Andy Pfiffer

[permalink] [raw]
Subject: [2.5.70][PATCH][TRIVIAL] kernel/suspend.c : eliminate 2 compile time warnings

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or
higher.
# This patch includes the following deltas:
# ChangeSet 1.1429 -> 1.1430
# kernel/suspend.c 1.39 -> 1.40
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/05/29 [email protected] 1.1430
# Remove compile-time warnings.
# --------------------------------------------
#
diff -Nru a/kernel/suspend.c b/kernel/suspend.c
--- a/kernel/suspend.c Thu May 29 15:16:34 2003
+++ b/kernel/suspend.c Thu May 29 15:16:34 2003
@@ -95,9 +95,11 @@
/* Variables to be preserved over suspend */
static int new_loglevel = 7;
static int orig_loglevel = 0;
-static int orig_fgconsole, orig_kmsg;
static int pagedir_order_check;
static int nr_copy_pages_check;
+#ifdef CONFIG_VT
+static int orig_fgconsole, orig_kmsg;
+#endif

static int resume_status = 0;
static char resume_file[256] = ""; /* For resume= kernel option */