Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6

[linux-2.6-omap-h63xx.git] / arch / powerpc / kernel / process.c

diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 957bded0020d5d8921e11f6db8fc4517565207a8..51b201ddf9a160002d10ff3c61cd9bb2e40119a5 100644 (file)
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -467,6 +467,8 @@ static struct regbit {
        {MSR_VEC,       "VEC"},
        {MSR_VSX,       "VSX"},
        {MSR_ME,        "ME"},
+       {MSR_CE,        "CE"},
+       {MSR_DE,        "DE"},
        {MSR_IR,        "IR"},
        {MSR_DR,        "DR"},
        {0,             NULL}
@@ -998,7 +1000,7 @@ unsigned long get_wchan(struct task_struct *p)
        return 0;
 }
 
-static int kstack_depth_to_print = 64;
+static int kstack_depth_to_print = CONFIG_PRINT_STACK_DEPTH;
 
 void show_stack(struct task_struct *tsk, unsigned long *stack)
 {