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

Commit f9b3bcfb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 mm changes from Ingo Molnar:
 "Misc smaller changes all over the map"

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/iommu/dmar: Remove warning for HPET scope type
  x86/mm/gart: Drop unnecessary check
  x86/mm/hotplug: Put kernel_physical_mapping_remove() declaration in CONFIG_MEMORY_HOTREMOVE
  x86/mm/fixmap: Remove unused FIX_CYCLONE_TIMER
  x86/mm/numa: Simplify some bit mangling
  x86/mm: Re-enable DEBUG_TLBFLUSH for X86_32
  x86/mm/cpa: Cleanup split_large_page() and its callee
  x86: Drop always empty .text..page_aligned section
parents 01c7cd0e 13f72756

arch/x86/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ config DOUBLEFAULT 


config DEBUG_TLBFLUSH

	bool "Set upper limit of TLB entries to flush one-by-one"

	depends on DEBUG_KERNEL && (X86_64 || X86_INVLPG)

	depends on DEBUG_KERNEL

	---help---



	X86-only for now.

arch/x86/include/asm/fixmap.h

+0 −3
Original line number Diff line number Diff line
@@ -105,9 +105,6 @@ enum fixed_addresses { 
	FIX_LI_PCIB,	/* Lithium PCI Bridge B */

#endif

	FIX_RO_IDT,	/* Virtual mapping for read-only IDT */

#ifdef CONFIG_X86_CYCLONE_TIMER

	FIX_CYCLONE_TIMER, /*cyclone timer register*/

#endif

#ifdef CONFIG_X86_32

	FIX_KMAP_BEGIN,	/* reserved pte's for temporary kernel mappings */

	FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,

arch/x86/include/asm/pgtable_types.h

+0 −1
Original line number Diff line number Diff line
@@ -351,7 +351,6 @@ static inline void update_page_count(int level, unsigned long pages) { } 
 * as a pte too.

 */

extern pte_t *lookup_address(unsigned long address, unsigned int *level);

extern int __split_large_page(pte_t *kpte, unsigned long address, pte_t *pbase);

extern phys_addr_t slow_virt_to_phys(void *__address);



#endif	/* !__ASSEMBLY__ */

arch/x86/kernel/acpi/wakeup_32.S

+1 −1
Original line number Diff line number Diff line 
	.section .text..page_aligned

	.text

#include <linux/linkage.h>

#include <asm/segment.h>

#include <asm/page_types.h>

arch/x86/kernel/aperture_64.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static u32 __init allocate_aperture(void) 
	 */

	addr = memblock_find_in_range(GART_MIN_ADDR, GART_MAX_ADDR,

				      aper_size, aper_size);

	if (!addr || addr + aper_size > GART_MAX_ADDR) {

	if (!addr) {

		printk(KERN_ERR

			"Cannot allocate aperture memory hole (%lx,%uK)\n",

				addr, aper_size>>10);