projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into tracing/sysprof
[firefly-linux-kernel-4.4.55.git]
/
include
/
asm-powerpc
/
mmu_context.h
diff --git
a/include/asm-powerpc/mmu_context.h
b/include/asm-powerpc/mmu_context.h
index f863ac21409e7b4166add8e1fea65c4e8ab05ac7..9102b8bf0ead02863ac30fcc0f055fa1cf41c743 100644
(file)
--- a/
include/asm-powerpc/mmu_context.h
+++ b/
include/asm-powerpc/mmu_context.h
@@
-8,7
+8,7
@@
#ifndef CONFIG_PPC64
#include <asm/atomic.h>
#ifndef CONFIG_PPC64
#include <asm/atomic.h>
-#include <
asm
/bitops.h>
+#include <
linux
/bitops.h>
/*
* On 32-bit PowerPC 6xx/7xx/7xxx CPUs, we use a set of 16 VSIDs
/*
* On 32-bit PowerPC 6xx/7xx/7xxx CPUs, we use a set of 16 VSIDs