git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
acpi
/
sleep.c
diff --git
a/arch/i386/kernel/acpi/sleep.c
b/arch/i386/kernel/acpi/sleep.c
index
be4df55
..
28bb051
100644
(file)
--- a/
arch/i386/kernel/acpi/sleep.c
+++ b/
arch/i386/kernel/acpi/sleep.c
@@
-8,7
+8,7
@@
#include <linux/acpi.h>
#include <linux/bootmem.h>
#include <asm/smp.h>
#include <linux/acpi.h>
#include <linux/bootmem.h>
#include <asm/smp.h>
-
+#include <asm/tlbflush.h>
/* address in low memory of the wakeup routine. */
unsigned long acpi_wakeup_address = 0;
/* address in low memory of the wakeup routine. */
unsigned long acpi_wakeup_address = 0;
@@
-27,6
+27,7
@@
static void init_low_mapping(pgd_t *pgd, int pgd_limit)
set_pgd(pgd, *(pgd+USER_PTRS_PER_PGD));
pgd_ofs++, pgd++;
}
set_pgd(pgd, *(pgd+USER_PTRS_PER_PGD));
pgd_ofs++, pgd++;
}
+ flush_tlb_all();
}
/**
}
/**
@@
-46,15
+47,6
@@
int acpi_save_state_mem (void)
return 0;
}
return 0;
}
-/**
- * acpi_save_state_disk - save kernel state to disk
- *
- */
-int acpi_save_state_disk (void)
-{
- return 1;
-}
-
/*
* acpi_restore_state - undo effects of acpi_save_state_mem
*/
/*
* acpi_restore_state - undo effects of acpi_save_state_mem
*/