Skip to contentSkip to conversation

Freezer.h updated patch.

PATCH New Nigel Cunningham 5 participants 7 messages Oct 22, 2006 – Jan 2, 2007

Subsystems (37)
lore
Share & tools
lore
#0 lore raw

Hi guys.

I missed a couple of "#include <freezer.h>"s in yesterdays patch; funnily enough the ones in kernel/power! Here's an updated version.

Rafael, did you still think the freezer.h contents should go into suspend.h? If so, I can redo a patch for that in the morning. I guess the main advance over this will be a short patch (about 20 of the following files won't need patching).

Regards,

Nigel

arch/arm/kernel/signal.c +1 -0
index 48cf7ff..f38a60a 100644
@@ -11,6 +11,7 @@ #include <linux/errno.h>
 #include <linux/signal.h>
 #include <linux/ptrace.h>
 #include <linux/personality.h>
+#include <linux/freezer.h>
 
 #include <asm/cacheflush.h>
 #include <asm/ucontext.h>
arch/avr32/kernel/signal.c +1 -1
index 3309665..0ec1485 100644
@@ -15,7 +15,7 @@ #include <linux/mm.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
 #include <linux/unistd.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 
 #include <asm/uaccess.h>
 #include <asm/ucontext.h>
arch/frv/kernel/signal.c +1 -1
index b8a5882..85baeae 100644
@@ -21,7 +21,7 @@ #include <linux/wait.h>
 #include <linux/ptrace.h>
 #include <linux/unistd.h>
 #include <linux/personality.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 #include <asm/ucontext.h>
 #include <asm/uaccess.h>
 #include <asm/cacheflush.h>
arch/h8300/kernel/signal.c +1 -1
index 7787f70..0295560 100644
@@ -38,7 +38,7 @@ #include <linux/highuid.h>
 #include <linux/personality.h>
 #include <linux/tty.h>
 #include <linux/binfmts.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 
 #include <asm/setup.h>
 #include <asm/uaccess.h>
arch/i386/kernel/io_apic.c +1 -0
index 350192d..d8c7686 100644
@@ -34,6 +34,7 @@ #include <linux/sysdev.h>
 #include <linux/pci.h>
 #include <linux/msi.h>
 #include <linux/htirq.h>
+#include <linux/freezer.h>
 
 #include <asm/io.h>
 #include <asm/smp.h>
arch/m32r/kernel/signal.c +1 -1
index b60cea4..092ea86 100644
@@ -21,7 +21,7 @@ #include <linux/wait.h>
 #include <linux/unistd.h>
 #include <linux/stddef.h>
 #include <linux/personality.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 #include <asm/cacheflush.h>
 #include <asm/ucontext.h>
 #include <asm/uaccess.h>
arch/powerpc/kernel/signal_32.c +1 -1
index 320353f..e4ebe1a 100644
@@ -36,7 +36,7 @@ #include <linux/unistd.h>
 #include <linux/stddef.h>
 #include <linux/tty.h>
 #include <linux/binfmts.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 #endif
 
 #include <asm/uaccess.h>
arch/sh/kernel/signal.c +1 -0
index 5213f5b..380249a 100644
@@ -23,6 +23,7 @@ #include <linux/tty.h>
 #include <linux/elf.h>
 #include <linux/personality.h>
 #include <linux/binfmts.h>
+#include <linux/freezer.h>
 
 #include <asm/ucontext.h>
 #include <asm/uaccess.h>
arch/sh64/kernel/signal.c +1 -1
index 9e2ffc4..1666d3e 100644
@@ -22,7 +22,7 @@ #include <linux/signal.h>
 #include <linux/errno.h>
 #include <linux/wait.h>
 #include <linux/personality.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 #include <linux/ptrace.h>
 #include <linux/unistd.h>
 #include <linux/stddef.h>
drivers/block/pktcdvd.c +1 -1
index f2904f6..e45eaa2 100644
@@ -54,7 +54,7 @@ #include <linux/file.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/miscdevice.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 #include <linux/mutex.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_ioctl.h>
drivers/char/hvc_console.c +1 -0
index 9902ffa..cc2cd46 100644
@@ -38,6 +38,7 @@ #include <linux/tty_flip.h>
 #include <linux/sched.h>
 #include <linux/spinlock.h>
 #include <linux/delay.h>
+#include <linux/freezer.h>
 
 #include <asm/uaccess.h>
 
drivers/edac/edac_mc.c +1 -0
index 4bde30b..54e4490 100644
@@ -28,6 +28,7 @@ #include <linux/list.h>
 #include <linux/sysdev.h>
 #include <linux/ctype.h>
 #include <linux/kthread.h>
+#include <linux/freezer.h>
 #include <asm/uaccess.h>
 #include <asm/page.h>
 #include <asm/edac.h>
drivers/ieee1394/nodemgr.c +1 -0
index 8e7b83f..e829c93 100644
@@ -15,6 +15,7 @@ #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/kthread.h>
 #include <linux/moduleparam.h>
+#include <linux/freezer.h>
 #include <asm/atomic.h>
 
 #include "csr.h"
drivers/input/gameport/gameport.c +1 -0
index a0af97e..79dfb4b 100644
@@ -23,6 +23,7 @@ #include <linux/delay.h>
 #include <linux/kthread.h>
 #include <linux/sched.h>	/* HZ */
 #include <linux/mutex.h>
+#include <linux/freezer.h>
 
 /*#include <asm/io.h>*/
 
drivers/input/serio/serio.c +1 -0
index 211943f..5f1d403 100644
@@ -35,6 +35,7 @@ #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/kthread.h>
 #include <linux/mutex.h>
+#include <linux/freezer.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");
 MODULE_DESCRIPTION("Serio abstraction core");
drivers/macintosh/therm_adt746x.c +1 -0
index a0f30d0..9397b08 100644
@@ -24,6 +24,7 @@ #include <linux/wait.h>
 #include <linux/suspend.h>
 #include <linux/kthread.h>
 #include <linux/moduleparam.h>
+#include <linux/freezer.h>
 
 #include <asm/prom.h>
 #include <asm/machdep.h>
drivers/macintosh/via-pmu.c +1 -1
index e63ea1c..c8558d4 100644
@@ -42,7 +42,7 @@ #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/device.h>
 #include <linux/sysdev.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 #include <linux/syscalls.h>
 #include <linux/cpu.h>
 #include <asm/prom.h>
drivers/macintosh/windfarm_core.c +1 -0
index ab3faa7..e947af9 100644
@@ -34,6 +34,7 @@ #include <linux/reboot.h>
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/mutex.h>
+#include <linux/freezer.h>
 
 #include <asm/prom.h>
 
drivers/md/md.c +1 -1
index f7f1908..eabbf0d 100644
@@ -39,10 +39,10 @@ #include <linux/raid/md.h>
 #include <linux/raid/bitmap.h>
 #include <linux/sysctl.h>
 #include <linux/buffer_head.h> /* for invalidate_bdev */
-#include <linux/suspend.h>
 #include <linux/poll.h>
 #include <linux/mutex.h>
 #include <linux/ctype.h>
+#include <linux/freezer.h>
 
 #include <linux/init.h>
 
drivers/media/dvb/dvb-core/dvb_frontend.c +1 -1
index 53304e6..0fefdf0 100644
@@ -34,7 +34,7 @@ #include <linux/poll.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/list.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 #include <linux/jiffies.h>
 #include <asm/processor.h>
 
drivers/media/video/msp3400-driver.c +1 -1
index cf43df3..e1b56dc 100644
@@ -56,7 +56,7 @@ #include <media/v4l2-common.h>
 #include <media/tvaudio.h>
 #include <media/msp3400.h>
 #include <linux/kthread.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 #include "msp3400-driver.h"
 
 /* ---------------------------------------------------------------------- */
drivers/media/video/tvaudio.c +1 -0
index fcaef4b..d506dfa 100644
@@ -29,6 +29,7 @@ #include <linux/i2c-algo-bit.h>
 #include <linux/init.h>
 #include <linux/smp_lock.h>
 #include <linux/kthread.h>
+#include <linux/freezer.h>
 
 #include <media/tvaudio.h>
 #include <media/v4l2-common.h>
drivers/media/video/video-buf-dvb.c +1 -1
index f53edf1..fcc5467 100644
@@ -20,7 +20,7 @@ #include <linux/device.h>
 #include <linux/fs.h>
 #include <linux/kthread.h>
 #include <linux/file.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 
 #include <media/video-buf.h>
 #include <media/video-buf-dvb.h>
drivers/media/video/vivi.c +1 -0
index 3c8dc72..9986de5 100644
@@ -36,6 +36,7 @@ #include <media/video-buf.h>
 #include <media/v4l2-common.h>
 #include <linux/kthread.h>
 #include <linux/highmem.h>
+#include <linux/freezer.h>
 
 /* Wake up at about 30 fps */
 #define WAKE_NUMERATOR 30
drivers/mfd/ucb1x00-ts.c +1 -1
index 82938ad..ce1a481 100644
@@ -28,7 +28,7 @@ #include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/input.h>
 #include <linux/device.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 #include <linux/slab.h>
 #include <linux/kthread.h>
 
drivers/net/irda/stir4200.c +1 -0
index be8a66e..5a9c8e8 100644
@@ -51,6 +51,7 @@ #include <linux/delay.h>
 #include <linux/usb.h>
 #include <linux/crc32.h>
 #include <linux/kthread.h>
+#include <linux/freezer.h>
 #include <net/irda/irda.h>
 #include <net/irda/irlap.h>
 #include <net/irda/irda_device.h>
drivers/net/wireless/airo.c +1 -0
index 0a33c8a..9599dd1 100644
@@ -49,6 +49,7 @@ #include <linux/pci.h>
 #include <asm/uaccess.h>
 #include <net/ieee80211.h>
 #include <linux/kthread.h>
+#include <linux/freezer.h>
 
 #include "airo.h"
 
drivers/pcmcia/cs.c +1 -0
index f9cd831..606a467 100644
@@ -29,6 +29,7 @@ #include <linux/pm.h>
 #include <linux/pci.h>
 #include <linux/device.h>
 #include <linux/kthread.h>
+#include <linux/freezer.h>
 #include <asm/system.h>
 #include <asm/irq.h>
 
drivers/pnp/pnpbios/core.c +1 -0
index 81a6c83..81186f4 100644
@@ -61,6 +61,7 @@ #include <linux/spinlock.h>
 #include <linux/dmi.h>
 #include <linux/delay.h>
 #include <linux/acpi.h>
+#include <linux/freezer.h>
 
 #include <asm/page.h>
 #include <asm/desc.h>
drivers/usb/core/hub.c +1 -0
index 66bff18..d269773 100644
@@ -22,6 +22,7 @@ #include <linux/usb.h>
 #include <linux/usbdevice_fs.h>
 #include <linux/kthread.h>
 #include <linux/mutex.h>
+#include <linux/freezer.h>
 
 #include <asm/semaphore.h>
 #include <asm/uaccess.h>
drivers/usb/gadget/file_storage.c +1 -1
index 8b975d1..c98316c 100644
@@ -250,7 +250,7 @@ #include <linux/signal.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/string.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 #include <linux/utsname.h>
 
 #include <linux/usb_ch9.h>
drivers/usb/storage/usb.c +1 -1
index b8d6031..e021bc9 100644
@@ -49,7 +49,7 @@
 
 #include <linux/sched.h>
 #include <linux/errno.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
drivers/w1/w1.c +1 -0
index de3e979..63c0724 100644
@@ -31,6 +31,7 @@ #include <linux/device.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
 #include <linux/kthread.h>
+#include <linux/freezer.h>
 
 #include <asm/atomic.h>
 
fs/afs/kafsasyncd.c +1 -0
index f09a794..615df24 100644
@@ -20,6 +20,7 @@ #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/completion.h>
+#include <linux/freezer.h>
 #include "cell.h"
 #include "server.h"
 #include "volume.h"
fs/afs/kafstimod.c +1 -0
index 65bc05a..694344e 100644
@@ -13,6 +13,7 @@ #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/completion.h>
+#include <linux/freezer.h>
 #include "cell.h"
 #include "volume.h"
 #include "kafstimod.h"
fs/cifs/cifsfs.c +1 -0
index 84976cd..df95c71 100644
@@ -34,6 +34,7 @@ #include <linux/vfs.h>
 #include <linux/mempool.h>
 #include <linux/delay.h>
 #include <linux/kthread.h>
+#include <linux/freezer.h>
 #include "cifsfs.h"
 #include "cifspdu.h"
 #define DECLARE_GLOBALS_HERE
fs/cifs/connect.c +1 -0
index 4093d53..d205551 100644
@@ -31,6 +31,7 @@ #include <linux/mempool.h>
 #include <linux/delay.h>
 #include <linux/completion.h>
 #include <linux/pagevec.h>
+#include <linux/freezer.h>
 #include <asm/uaccess.h>
 #include <asm/processor.h>
 #include "cifspdu.h"
fs/jbd/journal.c +1 -1
index b85c686..75d3d86 100644
@@ -31,7 +31,7 @@ #include <linux/slab.h>
 #include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/mm.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 #include <linux/pagemap.h>
 #include <linux/kthread.h>
 #include <linux/poison.h>
fs/jbd2/journal.c +1 -1
index c60f378..93ca71c 100644
@@ -31,7 +31,7 @@ #include <linux/slab.h>
 #include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/mm.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 #include <linux/pagemap.h>
 #include <linux/kthread.h>
 #include <linux/poison.h>
fs/jffs/intrep.c +1 -0
index 4a543e1..478a74e 100644
@@ -66,6 +66,7 @@ #include <asm/byteorder.h>
 #include <linux/smp_lock.h>
 #include <linux/time.h>
 #include <linux/ctype.h>
+#include <linux/freezer.h>
 
 #include "intrep.h"
 #include "jffs_fm.h"
fs/jffs2/background.c +1 -0
index ff2a872..6eb3dae 100644
@@ -16,6 +16,7 @@ #include <linux/jffs2.h>
 #include <linux/mtd/mtd.h>
 #include <linux/completion.h>
 #include <linux/sched.h>
+#include <linux/freezer.h>
 #include "nodelist.h"
 
 
fs/jfs/jfs_logmgr.c +1 -1
index b89c9ab..5065baa 100644
@@ -67,7 +67,7 @@ #include <linux/completion.h>
 #include <linux/kthread.h>
 #include <linux/buffer_head.h>		/* for sync_blockdev() */
 #include <linux/bio.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 #include <linux/delay.h>
 #include <linux/mutex.h>
 #include "jfs_incore.h"
fs/jfs/jfs_txnmgr.c +1 -1
index 81f6f04..d558e51 100644
@@ -46,7 +46,7 @@ #include <linux/fs.h>
 #include <linux/vmalloc.h>
 #include <linux/smp_lock.h>
 #include <linux/completion.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kthread.h>
fs/lockd/clntproc.c +1 -0
index 3d84f60..50643b6 100644
@@ -13,6 +13,7 @@ #include <linux/fs.h>
 #include <linux/nfs_fs.h>
 #include <linux/utsname.h>
 #include <linux/smp_lock.h>
+#include <linux/freezer.h>
 #include <linux/sunrpc/clnt.h>
 #include <linux/sunrpc/svc.h>
 #include <linux/lockd/lockd.h>
fs/xfs/linux-2.6/xfs_buf.c +1 -0
index db5f5a3..bc94d0c 100644
@@ -31,6 +31,7 @@ #include <linux/hash.h>
 #include <linux/kthread.h>
 #include <linux/migrate.h>
 #include <linux/backing-dev.h>
+#include <linux/freezer.h>
 #include "xfs_linux.h"
 
 STATIC kmem_zone_t *xfs_buf_zone;
fs/xfs/linux-2.6/xfs_super.c +1 -0
index 38c4d12..6fa3406 100644
@@ -56,6 +56,7 @@ #include <linux/mount.h>
 #include <linux/mempool.h>
 #include <linux/writeback.h>
 #include <linux/kthread.h>
+#include <linux/freezer.h>
 
 STATIC struct quotactl_ops xfs_quotactl_operations;
 STATIC struct super_operations xfs_super_operations;
include/linux/freezer.h new file +84 -0

84 lines not on this page · raw message

include/linux/sched.h +0 -81

87 lines not on this page · raw message

init/do_mounts_initrd.c +1 -0
index 919a80c..2cfd7cb 100644
@@ -6,6 +6,7 @@ #include <linux/ext2_fs.h>
 #include <linux/romfs_fs.h>
 #include <linux/initrd.h>
 #include <linux/sched.h>
+#include <linux/freezer.h>
 
 #include "do_mounts.h"
 
kernel/audit.c +1 -0
index 98106f6..d9b690a 100644
@@ -57,6 +57,7 @@ #include <linux/skbuff.h>
 #include <linux/netlink.h>
 #include <linux/selinux.h>
 #include <linux/inotify.h>
+#include <linux/freezer.h>
 
 #include "audit.h"
 
kernel/power/disk.c +1 -0
index d3a158a..aee7fc9 100644
@@ -20,6 +20,7 @@ #include <linux/mount.h>
 #include <linux/pm.h>
 #include <linux/console.h>
 #include <linux/cpu.h>
+#include <linux/freezer.h>
 
 #include "power.h"
 
kernel/power/main.c +1 -0
index 873228c..6096c71 100644
@@ -18,6 +18,7 @@ #include <linux/pm.h>
 #include <linux/console.h>
 #include <linux/cpu.h>
 #include <linux/resume-trace.h>
+#include <linux/freezer.h>
 
 #include "power.h"
 
kernel/power/process.c +1 -0
index 72e72d2..29be608 100644
@@ -13,6 +13,7 @@ #include <linux/interrupt.h>
 #include <linux/suspend.h>
 #include <linux/module.h>
 #include <linux/syscalls.h>
+#include <linux/freezer.h>
 
 /* 
  * Timeout for stopping processes
kernel/power/user.c +1 -0
index d991d3b..3653b22 100644
@@ -21,6 +21,7 @@ #include <linux/pm.h>
 #include <linux/fs.h>
 #include <linux/console.h>
 #include <linux/cpu.h>
+#include <linux/freezer.h>
 
 #include <asm/uaccess.h>
 
kernel/rtmutex-tester.c +1 -0
index 6dcea9d..015fc63 100644
@@ -13,6 +13,7 @@ #include <linux/smp_lock.h>
 #include <linux/spinlock.h>
 #include <linux/sysdev.h>
 #include <linux/timer.h>
+#include <linux/freezer.h>
 
 #include "rtmutex.h"
 
kernel/sched.c +1 -1
index 3399701..12fdbef 100644
@@ -34,7 +34,7 @@ #include <linux/debug_locks.h>
 #include <linux/security.h>
 #include <linux/notifier.h>
 #include <linux/profile.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 #include <linux/vmalloc.h>
 #include <linux/blkdev.h>
 #include <linux/delay.h>
kernel/signal.c +1 -0
index 7ed8d53..90dad6d 100644
@@ -23,6 +23,7 @@ #include <linux/syscalls.h>
 #include <linux/ptrace.h>
 #include <linux/signal.h>
 #include <linux/capability.h>
+#include <linux/freezer.h>
 #include <asm/param.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
mm/pdflush.c +1 -0
index b02102f..8ce0900 100644
@@ -21,6 +21,7 @@ #include <linux/fs.h>		// Needed by writ
 #include <linux/writeback.h>	// Prototypes pdflush_operation()
 #include <linux/kthread.h>
 #include <linux/cpuset.h>
+#include <linux/freezer.h>
 
 
 /*
mm/vmscan.c +1 -0
index f05527b..3c99ab5 100644
@@ -36,6 +36,7 @@ #include <linux/notifier.h>
 #include <linux/rwsem.h>
 #include <linux/delay.h>
 #include <linux/kthread.h>
+#include <linux/freezer.h>
 
 #include <asm/tlbflush.h>
 #include <asm/div64.h>
net/rxrpc/krxiod.c +1 -0
index dada34a..49effd9 100644
@@ -13,6 +13,7 @@ #include <linux/sched.h>
 #include <linux/completion.h>
 #include <linux/spinlock.h>
 #include <linux/init.h>
+#include <linux/freezer.h>
 #include <rxrpc/krxiod.h>
 #include <rxrpc/transport.h>
 #include <rxrpc/peer.h>
net/rxrpc/krxsecd.c +1 -0
index cea4eb5..3ab0f77 100644
@@ -27,6 +27,7 @@ #include <rxrpc/peer.h>
 #include <rxrpc/call.h>
 #include <linux/udp.h>
 #include <linux/ip.h>
+#include <linux/freezer.h>
 #include <net/sock.h>
 #include "internal.h"
 
net/rxrpc/krxtimod.c +1 -0
index 3e74669..9a9b613 100644
@@ -13,6 +13,7 @@ #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/completion.h>
+#include <linux/freezer.h>
 #include <rxrpc/rxrpc.h>
 #include <rxrpc/krxtimod.h>
 #include <asm/errno.h>
net/sunrpc/svcsock.c +1 -0
index 96521f1..6a23b9d 100644
@@ -32,6 +32,7 @@ #include <linux/slab.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
 #include <linux/file.h>
+#include <linux/freezer.h>
 #include <net/sock.h>
 #include <net/checksum.h>
 #include <net/ip.h>
#1 lore raw

Hi,

Quoted 7 lines · Nigel Cunningham

Hi guys.

I missed a couple of "#include <freezer.h>"s in yesterdays patch; funnily enough the ones in kernel/power! Here's an updated version.

Rafael, did you still think the freezer.h contents should go into suspend.h?

Yes.

Quoted 3 lines

If so, I can redo a patch for that in the morning. I guess the main advance over this will be a short patch (about 20 of the following files won't need patching).

Yes, please do it.

Greetings,
Rafael

Signature · 2 lines
You never change things by fighting the existing reality.
		R. Buckminster Fuller
#2 lore raw
Quoted 5 lines · On Sun, 22 Oct 2006 14:29:33 +0200 "Rafael J. Wysocki" <[email protected]> wrote:

Hi,

Quoted 2 lines · Nigel Cunningham

Hi guys.

Quoted 8 lines
Quoted 5 lines

I missed a couple of "#include <freezer.h>"s in yesterdays patch; funnily enough the ones in kernel/power! Here's an updated version.

Rafael, did you still think the freezer.h contents should go into suspend.h?

Yes.

I think freezer.h is OK. One 84-line file which does one thing is nice. There's little advantage to putting this code into suspend.h along with a bunch of somewhat-unrelated stuff.

And it expresses the point that the freezer could be used for things other than suspend.

#3 lore raw
Quoted 14 lines · Andrew Morton
Quoted 11 lines · On Sun, 22 Oct 2006 14:29:33 +0200 "Rafael J. Wysocki" <[email protected]> wrote:

Hi,

Quoted 7 lines · Nigel Cunningham

Hi guys.

I missed a couple of "#include <freezer.h>"s in yesterdays patch; funnily enough the ones in kernel/power! Here's an updated version.

Rafael, did you still think the freezer.h contents should go into suspend.h?

Quoted 6 lines
Quoted 2 lines

Yes.

I think freezer.h is OK. One 84-line file which does one thing is nice. There's little advantage to putting this code into suspend.h along with a bunch of somewhat-unrelated stuff.

All of this stuff has one thing in common: it is only used for suspend (to disk or to RAM) now.

Quoted 2 lines

And it expresses the point that the freezer could be used for things other than suspend.

Okay, then. Let's take the patch as is.

Signature · 2 lines
You never change things by fighting the existing reality.
		R. Buckminster Fuller
#4 lore raw

Hi.

Quoted 1 line · Rafael J. Wysocki

Okay, then. Let's take the patch as is.

Ack.

Regards,

Nigel

#5 lore raw
In reply to Nigel Cunningham

Review

Quoted 4 lines · Nigel Cunningham

+++ b/drivers/macintosh/via-pmu.c

(quoted diff) +1 -1
-#include <linux/suspend.h>
+#include <linux/freezer.h>

This change will lead to compile errors with -Wimplicit-function-declaration. What part of freezer.h is used in via-pmu.c?

drivers/macintosh/via-pmu.c:2014: warning: implicit declaration of function pm_prepare_console' drivers/macintosh/via-pmu.c:2139: warning: implicit declaration of function pm_restore_console'

#6 lore raw

PATCH 1/1 Fix freezer.h mistake.

I have no idea now why this fragment was in the patch, and Olaf has rightly questioned it.

Please apply.

Regards,

Nigel

drivers/macintosh/via-pmu.c +1 -1
index c8558d4..e63ea1c 100644
@@ -42,7 +42,7 @@ #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/device.h>
 #include <linux/sysdev.h>
-#include <linux/freezer.h>
+#include <linux/suspend.h>
 #include <linux/syscalls.h>
 #include <linux/cpu.h>
 #include <asm/prom.h>