diff options
Diffstat (limited to 'i386')
| -rw-r--r-- | i386/grub/misc.h | 2 | ||||
| -rw-r--r-- | i386/i386/xen.h | 2 | ||||
| -rw-r--r-- | i386/intel/read_fault.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/i386/grub/misc.h b/i386/grub/misc.h index c6cd456..b71140a 100644 --- a/i386/grub/misc.h +++ b/i386/grub/misc.h @@ -21,6 +21,7 @@ #define GRUB_MISC_HEADER 1 #include <stdarg.h> +#include <kern/macros.h> #include <grub/types.h> #include <grub/symbol.h> #include <grub/err.h> @@ -32,7 +33,6 @@ #define ALIGN_UP_OVERHEAD(addr, align) ((-(addr)) & ((typeof (addr)) (align) - 1)) #define ALIGN_DOWN(addr, align) \ ((addr) & ~((typeof (addr)) align - 1)) -#define ARRAY_SIZE(array) (sizeof (array) / sizeof (array[0])) #define COMPILE_TIME_ASSERT(cond) switch (0) { case 1: case !(cond): ; } #define grub_dprintf(condition, ...) grub_real_dprintf(GRUB_FILE, __LINE__, condition, __VA_ARGS__) diff --git a/i386/i386/xen.h b/i386/i386/xen.h index 638d671..c681187 100644 --- a/i386/i386/xen.h +++ b/i386/i386/xen.h @@ -21,6 +21,7 @@ #ifdef MACH_XEN #ifndef __ASSEMBLER__ +#include <kern/macros.h> #include <kern/printf.h> #include <mach/machine/vm_types.h> #include <mach/vm_param.h> @@ -32,7 +33,6 @@ #include <xen/public/xen.h> /* TODO: this should be moved in appropriate non-Xen place. */ -#define barrier() __asm__ __volatile__ ("": : :"memory") #define mb() __asm__ __volatile__("lock; addl $0,0(%%esp)":::"memory") #define rmb() mb() #define wmb() mb() diff --git a/i386/intel/read_fault.c b/i386/intel/read_fault.c index 29f4439..4b1edce 100644 --- a/i386/intel/read_fault.c +++ b/i386/intel/read_fault.c @@ -31,7 +31,7 @@ #include <vm/vm_page.h> #include <vm/pmap.h> -#include <kern/macro_help.h> +#include <kern/macros.h> /* * Expansion of vm_fault for read fault in kernel mode. |