@@ -132,14 +132,11 @@
#ifndef __ASSEMBLY__
#include <linux/bitops.h>
+#include <linux/mmdebug.h>
extern phys_addr_t memstart_addr;
/* PHYS_OFFSET - the physical address of the start of memory. */
-#ifndef CONFIG_DEBUG_VM
-#define PHYS_OFFSET ({ memstart_addr; })
-#else
-#define PHYS_OFFSET ({ BUG_ON(memstart_addr & 1); memstart_addr; })
-#endif
+#define PHYS_OFFSET ({ VM_BUG_ON(memstart_addr & 1); memstart_addr; })
/* the offset between the kernel virtual and physical mappings */
extern u64 kimage_voffset;