diff --git a/[refs] b/[refs] index 0cc1e531d4e0..4b2cb5deecb6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53debcd518e72d01bfe0364f1504fa585826941c +refs/heads/master: e470d932ce7f998aeab788fdc7b49ef26e76b4eb diff --git a/trunk/arch/hexagon/include/asm/mem-layout.h b/trunk/arch/hexagon/include/asm/mem-layout.h index 1426cd71a1d3..3724cea5c59c 100644 --- a/trunk/arch/hexagon/include/asm/mem-layout.h +++ b/trunk/arch/hexagon/include/asm/mem-layout.h @@ -64,7 +64,7 @@ enum fixed_addresses { __end_of_fixed_addresses }; -#define MIN_KERNEL_SEG 0x300 /* From 0xc0000000 */ +#define MIN_KERNEL_SEG (PAGE_OFFSET >> PGDIR_SHIFT) /* L1 shift is 22 bits */ extern int max_kernel_seg; /*