projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Properly delete sound/ppc/toonie.c
[powerpc.git]
/
init
/
main.c
diff --git
a/init/main.c
b/init/main.c
index
f715b9b
..
0d57f6c
100644
(file)
--- a/
init/main.c
+++ b/
init/main.c
@@
-47,6
+47,8
@@
#include <linux/rmap.h>
#include <linux/mempolicy.h>
#include <linux/key.h>
#include <linux/rmap.h>
#include <linux/mempolicy.h>
#include <linux/key.h>
+#include <linux/unwind.h>
+#include <linux/buffer_head.h>
#include <asm/io.h>
#include <asm/bugs.h>
#include <asm/io.h>
#include <asm/bugs.h>
@@
-79,7
+81,6
@@
extern void mca_init(void);
extern void sbus_init(void);
extern void sysctl_init(void);
extern void signals_init(void);
extern void sbus_init(void);
extern void sysctl_init(void);
extern void signals_init(void);
-extern void buffer_init(void);
extern void pidhash_init(void);
extern void pidmap_init(void);
extern void prio_tree_init(void);
extern void pidhash_init(void);
extern void pidmap_init(void);
extern void prio_tree_init(void);
@@
-482,6
+483,7
@@
asmlinkage void __init start_kernel(void)
__stop___param - __start___param,
&unknown_bootoption);
sort_main_extable();
__stop___param - __start___param,
&unknown_bootoption);
sort_main_extable();
+ unwind_init();
trap_init();
rcu_init();
init_IRQ();
trap_init();
rcu_init();
init_IRQ();
@@
-490,6
+492,7
@@
asmlinkage void __init start_kernel(void)
hrtimers_init();
softirq_init();
time_init();
hrtimers_init();
softirq_init();
time_init();
+ timekeeping_init();
/*
* HACK ALERT! This is early. We're enabling the console before
/*
* HACK ALERT! This is early. We're enabling the console before