Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 990995ba authored by Tan Xiaojun's avatar Tan Xiaojun Committed by Borislav Petkov
Browse files

EDAC: Fix PAGES_TO_MiB macro misuse 



The PAGES_TO_MiB macro is used for unit conversion but the
trace_mc_event() tracepoint expects a page address. Fix that.

Signed-off-by: default avatarTan Xiaojun <tanxiaojun@huawei.com>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/1445341538-24271-1-git-send-email-tanxiaojun@huawei.com


Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parent 941fd2e7

drivers/edac/edac_mc.c

+1 −1
Original line number Diff line number Diff line
@@ -1302,7 +1302,7 @@ void edac_mc_handle_error(const enum hw_event_mc_err_type type, 
	grain_bits = fls_long(e->grain) + 1;

	trace_mc_event(type, e->msg, e->label, e->error_count,

		       mci->mc_idx, e->top_layer, e->mid_layer, e->low_layer,

		       PAGES_TO_MiB(e->page_frame_number) | e->offset_in_page,

		       (e->page_frame_number << PAGE_SHIFT) | e->offset_in_page,

		       grain_bits, e->syndrome, e->other_detail);



	edac_raw_mc_handle_error(type, mci, e);

drivers/edac/ghes_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ void ghes_edac_report_mem_error(struct ghes *ghes, int sev, 
		 "APEI location: %s %s", e->location, e->other_detail);

	trace_mc_event(type, e->msg, e->label, e->error_count,

		       mci->mc_idx, e->top_layer, e->mid_layer, e->low_layer,

		       PAGES_TO_MiB(e->page_frame_number) | e->offset_in_page,

		       (e->page_frame_number << PAGE_SHIFT) | e->offset_in_page,

		       grain_bits, e->syndrome, pvt->detail_location);



	/* Report the error via EDAC API */