From f3f1af35261cd3e70d4644f080f53cad00de97c2 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Sun, 20 Mar 2016 00:58:39 +0100 Subject: [PATCH] replace a left shift from -1 by left shift of ~0 because a left shift of -1 isn't defined in the C standard --- hermit/arch/x86/include/asm/page.h | 4 ++-- hermit/mm/vma.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hermit/arch/x86/include/asm/page.h b/hermit/arch/x86/include/asm/page.h index 176eda5de..134b04603 100644 --- a/hermit/arch/x86/include/asm/page.h +++ b/hermit/arch/x86/include/asm/page.h @@ -46,9 +46,9 @@ #define PAGE_SIZE ( 1L << PAGE_BITS) /// Mask the page address without page map flags and XD flag #if 0 -#define PAGE_MASK (-1L << PAGE_BITS) +#define PAGE_MASK ((~0L) << PAGE_BITS) #else -#define PAGE_MASK ((-1L << PAGE_BITS) & ~PG_XD) +#define PAGE_MASK (((~0L) << PAGE_BITS) & ~PG_XD) #endif #if 0 diff --git a/hermit/mm/vma.c b/hermit/mm/vma.c index 10d5a4bd6..43014fc9d 100644 --- a/hermit/mm/vma.c +++ b/hermit/mm/vma.c @@ -39,8 +39,8 @@ extern const void kernel_start; extern const void kernel_end; -#define PAGE_2M_FLOOR(addr) (((addr) + (1L << 21) - 1) & (-1L << 21)) -#define PAGE_2M_CEIL(addr) ( (addr) & (-1L << 21)) +#define PAGE_2M_FLOOR(addr) (((addr) + (1L << 21) - 1) & ((~0L) << 21)) +#define PAGE_2M_CEIL(addr) ( (addr) & ((~0L) << 21)) /* * Kernel space VMA list and lock