Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 11783
b: refs/heads/master
c: 96bc7ae
h: refs/heads/master
i:
  11781: 9d571c4
  11779: f083bda
  11775: 5a178a5
v: v3
  • Loading branch information
Pavel Machek authored and Linus Torvalds committed Oct 31, 2005
1 parent 65a231e commit b50b57a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 32 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2c1b4a5ca48831595979a850f40ced8e7da026f8
refs/heads/master: 96bc7aec20b50761822f96130127b8e31e168af1
25 changes: 2 additions & 23 deletions trunk/kernel/power/snapshot.c
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
/*
* linux/kernel/power/swsusp.c
* linux/kernel/power/snapshot.c
*
* This file is to realize architecture-independent
* machine suspend feature using pretty near only high-level routines
* This file provide system snapshot/restore functionality.
*
* Copyright (C) 1998-2005 Pavel Machek <pavel@suse.cz>
*
Expand All @@ -15,46 +14,26 @@
#include <linux/mm.h>
#include <linux/suspend.h>
#include <linux/smp_lock.h>
#include <linux/file.h>
#include <linux/utsname.h>
#include <linux/version.h>
#include <linux/delay.h>
#include <linux/reboot.h>
#include <linux/bitops.h>
#include <linux/vt_kern.h>
#include <linux/kbd_kern.h>
#include <linux/keyboard.h>
#include <linux/spinlock.h>
#include <linux/genhd.h>
#include <linux/kernel.h>
#include <linux/major.h>
#include <linux/swap.h>
#include <linux/pm.h>
#include <linux/device.h>
#include <linux/buffer_head.h>
#include <linux/swapops.h>
#include <linux/bootmem.h>
#include <linux/syscalls.h>
#include <linux/console.h>
#include <linux/highmem.h>
#include <linux/bio.h>
#include <linux/mount.h>

#include <asm/uaccess.h>
#include <asm/mmu_context.h>
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
#include <asm/io.h>

#include <linux/random.h>
#include <linux/crypto.h>
#include <asm/scatterlist.h>

#include "power.h"




#ifdef CONFIG_HIGHMEM
struct highmem_page {
char *data;
Expand Down
9 changes: 1 addition & 8 deletions trunk/kernel/power/swsusp.c
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
/*
* linux/kernel/power/swsusp.c
*
* This file is to realize architecture-independent
* machine suspend feature using pretty near only high-level routines
* This file provides code to write suspend image to swap and read it back.
*
* Copyright (C) 1998-2001 Gabor Kuti <seasons@fornax.hu>
* Copyright (C) 1998,2001-2005 Pavel Machek <pavel@suse.cz>
Expand Down Expand Up @@ -47,11 +46,7 @@
#include <linux/utsname.h>
#include <linux/version.h>
#include <linux/delay.h>
#include <linux/reboot.h>
#include <linux/bitops.h>
#include <linux/vt_kern.h>
#include <linux/kbd_kern.h>
#include <linux/keyboard.h>
#include <linux/spinlock.h>
#include <linux/genhd.h>
#include <linux/kernel.h>
Expand All @@ -63,10 +58,8 @@
#include <linux/swapops.h>
#include <linux/bootmem.h>
#include <linux/syscalls.h>
#include <linux/console.h>
#include <linux/highmem.h>
#include <linux/bio.h>
#include <linux/mount.h>

#include <asm/uaccess.h>
#include <asm/mmu_context.h>
Expand Down

0 comments on commit b50b57a

Please sign in to comment.