execshield rebase
Kyle McMartin
kyle at infradead.org
Thu Dec 4 22:01:03 UTC 2008
On Thu, Dec 04, 2008 at 04:58:43PM -0500, Dave Jones wrote:
> interdiff choked, so I moved your diff over the current one
> and cvs diff'd, which coped a little better, but it still isn't
> too easy to see the delta. It's times like this I wish we
> did have a git tree.
>
> The only bits that jumped out at me were..
>
> @@ -151,100 +312,103 @@ index a7d50a5..86e35cb 100644
> + * we won't hit this branch next time around.
> + */
> + if (print_fatal_signals >= 2) {
> -+ printk(KERN_ERR "#GPF fixup (%ld[seg:%lx]) at %08lx, CPU#%d.\n",
> ++ printk(KERN_ERR "#GFP fixup (%ld[seg:%lx]) at %08lx, CPU#%d.\n",
> + error_code, error_code/8, regs->ip, smp_processor_id());
>
> It's a "general protection fault", so this seems wrong.
>
> + if (print_fatal_signals) {
> -+ printk(KERN_ERR "#GPF(%ld[seg:%lx]) at %08lx, CPU#%d.\n", error_code,
> -+ error_code/8, regs->ip, smp_processor_id());
> ++ printk(KERN_ERR "#GFP(%ld[seg:%lx]) at %08lx, CPU#%d.\n",
> ++ error_code, error_code/8, regs->ip, smp_processor_id());
>
> ditto.
>
Doh. I hand-hacked the full-file rejects (due to traps.c merge) and
buggered this one up. Fixed.
More information about the kernel
mailing list