From 3bbd3f797c838b1c0d7766d56992d3e3d2c42c82 Mon Sep 17 00:00:00 2001
From: Markus Metzger <markus.t.metzger@intel.com>
Date: Tue, 25 Nov 2008 08:49:06 +0100
Subject: [PATCH] --- yaml --- r: 119409 b: refs/heads/master c:
 c4858ffc8f2dc850cb1f609c679b1ac1ad36ef0c h: refs/heads/master i:   119407:
 ec55759462c4844b344b2fe6b4035d6cd438867b v: v3

---
 [refs]                     | 2 +-
 trunk/arch/x86/kernel/ds.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3de19d5d09fa..a4addbf6ccb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5e8ca633bbe972eff6f84e064a63c0c08ed6c3d
+refs/heads/master: c4858ffc8f2dc850cb1f609c679b1ac1ad36ef0c
diff --git a/trunk/arch/x86/kernel/ds.c b/trunk/arch/x86/kernel/ds.c
index 4c8d57ec9663..04e38ef646af 100644
--- a/trunk/arch/x86/kernel/ds.c
+++ b/trunk/arch/x86/kernel/ds.c
@@ -816,13 +816,21 @@ static const struct ds_configuration ds_cfg_var = {
 	.sizeof_ds    = sizeof(long) * 12,
 	.sizeof_field = sizeof(long),
 	.sizeof_rec[ds_bts]   = sizeof(long) * 3,
+#ifdef __i386__
 	.sizeof_rec[ds_pebs]  = sizeof(long) * 10
+#else
+	.sizeof_rec[ds_pebs]  = sizeof(long) * 18
+#endif
 };
 static const struct ds_configuration ds_cfg_64 = {
 	.sizeof_ds    = 8 * 12,
 	.sizeof_field = 8,
 	.sizeof_rec[ds_bts]   = 8 * 3,
+#ifdef __i386__
 	.sizeof_rec[ds_pebs]  = 8 * 10
+#else
+	.sizeof_rec[ds_pebs]  = 8 * 18
+#endif
 };
 
 static inline void