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

Commit 74c75f52 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

* 'x86-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: cpu_index build fix
  x86/voyager: fix missing cpu_index initialisation
  x86/voyager: fix compile breakage caused by dc1e35c6
  x86: fix /dev/mem mmap breakage when PAT is disabled
  x86/voyager: fix compile breakage casued by x86: move prefill_possible_map calling early
  x86: use CONFIG_X86_SMP instead of CONFIG_SMP
  x86/voyager: fix boot breakage caused by x86: boot secondary cpus through initial_code
  x86, uv: fix compile error in uv_hub.h
  i386/PAE: fix pud_page()
  x86: remove debug code from arch_add_memory()
  x86: start annotating early ioremap pointers with __iomem
  x86: two trivial sparse annotations
  x86: fix init_memory_mapping for [dc000000 - e0000000) - v2
parents 0b23e30b 1c4acdb4

arch/x86/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -231,6 +231,10 @@ config SMP 


	  If you don't know what to do here, say N.



config X86_HAS_BOOT_CPU_ID

	def_bool y

	depends on X86_VOYAGER



config X86_FIND_SMP_CONFIG

	def_bool y

	depends on X86_MPPARSE || X86_VOYAGER

arch/x86/include/asm/io.h

+3 −3
Original line number Diff line number Diff line
@@ -82,9 +82,9 @@ extern void __iomem *ioremap_wc(unsigned long offset, unsigned long size); 
extern void early_ioremap_init(void);

extern void early_ioremap_clear(void);

extern void early_ioremap_reset(void);

extern void *early_ioremap(unsigned long offset, unsigned long size);

extern void *early_memremap(unsigned long offset, unsigned long size);

extern void early_iounmap(void *addr, unsigned long size);

extern void __iomem *early_ioremap(unsigned long offset, unsigned long size);

extern void __iomem *early_memremap(unsigned long offset, unsigned long size);

extern void early_iounmap(void __iomem *addr, unsigned long size);

extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys);

arch/x86/include/asm/pgtable-3level.h

+2 −2
Original line number Diff line number Diff line
@@ -120,13 +120,13 @@ static inline void pud_clear(pud_t *pudp) 
		write_cr3(pgd);

}



#define pud_page(pud) ((struct page *) __va(pud_val(pud) & PTE_PFN_MASK))

#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)



#define pud_page_vaddr(pud) ((unsigned long) __va(pud_val(pud) & PTE_PFN_MASK))





/* Find an entry in the second-level page table.. */

#define pmd_offset(pud, address) ((pmd_t *)pud_page(*(pud)) +	\

#define pmd_offset(pud, address) ((pmd_t *)pud_page_vaddr(*(pud)) +	\

				  pmd_index(address))



#ifdef CONFIG_SMP

arch/x86/include/asm/smp.h

+6 −0
Original line number Diff line number Diff line
@@ -225,5 +225,11 @@ static inline int hard_smp_processor_id(void) 


#endif /* CONFIG_X86_LOCAL_APIC */



#ifdef CONFIG_X86_HAS_BOOT_CPU_ID

extern unsigned char boot_cpu_id;

#else

#define boot_cpu_id	0

#endif



#endif /* __ASSEMBLY__ */

#endif /* _ASM_X86_SMP_H */

arch/x86/include/asm/uv/uv_hub.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#include <linux/numa.h>

#include <linux/percpu.h>

#include <linux/timer.h>

#include <asm/types.h>

#include <asm/percpu.h>