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

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: fix asm/e820.h for userspace inclusion
x86: fix numaq_tsc_disable
x86: fix kernel_physical_mapping_init() for large x86 systems

Linus Torvalds 2b04be7e bdec6cac

+4 -3
unified split
+1 -1
arch/x86/kernel/numaq_32.c
··· 96 void __init numaq_tsc_disable(void) 97 { 98 if (!found_numaq) 99 - return -1; 100 101 if (num_online_nodes() > 1) { 102 printk(KERN_DEBUG "NUMAQ: disabling TSC\n");
··· 96 void __init numaq_tsc_disable(void) 97 { 98 if (!found_numaq) 99 + return; 100 101 if (num_online_nodes() > 1) { 102 printk(KERN_DEBUG "NUMAQ: disabling TSC\n");
+1 -1
arch/x86/mm/init_64.c
··· 644 unsigned long pud_phys; 645 pud_t *pud; 646 647 - next = start + PGDIR_SIZE; 648 if (next > end) 649 next = end; 650
··· 644 unsigned long pud_phys; 645 pud_t *pud; 646 647 + next = (start + PGDIR_SIZE) & PGDIR_MASK; 648 if (next > end) 649 next = end; 650
+2 -1
include/asm-x86/e820.h
··· 59 struct e820entry map[E820_X_MAX]; 60 }; 61 62 /* see comment in arch/x86/kernel/e820.c */ 63 extern struct e820map e820; 64 extern struct e820map e820_saved; ··· 116 extern char *default_machine_specific_memory_setup(void); 117 extern char *machine_specific_memory_setup(void); 118 extern char *memory_setup(void); 119 - 120 #endif /* __ASSEMBLY__ */ 121 122 #define ISA_START_ADDRESS 0xa0000
··· 59 struct e820entry map[E820_X_MAX]; 60 }; 61 62 + #ifdef __KERNEL__ 63 /* see comment in arch/x86/kernel/e820.c */ 64 extern struct e820map e820; 65 extern struct e820map e820_saved; ··· 115 extern char *default_machine_specific_memory_setup(void); 116 extern char *machine_specific_memory_setup(void); 117 extern char *memory_setup(void); 118 + #endif /* __KERNEL__ */ 119 #endif /* __ASSEMBLY__ */ 120 121 #define ISA_START_ADDRESS 0xa0000