lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2008-07-17 10:38:59 -07:00
parent bdec6cace4 2567d71cc7
commit 2b04be7e8a
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/numaq_32.c
View File

@@ -96,7 +96,7 @@ int __init get_memcfg_numaq(void)
void __init numaq_tsc_disable(void) void __init numaq_tsc_disable(void)
{ {
if (!found_numaq) if (!found_numaq)
return -1; return;
if (num_online_nodes() > 1) { if (num_online_nodes() > 1) {
printk(KERN_DEBUG "NUMAQ: disabling TSC\n"); printk(KERN_DEBUG "NUMAQ: disabling TSC\n");

2
arch/x86/mm/init_64.c
View File

@@ -644,7 +644,7 @@ static unsigned long __init kernel_physical_mapping_init(unsigned long start,
unsigned long pud_phys; unsigned long pud_phys;
pud_t *pud; pud_t *pud;
next = start + PGDIR_SIZE; next = (start + PGDIR_SIZE) & PGDIR_MASK;
if (next > end) if (next > end)
next = end; next = end;

3
include/asm-x86/e820.h
View File

@@ -59,6 +59,7 @@ struct e820map {
struct e820entry map[E820_X_MAX]; struct e820entry map[E820_X_MAX];
}; };
#ifdef __KERNEL__
/* see comment in arch/x86/kernel/e820.c */ /* see comment in arch/x86/kernel/e820.c */
extern struct e820map e820; extern struct e820map e820;
extern struct e820map e820_saved; extern struct e820map e820_saved;
@@ -115,7 +116,7 @@ extern void setup_memory_map(void);
extern char *default_machine_specific_memory_setup(void); extern char *default_machine_specific_memory_setup(void);
extern char *machine_specific_memory_setup(void); extern char *machine_specific_memory_setup(void);
extern char *memory_setup(void); extern char *memory_setup(void);
#endif /* __KERNEL__ */
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#define ISA_START_ADDRESS 0xa0000 #define ISA_START_ADDRESS 0xa0000