tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 3568834e 8234b65a

+12 -3
+1 -1
arch/x86/kernel/hpet.c
··· 657 657 hpet_pie_count = 0; 658 658 } 659 659 660 - if (hpet_rtc_flags & RTC_PIE && 660 + if (hpet_rtc_flags & RTC_AIE && 661 661 (curr_time.tm_sec == hpet_alarm_time.tm_sec) && 662 662 (curr_time.tm_min == hpet_alarm_time.tm_min) && 663 663 (curr_time.tm_hour == hpet_alarm_time.tm_hour))
+7 -2
arch/x86/mm/init_32.c
··· 321 321 static void __init set_highmem_pages_init(int bad_ppro) 322 322 { 323 323 int pfn; 324 - for (pfn = highstart_pfn; pfn < highend_pfn; pfn++) 325 - add_one_highpage_init(pfn_to_page(pfn), pfn, bad_ppro); 324 + for (pfn = highstart_pfn; pfn < highend_pfn; pfn++) { 325 + /* 326 + * Holes under sparsemem might not have no mem_map[]: 327 + */ 328 + if (pfn_valid(pfn)) 329 + add_one_highpage_init(pfn_to_page(pfn), pfn, bad_ppro); 330 + } 326 331 totalram_pages += totalhigh_pages; 327 332 } 328 333 #endif /* CONFIG_FLATMEM */
+4
include/asm-x86/msr.h
··· 3 3 4 4 #include <asm/msr-index.h> 5 5 6 + #ifndef __ASSEMBLY__ 7 + # include <linux/types.h> 8 + #endif 9 + 6 10 #ifdef __i386__ 7 11 8 12 #ifdef __KERNEL__