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

Commit e9144601 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

i7core_edac: move #if PAGE_SHIFT to edac_core.h 



Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1288c18f

drivers/edac/edac_core.h

+2 −0
Original line number Diff line number Diff line
@@ -42,8 +42,10 @@ 


#if PAGE_SHIFT < 20

#define PAGES_TO_MiB( pages )	( ( pages ) >> ( 20 - PAGE_SHIFT ) )

#define MiB_TO_PAGES(mb)	((mb) >> (20 - PAGE_SHIFT))

#else				/* PAGE_SHIFT > 20 */

#define PAGES_TO_MiB( pages )	( ( pages ) << ( PAGE_SHIFT - 20 ) )

#define MiB_TO_PAGES(mb)	((mb) >> (PAGE_SHIFT - 20))

#endif



#define edac_printk(level, prefix, fmt, arg...) \

drivers/edac/i7core_edac.c

+1 −5
Original line number Diff line number Diff line
@@ -666,11 +666,7 @@ static int get_dimm_config(const struct mem_ctl_info *mci, int *csrow) 
				RANKOFFSET(dimm_dod[j]),

				banks, ranks, rows, cols);



#if PAGE_SHIFT > 20

			npages = size >> (PAGE_SHIFT - 20);

#else

			npages = size << (20 - PAGE_SHIFT);

#endif

			npages = MiB_TO_PAGES(size);



			csr = &mci->csrows[*csrow];

			csr->first_page = last_page + 1;