2010-02-19 22:53:45

by Jiri Slaby

[permalink] [raw]
Subject: [PATCH 1/1] PM / Hibernate: remove swsusp.c

Its contents and entry in Makefile were already removed in
8e60c6a1348e17e68ad73589a52a03876e7059be
(Shift remaining code from swsusp.c to hibernate.c)
but somehow it remained in-place.

Signed-off-by: Jiri Slaby <[email protected]>
Cc: Nigel Cunningham <[email protected]>
Cc: Rafael J. Wysocki <[email protected]>
---
kernel/power/swsusp.c | 58 -------------------------------------------------
1 files changed, 0 insertions(+), 58 deletions(-)
delete mode 100644 kernel/power/swsusp.c

diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
deleted file mode 100644
index 5b3601b..0000000
--- a/kernel/power/swsusp.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * linux/kernel/power/swsusp.c
- *
- * This file provides code to write suspend image to swap and read it back.
- *
- * Copyright (C) 1998-2001 Gabor Kuti <[email protected]>
- * Copyright (C) 1998,2001-2005 Pavel Machek <[email protected]>
- *
- * This file is released under the GPLv2.
- *
- * I'd like to thank the following people for their work:
- *
- * Pavel Machek <[email protected]>:
- * Modifications, defectiveness pointing, being with me at the very beginning,
- * suspend to swap space, stop all tasks. Port to 2.4.18-ac and 2.5.17.
- *
- * Steve Doddi <[email protected]>:
- * Support the possibility of hardware state restoring.
- *
- * Raph <[email protected]>:
- * Support for preserving states of network devices and virtual console
- * (including X and svgatextmode)
- *
- * Kurt Garloff <[email protected]>:
- * Straightened the critical function in order to prevent compilers from
- * playing tricks with local variables.
- *
- * Andreas Mohr <[email protected]>
- *
- * Alex Badea <[email protected]>:
- * Fixed runaway init
- *
- * Rafael J. Wysocki <[email protected]>
- * Reworked the freeing of memory and the handling of swap
- *
- * More state savers are welcome. Especially for the scsi layer...
- *
- * For TODOs,FIXMEs also look in Documentation/power/swsusp.txt
- */
-
-#include <linux/mm.h>
-#include <linux/suspend.h>
-#include <linux/spinlock.h>
-#include <linux/kernel.h>
-#include <linux/major.h>
-#include <linux/swap.h>
-#include <linux/pm.h>
-#include <linux/swapops.h>
-#include <linux/bootmem.h>
-#include <linux/syscalls.h>
-#include <linux/highmem.h>
-#include <linux/time.h>
-#include <linux/rbtree.h>
-#include <linux/io.h>
-
-#include "power.h"
-
-int in_suspend __nosavedata = 0;
--
1.7.0


2010-02-19 23:02:25

by Nigel Cunningham

[permalink] [raw]
Subject: Re: [PATCH 1/1] PM / Hibernate: remove swsusp.c

Hi.

Jiri Slaby wrote:
> Its contents and entry in Makefile were already removed in
> 8e60c6a1348e17e68ad73589a52a03876e7059be
> (Shift remaining code from swsusp.c to hibernate.c)
> but somehow it remained in-place.
>
> Signed-off-by: Jiri Slaby <[email protected]>
> Cc: Nigel Cunningham <[email protected]>
> Cc: Rafael J. Wysocki <[email protected]>

Yeah. The version that was actually committed was different to the patch
I sent.

Acked-by: Nigel Cunningham <[email protected]>