On Fri, May 27, 2011 at 10:33:31PM +0530, K.Prasad wrote: > On Thu, May 26, 2011 at 02:43:50PM -0400, Vivek Goyal wrote: > > On Thu, May 26, 2011 at 10:45:21PM +0530, K.Prasad wrote: > > > > [..] > > > Index: linux-2.6.slim_kdump/arch/x86/kernel/cpu/mcheck/mce.c > > > =================================================================== > > > --- linux-2.6.slim_kdump.orig/arch/x86/kernel/cpu/mcheck/mce.c > > > +++ linux-2.6.slim_kdump/arch/x86/kernel/cpu/mcheck/mce.c > > > @@ -258,8 +258,7 @@ static void wait_for_panic(void) > > > local_irq_enable(); > > > while (timeout-- > 0) > > > udelay(1); > > > - xpanic(PANIC_NO_KEXEC|PANIC_NO_BACKTRACE, 0, > > > - "Panicing machine check CPU died"); > > > + xpanic(PANIC_MCE, 0, NULL, 0, "Panicing machine check CPU died"); > > > } > > > > > > static void mce_panic(char *msg, struct mce *final, char *exp) > > > @@ -315,8 +314,8 @@ static void mce_panic(char *msg, struct > > > if (exp) > > > pr_emerg(HW_ERR "Machine check: %s\n", exp); > > > if (!fake_panic) { > > > - xpanic(PANIC_NO_KEXEC|PANIC_NO_BACKTRACE, mce_panic_timeout, > > > - msg); > > > + xpanic(PANIC_MCE, mce_panic_timeout, final, > > > + sizeof(struct mce), msg); > > > } else > > > pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg); > > > } > > > > In previous patches you introduce PANIC_NO_KEXEC and PANIC_NO_BACKTRACE. > > Now in this patch you got rid of those. Are there any other users left > > of PANIC_NO_BACKTRACE and PANIC_NO_EXEC? If not, then why to introduce > > these to begin with. > > > > The previous patch also converts panic to xpanic and is taken from > Andi's > git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git tree. > The changes are kept as two separate patches to identify their origin. If you have to remove dead piece of code from original patch, I think you can always take original patch, modify it and give the credit to original author by explicitly mentioning it in your changelog. Thanks Vivek