git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
asm-ppc
/
smp.h
diff --git
a/include/asm-ppc/smp.h
b/include/asm-ppc/smp.h
index
30e9268
..
e75791e
100644
(file)
--- a/
include/asm-ppc/smp.h
+++ b/
include/asm-ppc/smp.h
@@
-10,7
+10,6
@@
#ifndef _PPC_SMP_H
#define _PPC_SMP_H
#ifndef _PPC_SMP_H
#define _PPC_SMP_H
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/bitops.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/bitops.h>
#include <linux/errno.h>
@@
-40,7
+39,7
@@
extern struct smp_ops_t *smp_ops;
extern void smp_send_tlb_invalidate(int);
extern void smp_send_xmon_break(int cpu);
struct pt_regs;
extern void smp_send_tlb_invalidate(int);
extern void smp_send_xmon_break(int cpu);
struct pt_regs;
-extern void smp_message_recv(int
, struct pt_regs *
);
+extern void smp_message_recv(int);
extern int __cpu_disable(void);
extern void __cpu_die(unsigned int cpu);
extern int __cpu_disable(void);
extern void __cpu_die(unsigned int cpu);