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

Commit 664a1566 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 

* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  x86: cpa, fix out of date comment
  KVM is not seen under X86 config with latest git (32 bit compile)
  x86: cpa: ensure page alignment
  x86: include proper prototypes for rodata_test
  x86: fix gart_iommu_init()
  x86: EFI set_memory_x()/set_memory_uc() fixes
  x86: make dump_pagetable() static
  x86: fix "BUG: sleeping function called from invalid context" in print_vma_addr()
parents b9e22290 f8d8406b

arch/x86/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -21,6 +21,8 @@ config X86 
	select HAVE_IDE

	select HAVE_IDE

	select HAVE_OPROFILE

	select HAVE_OPROFILE

	select HAVE_KPROBES

	select HAVE_KPROBES

	select HAVE_KVM







config GENERIC_LOCKBREAK

config GENERIC_LOCKBREAK

	def_bool n

	def_bool n
@@ -119,8 +121,6 @@ config ARCH_HAS_CPU_RELAX 
config HAVE_SETUP_PER_CPU_AREA

config HAVE_SETUP_PER_CPU_AREA

	def_bool X86_64

	def_bool X86_64





select HAVE_KVM



config ARCH_HIBERNATION_POSSIBLE

config ARCH_HIBERNATION_POSSIBLE

	def_bool y

	def_bool y

	depends on !SMP || !X86_VOYAGER

	depends on !SMP || !X86_VOYAGER

arch/x86/kernel/efi.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -391,7 +391,7 @@ static void __init runtime_code_page_mkexec(void) 
		if (md->type != EFI_RUNTIME_SERVICES_CODE)

		if (md->type != EFI_RUNTIME_SERVICES_CODE)

			continue;

			continue;





		set_memory_x(md->virt_addr, md->num_pages << EFI_PAGE_SHIFT);

		set_memory_x(md->virt_addr, md->num_pages);

	}

	}

}

}
@@ -434,7 +434,7 @@ void __init efi_enter_virtual_mode(void) 
		}

		}





		if (!(md->attribute & EFI_MEMORY_WB))

		if (!(md->attribute & EFI_MEMORY_WB))

			set_memory_uc(md->virt_addr, size);

			set_memory_uc(md->virt_addr, md->num_pages);





		systab = (u64) (unsigned long) efi_phys.systab;

		systab = (u64) (unsigned long) efi_phys.systab;

		if (md->phys_addr <= systab && systab < end) {

		if (md->phys_addr <= systab && systab < end) {

arch/x86/kernel/pci-gart_64.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -749,6 +749,15 @@ void __init gart_iommu_init(void) 
	 */

	 */

	set_memory_np((unsigned long)__va(iommu_bus_base),

	set_memory_np((unsigned long)__va(iommu_bus_base),

				iommu_size >> PAGE_SHIFT);

				iommu_size >> PAGE_SHIFT);

	/*

	 * Tricky. The GART table remaps the physical memory range,

	 * so the CPU wont notice potential aliases and if the memory

	 * is remapped to UC later on, we might surprise the PCI devices

	 * with a stray writeout of a cacheline. So play it sure and

	 * do an explicit, full-scale wbinvd() _after_ having marked all

	 * the pages as Not-Present:

	 */

	wbinvd();





	/*

	/*

	 * Try to workaround a bug (thanks to BenH)

	 * Try to workaround a bug (thanks to BenH)

arch/x86/kernel/test_rodata.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -10,8 +10,8 @@ 
 * of the License.

 * of the License.

 */

 */

#include <linux/module.h>

#include <linux/module.h>

#include <asm/cacheflush.h>

#include <asm/sections.h>

#include <asm/sections.h>

extern int rodata_test_data;





int rodata_test(void)

int rodata_test(void)

{

{

arch/x86/kernel/traps_64.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -84,7 +84,7 @@ static inline void conditional_sti(struct pt_regs *regs) 




static inline void preempt_conditional_sti(struct pt_regs *regs)

static inline void preempt_conditional_sti(struct pt_regs *regs)

{

{

	preempt_disable();

	inc_preempt_count();

	if (regs->flags & X86_EFLAGS_IF)

	if (regs->flags & X86_EFLAGS_IF)

		local_irq_enable();

		local_irq_enable();

}

}
@@ -95,7 +95,7 @@ static inline void preempt_conditional_cli(struct pt_regs *regs) 
		local_irq_disable();

		local_irq_disable();

	/* Make sure to not schedule here because we could be running

	/* Make sure to not schedule here because we could be running

	   on an exception stack. */

	   on an exception stack. */

	preempt_enable_no_resched();

	dec_preempt_count();

}

}





int kstack_depth_to_print = 12;

int kstack_depth_to_print = 12;