From: Borislav Petkov <bp@suse.de>
Date: Mon, 21 Mar 2022 09:34:57 +0000 (+0100)
Subject: Merge branch 'edac-amd64' into edac-updates-for-v5.18
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1422df58e5eb83dca131dc64e0f307a1f9e56078;p=linux.git

Merge branch 'edac-amd64' into edac-updates-for-v5.18

Signed-off-by: Borislav Petkov <bp@suse.de>
---

1422df58e5eb83dca131dc64e0f307a1f9e56078
diff --cc drivers/edac/edac_mc.c
index f92c4c69a033e,f5677d81bd2d5..d2715774af6fb
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@@ -213,12 -213,12 +213,12 @@@ void *edac_align_ptr(void **p, unsigne
  	else if (size > sizeof(char))
  		align = sizeof(short);
  	else
 -		return (char *)ptr;
 +		return ptr;
  
- 	r = (unsigned long)p % align;
+ 	r = (unsigned long)ptr % align;
  
  	if (r == 0)
 -		return (char *)ptr;
 +		return ptr;
  
  	*p += align - r;