Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b04be7e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

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
parents bdec6cac 2567d71c

arch/x86/kernel/numaq_32.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ int __init get_memcfg_numaq(void) 
void __init numaq_tsc_disable(void)

{

	if (!found_numaq)

		return -1;

		return;



	if (num_online_nodes() > 1) {

		printk(KERN_DEBUG "NUMAQ: disabling TSC\n");

arch/x86/mm/init_64.c

+1 −1
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ static unsigned long __init kernel_physical_mapping_init(unsigned long start, 
		unsigned long pud_phys;

		pud_t *pud;



		next = start + PGDIR_SIZE;

		next = (start + PGDIR_SIZE) & PGDIR_MASK;

		if (next > end)

			next = end;

include/asm-x86/e820.h

+2 −1
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ struct e820map { 
	struct e820entry map[E820_X_MAX];

};



#ifdef __KERNEL__

/* see comment in arch/x86/kernel/e820.c */

extern struct e820map e820;

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 *machine_specific_memory_setup(void);

extern char *memory_setup(void);



#endif /* __KERNEL__ */

#endif /* __ASSEMBLY__ */



#define ISA_START_ADDRESS	0xa0000