* [PATCH for-next] EDAC: fix misuse of PAGES_TO_MiB macros
@ 2015-10-20 11:45 Tan Xiaojun
2015-10-22 9:32 ` Borislav Petkov
0 siblings, 1 reply; 2+ messages in thread
From: Tan Xiaojun @ 2015-10-20 11:45 UTC (permalink / raw)
To: bp, dougthompson, mchehab; +Cc: linux-edac, linux-kernel
The PAGES_TO_MiB macros is only used for unit conversion.
Signed-off-by: Tan Xiaojun <tanxiaojun@huawei.com>
---
drivers/edac/edac_mc.c | 2 +-
drivers/edac/ghes_edac.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 943ed8c..77ecd6a 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -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);
diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c
index b1e4512..e3fa439 100644
--- a/drivers/edac/ghes_edac.c
+++ b/drivers/edac/ghes_edac.c
@@ -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 */
--
2.5.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH for-next] EDAC: fix misuse of PAGES_TO_MiB macros
2015-10-20 11:45 [PATCH for-next] EDAC: fix misuse of PAGES_TO_MiB macros Tan Xiaojun
@ 2015-10-22 9:32 ` Borislav Petkov
0 siblings, 0 replies; 2+ messages in thread
From: Borislav Petkov @ 2015-10-22 9:32 UTC (permalink / raw)
To: Tan Xiaojun; +Cc: dougthompson, mchehab, linux-edac, linux-kernel
On Tue, Oct 20, 2015 at 07:45:38PM +0800, Tan Xiaojun wrote:
> The PAGES_TO_MiB macros is only used for unit conversion.
>
> Signed-off-by: Tan Xiaojun <tanxiaojun@huawei.com>
> ---
> drivers/edac/edac_mc.c | 2 +-
> drivers/edac/ghes_edac.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
> index 943ed8c..77ecd6a 100644
> --- a/drivers/edac/edac_mc.c
> +++ b/drivers/edac/edac_mc.c
> @@ -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);
> diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c
> index b1e4512..e3fa439 100644
> --- a/drivers/edac/ghes_edac.c
> +++ b/drivers/edac/ghes_edac.c
> @@ -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 */
> --
Applied, thanks.
--
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-10-22 9:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-20 11:45 [PATCH for-next] EDAC: fix misuse of PAGES_TO_MiB macros Tan Xiaojun
2015-10-22 9:32 ` Borislav Petkov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).