x86 updates
[ resent with lkml Cc:-ed too. ]
Linus, please pull the latest x86 git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
Thanks!
Ingo
------------------>
Bernhard Walle (1):
x86: fix RTC_AIE with CONFIG_HPET_EMULATE_RTC
Mike Frysinger (1):
x86: asm-x86/msr.h: pull in linux/types.h
Rafael J. Wysocki (1):
x86: hibernation: document __save_processor_state() on x86
arch/x86/kernel/hpet.c | 2 +- arch/x86/kernel/suspend_64.c | 20 ++++++++++++++++++++ include/asm-x86/msr.h | 4 ++++ include/asm-x86/suspend_64.h | 9 ++++++++- 4 files changed, 33 insertions(+), 2 deletions(-)
arch/x86/kernel/hpet.c +1 -1
@@ -657,7 +657,7 @@ irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id) hpet_pie_count =0 ; } -if (hpet_rtc_flags &RTC_PIE && +if (hpet_rtc_flags &RTC_AIE && (curr_time.tm_sec == hpet_alarm_time.tm_sec) && (curr_time.tm_min == hpet_alarm_time.tm_min) && (curr_time.tm_hour == hpet_alarm_time.tm_hour))
arch/x86/kernel/suspend_64.c +20 -0
@@ -19,6 +19,21 @@ extern const void __nosave_begin, __nosave_end;struct saved_context saved_context; +/** +* __save_processor_state - save CPU registers before creating a +* hibernation image and before restoring the memory state from it +* @ctxt - structure to store the registers contents in +* +* NOTE: If there is a CPU register the modification of which by the +* boot kernel (ie. the kernel used for loading the hibernation image) +* might affect the operations of the restored target kernel (ie. the one +* saved in the hibernation image), then its contents must be saved by this +* function. In other words, if kernel A is hibernated and different +* kernel B is used for loading the hibernation image into memory, the +* kernel A's __save_processor_state() function must save all registers +* needed by kernel A, so that it can operate correctly after the resume +* regardless of what kernel B does in the meantime. +*/ void __save_processor_state (struct saved_context *ctxt) {kernel_fpu_begin ();
@@ -69,6 +84,11 @@ static void do_fpu_end(void)kernel_fpu_end (); } +/** +* __restore_processor_state - restore the contents of CPU registers saved +* by __save_processor_state() +* @ctxt - structure to load the registers contents from +*/ void __restore_processor_state (struct saved_context *ctxt) {/*
include/asm-x86/msr.h +4 -0
@@ -3,6 +3,10 @@#include <asm/msr-index.h> +#ifndef __ASSEMBLY__ +# include <linux/types.h> +#endif +#ifdef __i386__#ifdef __KERNEL__
include/asm-x86/suspend_64.h +8 -1
@@ -15,7 +15,14 @@ arch_prepare_suspend(void)return 0 ; } -/* Image of the saved processor state. If you touch this, fix acpi/wakeup.S. */ +/* +* Image of the saved processor state, used by the low level ACPI suspend to +* RAM code and by the low level hibernation code. +* +* If you modify it, fix arch/x86/kernel/acpi/wakeup_64.S and make sure that +* __save/__restore_processor_state(), defined in arch/x86/kernel/suspend_64.c, +* still work as required. +*/ struct saved_context {struct pt_regs regs;u16 ds, es, fs, gs, ss;
Quoted 5 lines · Ingo Molnar
Linus, please pull the latest x86 git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.gitThanks!
just updated it: added a fix for a sparsemem bootup crash on large-RAM boxes, and removed the documentation update patch (we can do that in .25). Find the updated shortlog below.
Ingo
------------------>
Bernhard Walle (1):
x86: fix RTC_AIE with CONFIG_HPET_EMULATE_RTC
Ingo Molnar (1):
x86: fix boot crash on HIGHMEM4G && SPARSEMEM
Mike Frysinger (1):
x86: asm-x86/msr.h: pull in linux/types.h
arch/x86/kernel/hpet.c | 2 +- arch/x86/mm/init_32.c | 9 +++++++-- include/asm-x86/msr.h | 4 ++++ 3 files changed, 12 insertions(+), 3 deletions(-)
arch/x86/kernel/hpet.c +1 -1
@@ -657,7 +657,7 @@ irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id) hpet_pie_count =0 ; } -if (hpet_rtc_flags &RTC_PIE && +if (hpet_rtc_flags &RTC_AIE && (curr_time.tm_sec == hpet_alarm_time.tm_sec) && (curr_time.tm_min == hpet_alarm_time.tm_min) && (curr_time.tm_hour == hpet_alarm_time.tm_hour))
arch/x86/mm/init_32.c +7 -2
@@ -321,8 +321,13 @@ extern void set_highmem_pages_init(int);static void __init set_highmem_pages_init (int bad_ppro) {int pfn; -for (pfn = highstart_pfn; pfn < highend_pfn; pfn++) -add_one_highpage_init (pfn_to_page (pfn), pfn, bad_ppro); +for (pfn = highstart_pfn; pfn < highend_pfn; pfn++) { +/* +* Holes under sparsemem might not have a mem-map: +*/ +if (pfn_valid (pfn)) +add_one_highpage_init (pfn_to_page (pfn), pfn, bad_ppro); + } totalram_pages += totalhigh_pages; }#endif /* CONFIG_FLATMEM */
include/asm-x86/msr.h +4 -0
@@ -3,6 +3,10 @@#include <asm/msr-index.h> +#ifndef __ASSEMBLY__ +# include <linux/types.h> +#endif +#ifdef __i386__#ifdef __KERNEL__