Merge with Linus' 2.6 tree

1 files changed, 2 insertions, 0 deletions

diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c
index e80f10c89824..687e85595208 100644
--- a/arch/ppc64/kernel/setup.c
+++ b/arch/ppc64/kernel/setup.c
@@ -1068,6 +1068,8 @@ void __init setup_arch(char **cmdline_p)
         irqstack_early_init();
         emergency_stack_init();
 
+        stabs_alloc();
+
         /* set up the bootmem stuff with available memory */
         do_init_bootmem();
         sparse_init();