diff --git a/[refs] b/[refs] index b63b03bf2493..3644468d76e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aaa64e04f9af8c05a10ab3d67df44154742d15cf +refs/heads/master: a89518b882283fdb3e11fb6d1929dc874b380ca8 diff --git a/trunk/include/asm-x86/page_64.h b/trunk/include/asm-x86/page_64.h index c3b52bcb171e..6fdc904a5fa5 100644 --- a/trunk/include/asm-x86/page_64.h +++ b/trunk/include/asm-x86/page_64.h @@ -41,6 +41,7 @@ #ifndef __ASSEMBLY__ extern unsigned long end_pfn; +extern unsigned long end_pfn_map; void clear_page(void *); void copy_page(void *, void *); diff --git a/trunk/include/asm-x86/proto.h b/trunk/include/asm-x86/proto.h index 71a419c6e041..7ff3d765de05 100644 --- a/trunk/include/asm-x86/proto.h +++ b/trunk/include/asm-x86/proto.h @@ -41,8 +41,6 @@ extern void reserve_bootmem_generic(unsigned long phys, unsigned len); extern void load_gs_index(unsigned gs); -extern unsigned long end_pfn_map; - extern void exception_table_check(void); extern void swap_low_mappings(void);