aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-10-30 17:59:58 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-30 20:37:14 -0500
commit96bc7aec20b50761822f96130127b8e31e168af1 (patch)
treef1bb9562fcec1764a39b1b01423770d4ddbcc1dc /kernel
parent2c1b4a5ca48831595979a850f40ced8e7da026f8 (diff)
[PATCH] swsusp: remove unneccessary includes
Cleanup comments and remove unneccessary includes. Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/snapshot.c25
-rw-r--r--kernel/power/swsusp.c9
2 files changed, 3 insertions, 31 deletions
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index 84e686bdb40b..b4a923e59bc5 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -1,8 +1,7 @@
1/* 1/*
2 * linux/kernel/power/swsusp.c 2 * linux/kernel/power/snapshot.c
3 * 3 *
4 * This file is to realize architecture-independent 4 * This file provide system snapshot/restore functionality.
5 * machine suspend feature using pretty near only high-level routines
6 * 5 *
7 * Copyright (C) 1998-2005 Pavel Machek <pavel@suse.cz> 6 * Copyright (C) 1998-2005 Pavel Machek <pavel@suse.cz>
8 * 7 *
@@ -15,30 +14,16 @@
15#include <linux/mm.h> 14#include <linux/mm.h>
16#include <linux/suspend.h> 15#include <linux/suspend.h>
17#include <linux/smp_lock.h> 16#include <linux/smp_lock.h>
18#include <linux/file.h>
19#include <linux/utsname.h>
20#include <linux/version.h>
21#include <linux/delay.h> 17#include <linux/delay.h>
22#include <linux/reboot.h>
23#include <linux/bitops.h> 18#include <linux/bitops.h>
24#include <linux/vt_kern.h>
25#include <linux/kbd_kern.h>
26#include <linux/keyboard.h>
27#include <linux/spinlock.h> 19#include <linux/spinlock.h>
28#include <linux/genhd.h>
29#include <linux/kernel.h> 20#include <linux/kernel.h>
30#include <linux/major.h>
31#include <linux/swap.h>
32#include <linux/pm.h> 21#include <linux/pm.h>
33#include <linux/device.h> 22#include <linux/device.h>
34#include <linux/buffer_head.h>
35#include <linux/swapops.h>
36#include <linux/bootmem.h> 23#include <linux/bootmem.h>
37#include <linux/syscalls.h> 24#include <linux/syscalls.h>
38#include <linux/console.h> 25#include <linux/console.h>
39#include <linux/highmem.h> 26#include <linux/highmem.h>
40#include <linux/bio.h>
41#include <linux/mount.h>
42 27
43#include <asm/uaccess.h> 28#include <asm/uaccess.h>
44#include <asm/mmu_context.h> 29#include <asm/mmu_context.h>
@@ -46,15 +31,9 @@
46#include <asm/tlbflush.h> 31#include <asm/tlbflush.h>
47#include <asm/io.h> 32#include <asm/io.h>
48 33
49#include <linux/random.h>
50#include <linux/crypto.h>
51#include <asm/scatterlist.h>
52
53#include "power.h" 34#include "power.h"
54 35
55 36
56
57
58#ifdef CONFIG_HIGHMEM 37#ifdef CONFIG_HIGHMEM
59struct highmem_page { 38struct highmem_page {
60 char *data; 39 char *data;
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index 50667f4f3a2b..ae8425b69b44 100644
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -1,8 +1,7 @@
1/* 1/*
2 * linux/kernel/power/swsusp.c 2 * linux/kernel/power/swsusp.c
3 * 3 *
4 * This file is to realize architecture-independent 4 * This file provides code to write suspend image to swap and read it back.
5 * machine suspend feature using pretty near only high-level routines
6 * 5 *
7 * Copyright (C) 1998-2001 Gabor Kuti <seasons@fornax.hu> 6 * Copyright (C) 1998-2001 Gabor Kuti <seasons@fornax.hu>
8 * Copyright (C) 1998,2001-2005 Pavel Machek <pavel@suse.cz> 7 * Copyright (C) 1998,2001-2005 Pavel Machek <pavel@suse.cz>
@@ -47,11 +46,7 @@
47#include <linux/utsname.h> 46#include <linux/utsname.h>
48#include <linux/version.h> 47#include <linux/version.h>
49#include <linux/delay.h> 48#include <linux/delay.h>
50#include <linux/reboot.h>
51#include <linux/bitops.h> 49#include <linux/bitops.h>
52#include <linux/vt_kern.h>
53#include <linux/kbd_kern.h>
54#include <linux/keyboard.h>
55#include <linux/spinlock.h> 50#include <linux/spinlock.h>
56#include <linux/genhd.h> 51#include <linux/genhd.h>
57#include <linux/kernel.h> 52#include <linux/kernel.h>
@@ -63,10 +58,8 @@
63#include <linux/swapops.h> 58#include <linux/swapops.h>
64#include <linux/bootmem.h> 59#include <linux/bootmem.h>
65#include <linux/syscalls.h> 60#include <linux/syscalls.h>
66#include <linux/console.h>
67#include <linux/highmem.h> 61#include <linux/highmem.h>
68#include <linux/bio.h> 62#include <linux/bio.h>
69#include <linux/mount.h>
70 63
71#include <asm/uaccess.h> 64#include <asm/uaccess.h>
72#include <asm/mmu_context.h> 65#include <asm/mmu_context.h>