From 1a8f28b1e25a836516cebe1038b9891f6e58ba08 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Fri, 13 Mar 2009 12:02:08 +0100 Subject: [PATCH] --- yaml --- r: 146117 b: refs/heads/master c: 79258a354e0c69be94ae2871809a195bf4a647b1 h: refs/heads/master i: 146115: cb3c03279538c0c155e6494882e887d817c6be02 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/ds.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 59b54a01fdd5..3263d8a678fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9a22d1fb94050b7d600019c32e6b672d539054b +refs/heads/master: 79258a354e0c69be94ae2871809a195bf4a647b1 diff --git a/trunk/arch/x86/kernel/ds.c b/trunk/arch/x86/kernel/ds.c index 7363e01ba082..5fd53333c1df 100644 --- a/trunk/arch/x86/kernel/ds.c +++ b/trunk/arch/x86/kernel/ds.c @@ -983,7 +983,7 @@ ds_configure(const struct ds_configuration *cfg, printk("bts/pebs record: %u/%u bytes\n", ds_cfg.sizeof_rec[ds_bts], ds_cfg.sizeof_rec[ds_pebs]); - WARN_ON_ONCE(MAX_SIZEOF_DS < (12 * ds_cfg.sizeof_field)); + WARN_ON_ONCE(MAX_SIZEOF_DS < (12 * ds_cfg.sizeof_ptr_field)); } void __cpuinit ds_init_intel(struct cpuinfo_x86 *c)