diff options
| author | Pavel Machek <pavel@ucw.cz> | 2002-06-02 23:25:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-06-02 23:25:54 -0700 |
| commit | c2ad32fc27cf7c46dd926f6431f568ee2fa64b15 (patch) | |
| tree | c842a45443d290250ab120ef722cb9a0177f7a83 /include | |
| parent | 14f546974ba896cff41ce0fc6fd8be36a4d533fa (diff) | |
[PATCH] Cleanup swsusp in 2.5.20
This cleans up swsusp in 2.5.20. Killed sysrq-D support (it is too
much trouble to support suspending from interrupt), kill unused
define, fix compile-time warnings (thanks to Adam).
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/sched.h | 3 | ||||
| -rw-r--r-- | include/linux/suspend.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index a9b97a1375c6..228d1b979e1e 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -392,8 +392,7 @@ do { if (atomic_dec_and_test(&(tsk)->usage)) __put_task_struct(tsk); } while(0) #define PF_FREEZE 0x00010000 /* this task should be frozen for suspend */ #define PF_IOTHREAD 0x00020000 /* this thread is needed for doing I/O to swap */ -#define PF_KERNTHREAD 0x00040000 /* this thread is a kernel thread that cannot be sent signals to */ -#define PF_FROZEN 0x00080000 /* frozen for system suspend */ +#define PF_FROZEN 0x00040000 /* frozen for system suspend */ /* * Ptrace flags diff --git a/include/linux/suspend.h b/include/linux/suspend.h index fa09ebfc582e..88abb25a67de 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -33,7 +33,7 @@ struct suspend_header { char version[20]; int num_cpus; int page_size; - unsigned long suspend_pagedir; + suspend_pagedir_t *suspend_pagedir; unsigned int num_pbes; struct swap_location { char filename[SWAP_FILENAME_MAXLENGTH]; @@ -50,7 +50,6 @@ extern int shrink_mem(void); /* kernel/suspend.c */ extern void software_suspend(void); extern void software_resume(void); -extern int resume_setup(char *str); extern int register_suspend_notifier(struct notifier_block *); extern int unregister_suspend_notifier(struct notifier_block *); |