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

Commit 067e1813 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: Work around compilation warning in arch/x86/kernel/apm_32.c
  x86, UV: Complete IRQ interrupt migration in arch_enable_uv_irq()
  x86, 32-bit: Fix double accounting in reserve_top_address()
  x86: Don't use current_cpu_data in x2apic phys_pkg_id
  x86, UV: Fix UV apic mode
  x86, UV: Fix macros for accessing large node numbers
  x86, UV: Delete mapping of MMR rangs mapped by BIOS
  x86, UV: Handle missing blade-local memory correctly
  x86: fix assembly constraints in native_save_fl()
  x86, msr: execute on the correct CPU subset
  x86: Fix assert syntax in vmlinux.lds.S
  x86: Make 64-bit efi_ioremap use ioremap on MMIO regions
  x86: Add quirk to make Apple MacBook5,2 use reboot=pci
  x86: Fix CPA memtype reserving in the set_pages_array*() cases
  x86, pat: Fix set_memory_wc related corruption
  x86: fix section mismatch for i386 init code
parents 3f5760b9 dc731fbb

arch/x86/include/asm/efi.h

+3 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ extern unsigned long asmlinkage efi_call_phys(void *, ...); 
#define efi_call_virt6(f, a1, a2, a3, a4, a5, a6)	\

	efi_call_virt(f, a1, a2, a3, a4, a5, a6)



#define efi_ioremap(addr, size)			ioremap_cache(addr, size)

#define efi_ioremap(addr, size, type)		ioremap_cache(addr, size)



#else /* !CONFIG_X86_32 */
@@ -84,7 +84,8 @@ extern u64 efi_call6(void *fp, u64 arg1, u64 arg2, u64 arg3, 
	efi_call6((void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2), \

		  (u64)(a3), (u64)(a4), (u64)(a5), (u64)(a6))



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

extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size,

				 u32 type);



#endif /* CONFIG_X86_32 */

arch/x86/include/asm/irqflags.h

+7 −1
Original line number Diff line number Diff line
@@ -12,9 +12,15 @@ static inline unsigned long native_save_fl(void) 
{

	unsigned long flags;



	/*

	 * Note: this needs to be "=r" not "=rm", because we have the

	 * stack offset from what gcc expects at the time the "pop" is

	 * executed, and so a memory reference with respect to the stack

	 * would end up using the wrong address.

	 */

	asm volatile("# __raw_save_flags\n\t"

		     "pushf ; pop %0"

		     : "=g" (flags)

		     : "=r" (flags)

		     : /* no input */

		     : "memory");

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

+8 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ DECLARE_PER_CPU(struct uv_hub_info_s, __uv_hub_info); 
#define UV_GLOBAL_MMR32_PNODE_BITS(p)	((p) << (UV_GLOBAL_MMR32_PNODE_SHIFT))



#define UV_GLOBAL_MMR64_PNODE_BITS(p)					\

	((unsigned long)(UV_PNODE_TO_GNODE(p)) << UV_GLOBAL_MMR64_PNODE_SHIFT)

	(((unsigned long)(p)) << UV_GLOBAL_MMR64_PNODE_SHIFT)



#define UV_APIC_PNODE_SHIFT	6
@@ -327,6 +327,7 @@ struct uv_blade_info { 
	unsigned short	nr_possible_cpus;

	unsigned short	nr_online_cpus;

	unsigned short	pnode;

	short		memory_nid;

};

extern struct uv_blade_info *uv_blade_info;

extern short *uv_node_to_blade;
@@ -363,6 +364,12 @@ static inline int uv_blade_to_pnode(int bid) 
	return uv_blade_info[bid].pnode;

}



/* Nid of memory node on blade. -1 if no blade-local memory */

static inline int uv_blade_to_memory_nid(int bid)

{

	return uv_blade_info[bid].memory_nid;

}



/* Determine the number of possible cpus on a blade */

static inline int uv_blade_nr_possible_cpus(int bid)

{

arch/x86/kernel/apic/io_apic.c

+3 −0
Original line number Diff line number Diff line
@@ -3793,6 +3793,9 @@ int arch_enable_uv_irq(char *irq_name, unsigned int irq, int cpu, int mmr_blade, 
	mmr_pnode = uv_blade_to_pnode(mmr_blade);

	uv_write_global_mmr64(mmr_pnode, mmr_offset, mmr_value);



	if (cfg->move_in_progress)

		send_cleanup_vector(cfg);



	return irq;

}

arch/x86/kernel/apic/x2apic_cluster.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static unsigned long set_apic_id(unsigned int id) 


static int x2apic_cluster_phys_pkg_id(int initial_apicid, int index_msb)

{

	return current_cpu_data.initial_apicid >> index_msb;

	return initial_apicid >> index_msb;

}



static void x2apic_send_IPI_self(int vector)