From afaf86736e7fd2f94c8c71c9b749e4bd3001bbaf Mon Sep 17 00:00:00 2001
From: Andy Lutomirski <luto@MIT.EDU>
Date: Wed, 3 Aug 2011 09:31:49 -0400
Subject: [PATCH] --- yaml --- r: 262866 b: refs/heads/master c:
 1bdfac19b3ecfca545281c15c7aea7ebc2eaef31 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/arch/x86/vdso/vdso.S | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1508dd2fcf14..71e2e9c0534b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17b0436077d99211d8b26886235a36c5ec54ac57
+refs/heads/master: 1bdfac19b3ecfca545281c15c7aea7ebc2eaef31
diff --git a/trunk/arch/x86/vdso/vdso.S b/trunk/arch/x86/vdso/vdso.S
index 1b979c12ba85..01f5e3b4613c 100644
--- a/trunk/arch/x86/vdso/vdso.S
+++ b/trunk/arch/x86/vdso/vdso.S
@@ -9,6 +9,7 @@ __PAGE_ALIGNED_DATA
 vdso_start:
 	.incbin "arch/x86/vdso/vdso.so"
 vdso_end:
+	.align PAGE_SIZE /* extra data here leaks to userspace. */
 
 .previous