Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > by-pkgid > fc11cd6e1c513a17304da94a5390f3cd > files > 3768

kernel-2.6.18-194.11.1.el5.src.rpm

From: Jason Baron <jbaron@redhat.com>
Date: Thu, 26 Mar 2009 22:10:05 -0400
Subject: [trace] use TABLE_SIZE macro
Message-id: 200903270210.n2R2A5jp029481@ns3.rdu.redhat.com
O-Subject: [RHEL 5.4 PATCH 03/10] use TABLE_SIZE macro
Bugzilla: 465543

    commit abbc9ba22ed02c7b378d5998c04f0fe24f556890

    tracepoints-use-table-size-macro

    Tracepoints use TABLE_SIZE macro

    Steven Rostedt <rostedt@goodmis.org> :

    Wouldn't it look nicer to have: (TRACEPOINT_TABLE_SIZE - 1) ?

    me :

    Sure,

    Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
    CC: Steven Rostedt <rostedt@goodmis.org>
    CC: akpm@linux-foundation.org
    CC: Ingo Molnar <mingo@elte.hu>
    CC: Peter Zijlstra <peterz@infradead.org>
    CC: Masami Hiramatsu <mhiramat@redhat.com>
    CC: "Frank Ch. Eigler" <fche@redhat.com>
    CC: Hideo AOKI <haoki@redhat.com>
    CC: Takashi Nishiie <t-nishiie@np.css.fujitsu.com>
    CC: Alexander Viro <viro@zeniv.linux.org.uk>
    CC: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>

diff --git a/kernel/tracepoint.c b/kernel/tracepoint.c
index 42e86dd..c7c62a4 100644
--- a/kernel/tracepoint.c
+++ b/kernel/tracepoint.c
@@ -177,7 +177,7 @@ static struct tracepoint_entry *get_tracepoint(const char *name)
 	struct tracepoint_entry *e;
 	u32 hash = jhash(name, strlen(name), 0);
 
-	head = &tracepoint_table[hash & ((1 << TRACEPOINT_HASH_BITS)-1)];
+	head = &tracepoint_table[hash & (TRACEPOINT_TABLE_SIZE - 1)];
 	hlist_for_each_entry(e, node, head, hlist) {
 		if (!strcmp(name, e->name))
 			return e;
@@ -197,7 +197,7 @@ static struct tracepoint_entry *add_tracepoint(const char *name)
 	size_t name_len = strlen(name) + 1;
 	u32 hash = jhash(name, name_len-1, 0);
 
-	head = &tracepoint_table[hash & ((1 << TRACEPOINT_HASH_BITS)-1)];
+	head = &tracepoint_table[hash & (TRACEPOINT_TABLE_SIZE - 1)];
 	hlist_for_each_entry(e, node, head, hlist) {
 		if (!strcmp(name, e->name)) {
 			printk(KERN_NOTICE
@@ -233,7 +233,7 @@ static int remove_tracepoint(const char *name)
 	size_t len = strlen(name) + 1;
 	u32 hash = jhash(name, len-1, 0);
 
-	head = &tracepoint_table[hash & ((1 << TRACEPOINT_HASH_BITS)-1)];
+	head = &tracepoint_table[hash & (TRACEPOINT_TABLE_SIZE - 1)];
 	hlist_for_each_entry(e, node, head, hlist) {
 		if (!strcmp(name, e->name)) {
 			found = 1;