Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757879Ab0FBMUE (ORCPT ); Wed, 2 Jun 2010 08:20:04 -0400 Received: from crca.org.au ([74.207.252.120]:53206 "EHLO crca.org.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757845Ab0FBMUB (ORCPT ); Wed, 2 Jun 2010 08:20:01 -0400 X-Bogosity: Ham, spamicity=0.000000 From: Nigel Cunningham To: "Rafael J. Wysocki" , Linux PM , LKML , TuxOnIce-devel Subject: [PATCH 02/21] Hibernation: Move root_swap declaration. Date: Wed, 2 Jun 2010 22:19:01 +1000 Message-Id: <1275481160-31150-3-git-send-email-nigel@tuxonice.net> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1275481160-31150-1-git-send-email-nigel@tuxonice.net> References: <1275481160-31150-1-git-send-email-nigel@tuxonice.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 988 Lines: 37 Move the declaration of root_swap in preparation for the next patch. Signed-off-by: Nigel Cunningham --- kernel/power/swap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/kernel/power/swap.c b/kernel/power/swap.c index 829f7b4..e555b6c 100644 --- a/kernel/power/swap.c +++ b/kernel/power/swap.c @@ -63,6 +63,8 @@ struct swap_map_handle { unsigned int k; }; +static unsigned short root_swap = 0xffff; + struct swsusp_header { char reserved[PAGE_SIZE - 20 - sizeof(sector_t) - sizeof(int)]; sector_t image; @@ -217,7 +219,6 @@ int swsusp_swap_in_use(void) * General things */ -static unsigned short root_swap = 0xffff; struct block_device *hib_resume_bdev; /* -- 1.7.0.4 -- 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/