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

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

diff --cc drivers/edac/altera_edac.c
Simple merge

diff --cc drivers/edac/edac_mc.c
index f92c4c69a033e0a1f51a4fcf9f532109a109ccb0,f5677d81bd2d5675fe5f4dc261c73d893bb911b3..d2715774af6fb3a0b07ff2c6ce6bb510091c0a68
--- 1/drivers/edac/edac_mc.c
--- 2/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;