From 29fc5c5c502bc6a62e193b05b11225bbdd70c7bb Mon Sep 17 00:00:00 2001 From: Pierre-Alexandre Meyer Date: Tue, 1 Sep 2009 14:02:42 -0700 Subject: [PATCH] gpllib: share PAGE_SIZE definition with cpuid.h swsusp detection needs PAGE_SIZE. cpuid.h is actually already defining it. Since both swsusp and cpuid are taken from the Linux kernel, it is a good idea to share it (they really need to be equal). We are going to rely on cpuid.h. Creating a page.h for this single definition seems overkilling and the MMU is part of the CPU on x86 anyways. Impact: fix compiler warning (redefinition). Signed-off-by: Pierre-Alexandre Meyer --- com32/gplinclude/disk/common.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/com32/gplinclude/disk/common.h b/com32/gplinclude/disk/common.h index c6df2f4..627e94e 100644 --- a/com32/gplinclude/disk/common.h +++ b/com32/gplinclude/disk/common.h @@ -17,10 +17,10 @@ #include -#define SECTOR 512 /* bytes/sector */ +/* For PAGE_SIZE */ +#include -#undef PAGE_SIZE -#define PAGE_SIZE (1<<12) +#define SECTOR 512 /* bytes/sector */ struct ebios_dapa { uint16_t len; -- 2.7.4