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

Commit b8256b45 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: add linux kernel support for YMM state
  x86: fix wrong section of pat_disable & make it static
  x86: Fix section mismatches in mpparse
  x86: fix set_fixmap to use phys_addr_t
  x86: Document get_user_pages_fast()
  x86, intr-remap: fix eoi for interrupt remapping without x2apic
parents 8255309b a30469e7

arch/x86/include/asm/io.h

+4 −2
Original line number Diff line number Diff line
@@ -193,8 +193,10 @@ extern void __iomem *ioremap_wc(resource_size_t offset, unsigned long size); 
 */

extern void early_ioremap_init(void);

extern void early_ioremap_reset(void);

extern void __iomem *early_ioremap(unsigned long offset, unsigned long size);

extern void __iomem *early_memremap(unsigned long offset, unsigned long size);

extern void __iomem *early_ioremap(resource_size_t phys_addr,

				   unsigned long size);

extern void __iomem *early_memremap(resource_size_t phys_addr,

				    unsigned long size);

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



#define IO_SPACE_LIMIT 0xffff

arch/x86/include/asm/processor.h

+6 −0
Original line number Diff line number Diff line
@@ -352,6 +352,11 @@ struct i387_soft_struct { 
	u32			entry_eip;

};



struct ymmh_struct {

	/* 16 * 16 bytes for each YMMH-reg = 256 bytes */

	u32 ymmh_space[64];

};



struct xsave_hdr_struct {

	u64 xstate_bv;

	u64 reserved1[2];
@@ -361,6 +366,7 @@ struct xsave_hdr_struct { 
struct xsave_struct {

	struct i387_fxsave_struct i387;

	struct xsave_hdr_struct xsave_hdr;

	struct ymmh_struct ymmh;

	/* new processor state extensions will go here */

} __attribute__ ((packed, aligned (64)));

arch/x86/include/asm/sigcontext.h

+6 −0
Original line number Diff line number Diff line
@@ -269,6 +269,11 @@ struct _xsave_hdr { 
	__u64 reserved2[5];

};



struct _ymmh_state {

	/* 16 * 16 bytes for each YMMH-reg */

	__u32 ymmh_space[64];

};



/*

 * Extended state pointed by the fpstate pointer in the sigcontext.

 * In addition to the fpstate, information encoded in the xstate_hdr
@@ -278,6 +283,7 @@ struct _xsave_hdr { 
struct _xstate {

	struct _fpstate fpstate;

	struct _xsave_hdr xstate_hdr;

	struct _ymmh_state ymmh;

	/* new processor state extensions go here */

};

arch/x86/include/asm/xsave.h

+2 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


#define XSTATE_FP	0x1

#define XSTATE_SSE	0x2

#define XSTATE_YMM	0x4



#define XSTATE_FPSSE	(XSTATE_FP | XSTATE_SSE)
@@ -15,7 +16,7 @@ 
/*

 * These are the features that the OS can handle currently.

 */

#define XCNTXT_MASK	(XSTATE_FP | XSTATE_SSE)

#define XCNTXT_MASK	(XSTATE_FP | XSTATE_SSE | XSTATE_YMM)



#ifdef CONFIG_X86_64

#define REX_PREFIX	"0x48, "

arch/x86/kernel/apic/io_apic.c

+4 −1
Original line number Diff line number Diff line
@@ -2524,7 +2524,6 @@ static void irq_complete_move(struct irq_desc **descp) 
static inline void irq_complete_move(struct irq_desc **descp) {}

#endif



#ifdef CONFIG_X86_X2APIC

static void __eoi_ioapic_irq(unsigned int irq, struct irq_cfg *cfg)

{

	int apic, pin;
@@ -2558,6 +2557,7 @@ eoi_ioapic_irq(struct irq_desc *desc) 
	spin_unlock_irqrestore(&ioapic_lock, flags);

}



#ifdef CONFIG_X86_X2APIC

static void ack_x2apic_level(unsigned int irq)

{

	struct irq_desc *desc = irq_to_desc(irq);
@@ -2634,6 +2634,9 @@ static void ack_apic_level(unsigned int irq) 
	 */

	ack_APIC_irq();



	if (irq_remapped(irq))

		eoi_ioapic_irq(desc);



	/* Now we can move and renable the irq */

	if (unlikely(do_unmask_irq)) {

		/* Only migrate the irq if the ack has been received.