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

Commit 14c62e78 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86-32, vdso: On system call restart after SYSENTER, use int $0x80
  x86, UV: Remove UV delay in starting slave cpus
  x86, olpc: Wait for last byte of EC command to be accepted
parents ba8f3184 7ca0758c

arch/x86/kernel/apic/x2apic_uv_x.c

+0 −1
Original line number Diff line number Diff line
@@ -207,7 +207,6 @@ static int __cpuinit uv_wakeup_secondary(int phys_apicid, unsigned long start_ri 
	    ((start_rip << UVH_IPI_INT_VECTOR_SHFT) >> 12) |

	    APIC_DM_INIT;

	uv_write_global_mmr64(pnode, UVH_IPI_INT, val);

	mdelay(10);



	val = (1UL << UVH_IPI_INT_SEND_SHFT) |

	    (phys_apicid << UVH_IPI_INT_APIC_ID_SHFT) |

arch/x86/platform/olpc/olpc.c

+2 −2
Original line number Diff line number Diff line
@@ -161,13 +161,13 @@ restart: 
	if (inbuf && inlen) {

		/* write data to EC */

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

			pr_devel("olpc-ec:  sending cmd arg 0x%x\n", inbuf[i]);

			outb(inbuf[i], 0x68);

			if (wait_on_ibf(0x6c, 0)) {

				printk(KERN_ERR "olpc-ec:  timeout waiting for"

						" EC accept data!\n");

				goto err;

			}

			pr_devel("olpc-ec:  sending cmd arg 0x%x\n", inbuf[i]);

			outb(inbuf[i], 0x68);

		}

	}

	if (outbuf && outlen) {

arch/x86/vdso/vdso32/sysenter.S

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ __kernel_vsyscall: 
	.space 7,0x90



	/* 14: System call restart point is here! (SYSENTER_RETURN-2) */

	jmp .Lenter_kernel

	int $0x80

	/* 16: System call normal return point is here! */

VDSO32_SYSENTER_RETURN:	/* Symbol used by sysenter.c via vdso32-syms.h */

	pop %ebp