Make definitions for struct e820entry and struct e820map consistent