diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-30 14:38:08 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-30 14:38:17 +1100 |
commit | a28d21a24c2179038b1d64b3b9d1b79f2b98cf1e (patch) | |
tree | efac31b8ac71fd90dfdf8140a24a18b29cbb4df0 /init | |
parent | cc3dc272321cb76fea021454ba66e7560155b831 (diff) | |
parent | 423e2e8c34df6aa0530a1380193ad520d29564f3 (diff) |
Merge remote branch 'kgdb/kgdb-next'
Diffstat (limited to 'init')
-rw-r--r-- | init/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index cbead27caefc..05bd4234009a 100644 --- a/init/main.c +++ b/init/main.c @@ -63,6 +63,7 @@ #include <linux/sched.h> #include <linux/signal.h> #include <linux/idr.h> +#include <linux/kgdb.h> #include <linux/ftrace.h> #include <linux/async.h> #include <linux/kmemcheck.h> @@ -675,6 +676,7 @@ asmlinkage void __init start_kernel(void) buffer_init(); key_init(); security_init(); + dbg_late_init(); vfs_caches_init(totalram_pages); signals_init(); /* rootfs populating might need page-writeback */ |