diff --git a/[refs] b/[refs]
index 9c9f4b9a58eb..b30c0b152778 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d657e51dfc042216febd4a007c6f36881f9256d
+refs/heads/master: 353afeea24cc51aafc0ff21a72ec740b6f0af50c
diff --git a/trunk/arch/x86/kernel/ds_selftest.c b/trunk/arch/x86/kernel/ds_selftest.c
index e5a263c8a14c..e1ba5101b576 100644
--- a/trunk/arch/x86/kernel/ds_selftest.c
+++ b/trunk/arch/x86/kernel/ds_selftest.c
@@ -87,7 +87,7 @@ static int ds_selftest_bts_read(struct bts_tracer *tracer,
 	/* Now to the test itself. */
 	for (at = from; (void *)at < to; at += trace->ds.size) {
 		struct bts_struct bts;
-		size_t index;
+		unsigned long index;
 		int error;
 
 		if (((void *)at - trace->ds.begin) % trace->ds.size) {