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

Commit ab8aadbd 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, Calgary: Increase max PHB number
  x86: Fix rebooting on Dell Precision WorkStation T7400
  x86: Fix vsyscall on gcc 4.5 with -Os
  x86, pat: Proper init of memtype subtree_max_end
  um, hweight: Fix UML boot crash due to x86 optimized hweight
  x86, setup: Set ax register in boot vga query
  percpu, x86: Avoid warnings of unused variables in per cpu
  x86, irq: Rename gsi_end gsi_top, and fix off by one errors
  x86: use __ASSEMBLY__ rather than __ASSEMBLER__
parents 8b7231a9 499a00e9

arch/um/include/asm/arch_hweight.h

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#ifndef _ASM_UM_HWEIGHT_H

#define _ASM_UM_HWEIGHT_H



#include <asm-generic/bitops/arch_hweight.h>



#endif

arch/x86/boot/video-vga.c

+1 −2
Original line number Diff line number Diff line
@@ -41,13 +41,12 @@ static __videocard video_vga; 
static u8 vga_set_basic_mode(void)

{

	struct biosregs ireg, oreg;

	u16 ax;

	u8 mode;



	initregs(&ireg);



	/* Query current mode */

	ax = 0x0f00;

	ireg.ax = 0x0f00;

	intcall(0x10, &ireg, &oreg);

	mode = oreg.al;

arch/x86/include/asm/io_apic.h

+2 −2
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ struct mp_ioapic_gsi{ 
	u32 gsi_end;

};

extern struct mp_ioapic_gsi  mp_gsi_routing[];

extern u32 gsi_end;

extern u32 gsi_top;

int mp_find_ioapic(u32 gsi);

int mp_find_ioapic_pin(int ioapic, u32 gsi);

void __init mp_register_ioapic(int id, u32 address, u32 gsi_base);
@@ -197,7 +197,7 @@ static const int timer_through_8259 = 0; 
static inline void ioapic_init_mappings(void)	{ }

static inline void ioapic_insert_resources(void) { }

static inline void probe_nr_irqs_gsi(void)	{ }

#define gsi_end (NR_IRQS_LEGACY - 1)

#define gsi_top (NR_IRQS_LEGACY)

static inline int mp_find_ioapic(u32 gsi) { return 0; }



struct io_apic_irq_attr;

arch/x86/include/asm/percpu.h

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ do { \ 
	if (0) {					\

		pto_T__ pto_tmp__;			\

		pto_tmp__ = (val);			\

		(void)pto_tmp__;			\

	}						\

	switch (sizeof(var)) {				\

	case 1:						\
@@ -115,6 +116,7 @@ do { \ 
	if (0) {							\

		pao_T__ pao_tmp__;					\

		pao_tmp__ = (val);					\

		(void)pao_tmp__;					\

	}								\

	switch (sizeof(var)) {						\

	case 1:								\

arch/x86/include/asm/pgtable_32_types.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
 */

#define VMALLOC_OFFSET	(8 * 1024 * 1024)



#ifndef __ASSEMBLER__

#ifndef __ASSEMBLY__

extern bool __vmalloc_start_set; /* set once high_memory is set */

#endif