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

Commit 05e12a69 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, pebs: correct qualifier passed to ds_write_config() from ds_request_pebs()
  x86, bts: remove bad warning
  x86: add Dell XPS710 reboot quirk
  x86, math-emu: fix init_fpu for task != current
  x86: EFI: Back efi_ioremap with init_memory_mapping instead of FIX_MAP
  x86: fix DMI on EFI
parents cd3c1cde 73bf1b62

arch/x86/include/asm/efi.h

+0 −2
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ extern unsigned long asmlinkage efi_call_phys(void *, ...); 


#else /* !CONFIG_X86_32 */



#define MAX_EFI_IO_PAGES	100



extern u64 efi_call0(void *fp);

extern u64 efi_call1(void *fp, u64 arg1);

extern u64 efi_call2(void *fp, u64 arg1, u64 arg2);

arch/x86/include/asm/fixmap_64.h

+0 −4
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <asm/apicdef.h>

#include <asm/page.h>

#include <asm/vsyscall.h>

#include <asm/efi.h>



/*

 * Here we define all the compile-time 'special' virtual
@@ -43,9 +42,6 @@ enum fixed_addresses { 
	FIX_APIC_BASE,	/* local (CPU) APIC) -- required for SMP or not */

	FIX_IO_APIC_BASE_0,

	FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS - 1,

	FIX_EFI_IO_MAP_LAST_PAGE,

	FIX_EFI_IO_MAP_FIRST_PAGE = FIX_EFI_IO_MAP_LAST_PAGE

				  + MAX_EFI_IO_PAGES - 1,

#ifdef CONFIG_PARAVIRT

	FIX_PARAVIRT_BOOTMAP,

#endif

arch/x86/include/asm/i387.h

+7 −1
Original line number Diff line number Diff line
@@ -172,7 +172,13 @@ static inline void __save_init_fpu(struct task_struct *tsk) 


#else  /* CONFIG_X86_32 */



extern void finit(void);

#ifdef CONFIG_MATH_EMULATION

extern void finit_task(struct task_struct *tsk);

#else

static inline void finit_task(struct task_struct *tsk)

{

}

#endif



static inline void tolerant_fwait(void)

{

arch/x86/kernel/ds.c

+1 −2
Original line number Diff line number Diff line
@@ -729,7 +729,7 @@ struct pebs_tracer *ds_request_pebs(struct task_struct *task, 


	spin_unlock_irqrestore(&ds_lock, irq);



	ds_write_config(tracer->ds.context, &tracer->trace.ds, ds_bts);

	ds_write_config(tracer->ds.context, &tracer->trace.ds, ds_pebs);

	ds_resume_pebs(tracer);



	return tracer;
@@ -1029,5 +1029,4 @@ void ds_copy_thread(struct task_struct *tsk, struct task_struct *father) 


void ds_exit_thread(struct task_struct *tsk)

{

	WARN_ON(tsk->thread.ds_ctx);

}

arch/x86/kernel/efi.c

+5 −2
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ void __init efi_enter_virtual_mode(void) 
	efi_memory_desc_t *md;

	efi_status_t status;

	unsigned long size;

	u64 end, systab, addr, npages;

	u64 end, systab, addr, npages, end_pfn;

	void *p, *va;



	efi.systab = NULL;
@@ -479,7 +479,10 @@ void __init efi_enter_virtual_mode(void) 
		size = md->num_pages << EFI_PAGE_SHIFT;

		end = md->phys_addr + size;



		if (PFN_UP(end) <= max_low_pfn_mapped)

		end_pfn = PFN_UP(end);

		if (end_pfn <= max_low_pfn_mapped

		    || (end_pfn > (1UL << (32 - PAGE_SHIFT))

			&& end_pfn <= max_pfn_mapped))

			va = __va(md->phys_addr);

		else

			va = efi_ioremap(md->phys_addr, size);