[23/25] Merge pmdisk and swsusp

From: Patrick Mochel
Date: Sat Jul 17 2004 - 17:50:05 EST



ChangeSet 1.1865, 2004/07/17 13:52:19-07:00, mochel@xxxxxxxxxxxxxxxxxx

[swsusp] Remove unneeded suspend_pagedir_lock.


kernel/power/swsusp.c | 6 ------
1 files changed, 6 deletions(-)


diff -Nru a/kernel/power/swsusp.c b/kernel/power/swsusp.c
--- a/kernel/power/swsusp.c 2004-07-17 14:50:29 -07:00
+++ b/kernel/power/swsusp.c 2004-07-17 14:50:29 -07:00
@@ -81,9 +81,6 @@

extern int is_head_of_free_region(struct page *);

-/* Locks */
-spinlock_t suspend_pagedir_lock __nosavedata = SPIN_LOCK_UNLOCKED;
-
/* Variables to be preserved over suspend */
int pagedir_order_check;
int nr_copy_pages_check;
@@ -908,10 +905,7 @@

static void suspend_finish(void)
{
- spin_lock_irq(&suspend_pagedir_lock); /* Done to disable interrupts */
-
free_pages((unsigned long) pagedir_nosave, pagedir_order);
- spin_unlock_irq(&suspend_pagedir_lock);

#ifdef CONFIG_HIGHMEM
printk( "Restoring highmem\n" );
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/