aboutsummaryrefslogtreecommitdiffstats
path: root/com32/gplinclude
diff options
context:
space:
mode:
authorPierre-Alexandre Meyer <pierre@mouraf.org>2009-09-01 14:02:42 -0700
committerPierre-Alexandre Meyer <pierre@mouraf.org>2009-09-01 14:02:42 -0700
commit29fc5c5c502bc6a62e193b05b11225bbdd70c7bb (patch)
tree60f8a59c5bd00215e0da7b80249a44d6f06e70dd /com32/gplinclude
parent2ba4440d04b2bd92c559b706f73a8ea2d288c4ee (diff)
downloadsyslinux-29fc5c5c502bc6a62e193b05b11225bbdd70c7bb.tar.gz
syslinux-29fc5c5c502bc6a62e193b05b11225bbdd70c7bb.tar.xz
syslinux-29fc5c5c502bc6a62e193b05b11225bbdd70c7bb.zip
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 <pierre@mouraf.org>
Diffstat (limited to 'com32/gplinclude')
-rw-r--r--com32/gplinclude/disk/common.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/com32/gplinclude/disk/common.h b/com32/gplinclude/disk/common.h
index c6df2f4e..627e94ec 100644
--- a/com32/gplinclude/disk/common.h
+++ b/com32/gplinclude/disk/common.h
@@ -17,10 +17,10 @@
#include <stdint.h>
-#define SECTOR 512 /* bytes/sector */
+/* For PAGE_SIZE */
+#include <cpuid.h>
-#undef PAGE_SIZE
-#define PAGE_SIZE (1<<12)
+#define SECTOR 512 /* bytes/sector */
struct ebios_dapa {
uint16_t len;