git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'torvalds/master' into perf/core
[sfrench/cifs-2.6.git]
/
arch
/
riscv
/
include
/
asm
/
mmu.h
diff --git
a/arch/riscv/include/asm/mmu.h
b/arch/riscv/include/asm/mmu.h
index dabcf2cfb3dc762011662c31c3b36d61db8dc859..0099dc1161683ddd1e3c45460309e331b7e6b0a7 100644
(file)
--- a/
arch/riscv/include/asm/mmu.h
+++ b/
arch/riscv/include/asm/mmu.h
@@
-12,6
+12,8
@@
typedef struct {
#ifndef CONFIG_MMU
unsigned long end_brk;
+#else
+ atomic_long_t id;
#endif
void *vdso;
#ifdef CONFIG_SMP