diff options
| author | David S. Miller <davem@davemloft.net> | 2017-03-15 11:59:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-15 11:59:10 -0700 |
| commit | 101c431492d297dd0d111b461d8d324895676bee (patch) | |
| tree | 06d8a02a4fd91acdd6c31340452e85feaac4ecb7 /arch/sh/include/asm/pgtable-3level.h | |
| parent | 9c79ddaa0f962d1f26537a670b0652ff509a6fe0 (diff) | |
| parent | 95422dec6bd4a7c57444743f7b1bb375335a6298 (diff) | |
| download | linux-101c431492d297dd0d111b461d8d324895676bee.tar.gz linux-101c431492d297dd0d111b461d8d324895676bee.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/genet/bcmgenet.c
net/core/sock.c
Conflicts were overlapping changes in bcmgenet and the
lockdep handling of sockets.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sh/include/asm/pgtable-3level.h')
| -rw-r--r-- | arch/sh/include/asm/pgtable-3level.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/include/asm/pgtable-3level.h b/arch/sh/include/asm/pgtable-3level.h index 249a985d9648..9b1e776eca31 100644 --- a/arch/sh/include/asm/pgtable-3level.h +++ b/arch/sh/include/asm/pgtable-3level.h @@ -1,6 +1,7 @@ #ifndef __ASM_SH_PGTABLE_3LEVEL_H #define __ASM_SH_PGTABLE_3LEVEL_H +#define __ARCH_USE_5LEVEL_HACK #include <asm-generic/pgtable-nopud.h> /* |