Commit 3568834e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 

* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  x86: fix RTC_AIE with CONFIG_HPET_EMULATE_RTC
  x86: asm-x86/msr.h: pull in linux/types.h
  x86: fix boot crash on HIGHMEM4G && SPARSEMEM
parents 8234b65a 8ee291f8

arch/x86/kernel/hpet.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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++)

	for (pfn = highstart_pfn; pfn < highend_pfn; pfn++) {

		/*

		 * Holes under sparsemem might not have no 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
Original line number Diff line number Diff line
@@ -3,6 +3,10 @@ 


#include <asm/msr-index.h>



#ifndef __ASSEMBLY__

# include <linux/types.h>

#endif



#ifdef __i386__



#ifdef __KERNEL__