diff options
| author | David S. Miller <davem@davemloft.net> | 2017-03-23 23:11:56 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-24 00:41:27 +0100 |
| commit | 16ae1f223601c44e5cb65c99257ffae003504704 (patch) | |
| tree | 1f5284c0e82e4d94ca07eb022fa7911d99bb0cb6 /arch/x86/include/asm/pgtable.h | |
| parent | qedf: fix wrong le16 conversion (diff) | |
| parent | Merge tag 'sound-4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/t... (diff) | |
| download | linux-16ae1f223601c44e5cb65c99257ffae003504704.tar.xz linux-16ae1f223601c44e5cb65c99257ffae003504704.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/genet/bcmmii.c
drivers/net/hyperv/netvsc.c
kernel/bpf/hashtab.c
Almost entirely overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/x86/include/asm/pgtable.h')
| -rw-r--r-- | arch/x86/include/asm/pgtable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 1cfb36b8c024..585ee0d42d18 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -62,7 +62,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page); # define set_pud(pudp, pud) native_set_pud(pudp, pud) #endif -#ifndef __PAGETABLE_PMD_FOLDED +#ifndef __PAGETABLE_PUD_FOLDED #define pud_clear(pud) native_pud_clear(pud) #endif |