projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
[powerpc.git]
/
include
/
asm-sparc
/
smp.h
diff --git
a/include/asm-sparc/smp.h
b/include/asm-sparc/smp.h
index
98c46e3
..
b9da9a6
100644
(file)
--- a/
include/asm-sparc/smp.h
+++ b/
include/asm-sparc/smp.h
@@
-6,7
+6,6
@@
#ifndef _SPARC_SMP_H
#define _SPARC_SMP_H
#ifndef _SPARC_SMP_H
#define _SPARC_SMP_H
-#include <linux/config.h>
#include <linux/threads.h>
#include <asm/head.h>
#include <asm/btfixup.h>
#include <linux/threads.h>
#include <asm/head.h>
#include <asm/btfixup.h>
@@
-146,6
+145,8
@@
static inline int hard_smp_processor_id(void)
#define prof_multiplier(__cpu) cpu_data(__cpu).multiplier
#define prof_counter(__cpu) cpu_data(__cpu).counter
#define prof_multiplier(__cpu) cpu_data(__cpu).multiplier
#define prof_counter(__cpu) cpu_data(__cpu).counter
+void smp_setup_cpu_possible_map(void);
+
#endif /* !(__ASSEMBLY__) */
/* Sparc specific messages. */
#endif /* !(__ASSEMBLY__) */
/* Sparc specific messages. */
@@
-162,7
+163,11
@@
static inline int hard_smp_processor_id(void)
#define MBOX_IDLECPU2 0xFD
#define MBOX_STOPCPU2 0xFE
#define MBOX_IDLECPU2 0xFD
#define MBOX_STOPCPU2 0xFE
-#endif /* SMP */
+#else /* SMP */
+
+#define smp_setup_cpu_possible_map() do { } while (0)
+
+#endif /* !(SMP) */
#define NO_PROC_ID 0xFF
#define NO_PROC_ID 0xFF