diff options
author | Zou Cao <zoucao.zc@alibaba-inc.com> | 2018-05-16 17:18:37 +0800 |
---|---|---|
committer | Zou Cao <zoucao.zc@alibaba-inc.com> | 2018-05-16 19:40:32 +0800 |
commit | 0dcbe4abf39c6628d36f777a767e3dc7185a53dd (patch) | |
tree | fcc38acf20cdc959603340103351e8f77886bbf6 | |
parent | 9f86b857838624e655abf5744d58c71102101451 (diff) | |
download | mcelog-0dcbe4abf39c6628d36f777a767e3dc7185a53dd.tar.gz |
fixed build errors for some lose code when merging code
memdb.c:134:6: error: conflicting types for ‘memdb_trigger’
void memdb_triggechar *msg, struct memdimm *md, time_t t,
memdb.c:175:2: error: too few arguments to function ‘run_trigger’
run_triggebc->trigger, NULL, env);
memdb.c:214:4: error: too many arguments to function ‘memdb_trigger’
memdb_triggemsg, md, m->time, &md->uc, &t->uc_bucket_conf, false);
memdb.c:218:4: error: too many arguments to function ‘memdb_trigger’
memdb_triggemsg, md, m->time, &md->ce, &t->ce_bucket_conf, false);
-rw-r--r-- | memdb.c | 6 | ||||
-rw-r--r-- | page.c | 2 |
2 files changed, 4 insertions, 4 deletions
@@ -132,7 +132,7 @@ static char *format_location(struct memdimm *md) /* Run a user defined trigger when a error threshold is crossed. */ void memdb_trigger(char *msg, struct memdimm *md, time_t t, - struct err_type *et, struct bucket_conf *bc) + struct err_type *et, struct bucket_conf *bc, bool sync) { struct leaky_bucket *bucket = &et->bucket; char *env[MAX_ENV]; @@ -172,7 +172,7 @@ void memdb_trigger(char *msg, struct memdimm *md, time_t t, xasprintf(&env[ei++], "THRESHOLD_COUNT=%d", bucket->count); env[ei] = NULL; assert(ei < MAX_ENV); - run_trigger(bc->trigger, NULL, env); + run_trigger(bc->trigger, NULL, env, sync); for (i = 0; i < ei; i++) free(env[i]); out: @@ -194,7 +194,7 @@ account_over(struct err_triggers *t, struct memdimm *md, struct mce *m, unsigned char *msg; xasprintf(&msg, "Fallback %s memory error count %d exceeded threshold", t->type, corr_err_cnt); - memdb_trigger(msg, md, 0, &md->ce, &t->ce_bucket_conf); + memdb_trigger(msg, md, 0, &md->ce, &t->ce_bucket_conf, false); free(msg); } } @@ -220,7 +220,7 @@ void account_page_error(struct mce *m, int channel, int dimm) xasprintf(&msg, "Corrected memory errors on page %llx exceed threshold %s", addr, thresh); free(thresh); - memdb_trigger(msg, md, t, &mp->ce, &page_trigger_conf); + memdb_trigger(msg, md, t, &mp->ce, &page_trigger_conf, false); free(msg); mp->triggered = 1; |