Commit ae2b56b9 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu

parents 8f5d36ed 16c2d3f8

arch/x86/include/asm/genapic_32.h

+0 −7
Original line number Diff line number Diff line
@@ -138,11 +138,4 @@ struct genapic { 
extern struct genapic *genapic;

extern void es7000_update_genapic_to_cluster(void);



enum uv_system_type {UV_NONE, UV_LEGACY_APIC, UV_X2APIC, UV_NON_UNIQUE_APIC};

#define get_uv_system_type()		UV_NONE

#define is_uv_system()			0

#define uv_wakeup_secondary(a, b)	1

#define uv_system_init()		do {} while (0)





#endif /* _ASM_X86_GENAPIC_32_H */

arch/x86/include/asm/genapic_64.h

+0 −6
Original line number Diff line number Diff line
@@ -51,15 +51,9 @@ extern struct genapic apic_x2apic_phys; 
extern int acpi_madt_oem_check(char *, char *);



extern void apic_send_IPI_self(int vector);

enum uv_system_type {UV_NONE, UV_LEGACY_APIC, UV_X2APIC, UV_NON_UNIQUE_APIC};

extern enum uv_system_type get_uv_system_type(void);

extern int is_uv_system(void);



extern struct genapic apic_x2apic_uv_x;

DECLARE_PER_CPU(int, x2apic_extra_bits);

extern void uv_cpu_init(void);

extern void uv_system_init(void);

extern int uv_wakeup_secondary(int phys_apicid, unsigned int start_rip);



extern void setup_apic_routing(void);

arch/x86/include/asm/irq_regs.h

+31 −5
Original line number Diff line number Diff line 
#ifdef CONFIG_X86_32

# include "irq_regs_32.h"

#else

# include "irq_regs_64.h"

#endif
 
/*

 * Per-cpu current frame pointer - the location of the last exception frame on

 * the stack, stored in the per-cpu area.

 *

 * Jeremy Fitzhardinge <jeremy@goop.org>

 */

#ifndef _ASM_X86_IRQ_REGS_H

#define _ASM_X86_IRQ_REGS_H



#include <asm/percpu.h>



#define ARCH_HAS_OWN_IRQ_REGS



DECLARE_PER_CPU(struct pt_regs *, irq_regs);



static inline struct pt_regs *get_irq_regs(void)

{

	return percpu_read(irq_regs);

}



static inline struct pt_regs *set_irq_regs(struct pt_regs *new_regs)

{

	struct pt_regs *old_regs;



	old_regs = get_irq_regs();

	percpu_write(irq_regs, new_regs);



	return old_regs;

}



#endif /* _ASM_X86_IRQ_REGS_32_H */

arch/x86/include/asm/irq_regs_32.h

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
/*

 * Per-cpu current frame pointer - the location of the last exception frame on

 * the stack, stored in the per-cpu area.

 *

 * Jeremy Fitzhardinge <jeremy@goop.org>

 */

#ifndef _ASM_X86_IRQ_REGS_32_H

#define _ASM_X86_IRQ_REGS_32_H



#include <asm/percpu.h>



#define ARCH_HAS_OWN_IRQ_REGS



DECLARE_PER_CPU(struct pt_regs *, irq_regs);



static inline struct pt_regs *get_irq_regs(void)

{

	return percpu_read(irq_regs);

}



static inline struct pt_regs *set_irq_regs(struct pt_regs *new_regs)

{

	struct pt_regs *old_regs;



	old_regs = get_irq_regs();

	percpu_write(irq_regs, new_regs);



	return old_regs;

}



#endif /* _ASM_X86_IRQ_REGS_32_H */

arch/x86/include/asm/irq_regs_64.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include <asm-generic/irq_regs.h>