Skip to content

Commit c97078b

Browse files
arjunroytorvalds
authored andcommitted
mm: define pte_index as macro for x86
pte_index() is either defined as a macro (e.g. sparc64) or as an inlined function (e.g. x86). vm_insert_pages() depends on pte_index but it is not defined on all platforms (e.g. m68k). To fix compilation of vm_insert_pages() on architectures not providing pte_index(), we perform the following fix: 0. For platforms where it is meaningful, and defined as a macro, no change is needed. 1. For platforms where it is meaningful and defined as an inlined function, and we want to use it with vm_insert_pages(), we define a degenerate macro of the form: #define pte_index pte_index 2. vm_insert_pages() checks for the existence of a pte_index macro definition. If found, it implements a batched insert. If not found, it devolves to calling vm_insert_page() in a loop. This patch implements step 1 for x86. v3 of this patch fixes a compilation warning for an unused method. v2 of this patch moved a macro definition to a more readable location. Signed-off-by: Arjun Roy <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Cc: David Miller <[email protected]> Cc: Eric Dumazet <[email protected]> Cc: Jason Gunthorpe <[email protected]> Cc: Matthew Wilcox <[email protected]> Cc: Soheil Hassas Yeganeh <[email protected]> Cc: Stephen Rothwell <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Linus Torvalds <[email protected]>
1 parent 251a0ff commit c97078b

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

arch/x86/include/asm/pgtable.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,10 @@ static inline unsigned long pmd_index(unsigned long address)
860860
*
861861
* this function returns the index of the entry in the pte page which would
862862
* control the given virtual address
863+
*
864+
* Also define macro so we can test if pte_index is defined for arch.
863865
*/
866+
#define pte_index pte_index
864867
static inline unsigned long pte_index(unsigned long address)
865868
{
866869
return (address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1);

0 commit comments

Comments
 (0)