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

Commit 0a9e0703 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  x86-boot: don't request VBE2 information
  x86: re-add reboot fixups
  x86: fix typo in step.c
  x86: fix merge mistake in i387.c
  x86: clear DF before calling signal handler
parents 80d38f9a 1722770f

arch/x86/boot/vesa.h

+1 −8
Original line number Diff line number Diff line
@@ -26,17 +26,10 @@ struct vesa_general_info { 
	far_ptr video_mode_ptr;	/* 14 */

	u16 total_memory;	/* 18 */



	u16 oem_software_rev;	/* 20 */

	far_ptr oem_vendor_name_ptr;	/* 22 */

	far_ptr oem_product_name_ptr;	/* 26 */

	far_ptr oem_product_rev_ptr;	/* 30 */



	u8 reserved[222];	/* 34 */

	u8 oem_data[256];	/* 256 */

	u8 reserved[236];	/* 20 */

} __attribute__ ((packed));



#define VESA_MAGIC ('V' + ('E' << 8) + ('S' << 16) + ('A' << 24))

#define VBE2_MAGIC ('V' + ('B' << 8) + ('E' << 16) + ('2' << 24))



struct vesa_mode_info {

	u16 mode_attr;		/* 0 */

arch/x86/boot/video-vesa.c

+0 −2
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ static int vesa_probe(void) 


	video_vesa.modes = GET_HEAP(struct mode_info, 0);



	vginfo.signature = VBE2_MAGIC;



	ax = 0x4f00;

	di = (size_t)&vginfo;

	asm(INT10

arch/x86/ia32/ia32_signal.c

+2 −2
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka, 
	regs->ss = __USER32_DS;



	set_fs(USER_DS);

	regs->flags &= ~X86_EFLAGS_TF;

	regs->flags &= ~(X86_EFLAGS_TF | X86_EFLAGS_DF);

	if (test_thread_flag(TIF_SINGLESTEP))

		ptrace_notify(SIGTRAP);
@@ -600,7 +600,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, 
	regs->ss = __USER32_DS;



	set_fs(USER_DS);

	regs->flags &= ~X86_EFLAGS_TF;

	regs->flags &= ~(X86_EFLAGS_TF | X86_EFLAGS_DF);

	if (test_thread_flag(TIF_SINGLESTEP))

		ptrace_notify(SIGTRAP);

arch/x86/kernel/i387.c

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static void convert_from_fxsr(struct user_i387_ia32_struct *env, 
	}

#else

	env->fip = fxsave->fip;

	env->fcs = fxsave->fcs;

	env->fcs = (u16) fxsave->fcs | ((u32) fxsave->fop << 16);

	env->foo = fxsave->foo;

	env->fos = fxsave->fos;

#endif

arch/x86/kernel/reboot.c

+6 −0
Original line number Diff line number Diff line
@@ -326,6 +326,10 @@ static inline void kb_wait(void) 
	}

}



void __attribute__((weak)) mach_reboot_fixups(void)

{

}



static void native_machine_emergency_restart(void)

{

	int i;
@@ -337,6 +341,8 @@ static void native_machine_emergency_restart(void) 
		/* Could also try the reset bit in the Hammer NB */

		switch (reboot_type) {

		case BOOT_KBD:

			mach_reboot_fixups(); /* for board specific fixups */



			for (i = 0; i < 10; i++) {

				kb_wait();

				udelay(50);