projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ../linus
[powerpc.git]
/
include
/
asm-x86_64
/
percpu.h
diff --git
a/include/asm-x86_64/percpu.h
b/include/asm-x86_64/percpu.h
index
bffb2f8
..
5ed0ef3
100644
(file)
--- a/
include/asm-x86_64/percpu.h
+++ b/
include/asm-x86_64/percpu.h
@@
-11,6
+11,16
@@
#include <asm/pda.h>
#include <asm/pda.h>
+#ifdef CONFIG_MODULES
+# define PERCPU_MODULE_RESERVE 8192
+#else
+# define PERCPU_MODULE_RESERVE 0
+#endif
+
+#define PERCPU_ENOUGH_ROOM \
+ (ALIGN(__per_cpu_end - __per_cpu_start, SMP_CACHE_BYTES) + \
+ PERCPU_MODULE_RESERVE)
+
#define __per_cpu_offset(cpu) (cpu_pda(cpu)->data_offset)
#define __my_cpu_offset() read_pda(data_offset)
#define __per_cpu_offset(cpu) (cpu_pda(cpu)->data_offset)
#define __my_cpu_offset() read_pda(data_offset)
@@
-22,13
+32,13
@@
/* var is in discarded region: offset to particular copy we want */
#define per_cpu(var, cpu) (*({ \
/* var is in discarded region: offset to particular copy we want */
#define per_cpu(var, cpu) (*({ \
- extern int simple_i
ndentifier_##var(void);
\
+ extern int simple_i
dentifier_##var(void);
\
RELOC_HIDE(&per_cpu__##var, __per_cpu_offset(cpu)); }))
#define __get_cpu_var(var) (*({ \
RELOC_HIDE(&per_cpu__##var, __per_cpu_offset(cpu)); }))
#define __get_cpu_var(var) (*({ \
- extern int simple_i
ndentifier_##var(void);
\
+ extern int simple_i
dentifier_##var(void);
\
RELOC_HIDE(&per_cpu__##var, __my_cpu_offset()); }))
#define __raw_get_cpu_var(var) (*({ \
RELOC_HIDE(&per_cpu__##var, __my_cpu_offset()); }))
#define __raw_get_cpu_var(var) (*({ \
- extern int simple_i
ndentifier_##var(void);
\
+ extern int simple_i
dentifier_##var(void);
\
RELOC_HIDE(&per_cpu__##var, __my_cpu_offset()); }))
/* A macro to avoid #include hell... */
RELOC_HIDE(&per_cpu__##var, __my_cpu_offset()); }))
/* A macro to avoid #include hell... */