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

Commit e7fd3b46 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-trampoline-for-linus' of... 

Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Fix binutils-2.21 symbol related build failures
  x86-64, trampoline: Remove unused variable
  x86, reboot: Fix the use of passed arguments in 32-bit BIOS reboot
  x86, reboot: Move the real-mode reboot code to an assembly file
  x86: Make the GDT_ENTRY() macro in <asm/segment.h> safe for assembly
  x86, trampoline: Use the unified trampoline setup for ACPI wakeup
  x86, trampoline: Common infrastructure for low memory trampolines

Fix up trivial conflicts in arch/x86/kernel/Makefile
parents fc82e1d5 2ae9d293

arch/x86/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -221,10 +221,6 @@ config X86_HT 
	def_bool y

	depends on SMP



config X86_TRAMPOLINE

	def_bool y

	depends on SMP || (64BIT && ACPI_SLEEP)



config X86_32_LAZY_GS

	def_bool y

	depends on X86_32 && !CC_STACKPROTECTOR

arch/x86/include/asm/acpi.h

+3 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <asm/processor.h>

#include <asm/mmu.h>

#include <asm/mpspec.h>

#include <asm/trampoline.h>



#define COMPILER_DEPENDENT_INT64   long long

#define COMPILER_DEPENDENT_UINT64  unsigned long long
@@ -117,7 +118,8 @@ static inline void acpi_disable_pci(void) 
extern int acpi_save_state_mem(void);

extern void acpi_restore_state_mem(void);



extern unsigned long acpi_wakeup_address;

extern const unsigned char acpi_wakeup_code[];

#define acpi_wakeup_address (__pa(TRAMPOLINE_SYM(acpi_wakeup_code)))



/* early initialization routine */

extern void acpi_reserve_wakeup_memory(void);

arch/x86/include/asm/reboot.h

+4 −1
Original line number Diff line number Diff line
@@ -18,7 +18,10 @@ extern struct machine_ops machine_ops; 


void native_machine_crash_shutdown(struct pt_regs *regs);

void native_machine_shutdown(void);

void machine_real_restart(const unsigned char *code, int length);

void machine_real_restart(unsigned int type);

/* These must match dispatch_table in reboot_32.S */

#define MRR_BIOS	0

#define MRR_APM		1



typedef void (*nmi_shootdown_cb)(int, struct die_args*);

void nmi_shootdown_cpus(nmi_shootdown_cb callback);

arch/x86/include/asm/segment.h

+7 −5
Original line number Diff line number Diff line 
#ifndef _ASM_X86_SEGMENT_H

#define _ASM_X86_SEGMENT_H



#include <linux/const.h>



/* Constructor for a conventional segment GDT (or LDT) entry */

/* This is a macro so it can be used in initializers */

#define GDT_ENTRY(flags, base, limit)			\

	((((base)  & 0xff000000ULL) << (56-24)) |	\

	 (((flags) & 0x0000f0ffULL) << 40) |		\

	 (((limit) & 0x000f0000ULL) << (48-16)) |	\

	 (((base)  & 0x00ffffffULL) << 16) |		\

	 (((limit) & 0x0000ffffULL)))

	((((base)  & _AC(0xff000000,ULL)) << (56-24)) |	\

	 (((flags) & _AC(0x0000f0ff,ULL)) << 40) |	\

	 (((limit) & _AC(0x000f0000,ULL)) << (48-16)) |	\

	 (((base)  & _AC(0x00ffffff,ULL)) << 16) |	\

	 (((limit) & _AC(0x0000ffff,ULL))))



/* Simple and small GDT entries for booting only */

arch/x86/include/asm/trampoline.h

+22 −11
Original line number Diff line number Diff line
@@ -3,25 +3,36 @@ 


#ifndef __ASSEMBLY__



#ifdef CONFIG_X86_TRAMPOLINE

#include <linux/types.h>

#include <asm/io.h>



/*

 * Trampoline 80x86 program as an array.

 * Trampoline 80x86 program as an array.  These are in the init rodata

 * segment, but that's okay, because we only care about the relative

 * addresses of the symbols.

 */

extern const unsigned char trampoline_data [];

extern const unsigned char trampoline_end  [];

extern unsigned char *trampoline_base;

extern const unsigned char x86_trampoline_start [];

extern const unsigned char x86_trampoline_end   [];

extern unsigned char *x86_trampoline_base;



extern unsigned long init_rsp;

extern unsigned long initial_code;

extern unsigned long initial_gs;



#define TRAMPOLINE_SIZE roundup(trampoline_end - trampoline_data, PAGE_SIZE)

extern void __init setup_trampolines(void);



extern const unsigned char trampoline_data[];

extern const unsigned char trampoline_status[];



#define TRAMPOLINE_SYM(x)						\

	((void *)(x86_trampoline_base +					\

		  ((const unsigned char *)(x) - x86_trampoline_start)))



extern unsigned long setup_trampoline(void);

extern void __init reserve_trampoline_memory(void);

#else

static inline void reserve_trampoline_memory(void) {}

#endif /* CONFIG_X86_TRAMPOLINE */

/* Address of the SMP trampoline */

static inline unsigned long trampoline_address(void)

{

	return virt_to_phys(TRAMPOLINE_SYM(trampoline_data));

}



#endif /* __ASSEMBLY__ */