rpms/kernel/devel linux-2.6-x86-clean-up-oops-bug-reports.patch, NONE, 1.1 kernel.spec, 1.187, 1.188 linux-2.6-x86-debug-edd.patch, 1.2, NONE
Chuck Ebbert (cebbert)
fedora-extras-commits at redhat.com
Wed Sep 26 17:10:20 UTC 2007
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6258
Modified Files:
kernel.spec
Added Files:
linux-2.6-x86-clean-up-oops-bug-reports.patch
Removed Files:
linux-2.6-x86-debug-edd.patch
Log Message:
* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
- Remove extended EDD boot debugging.
- Shorten i386 oops reports by three lines.
linux-2.6-x86-clean-up-oops-bug-reports.patch:
--- NEW FILE linux-2.6-x86-clean-up-oops-bug-reports.patch ---
i386: clean up oops/bug reports
From: Pavel Emelyanov <xemul at openvz.org>
Typically the oops first lines look like this:
BUG: unable to handle kernel NULL pointer dereference at virtual address 00000000
printing eip:
c049dfbd
*pde = 00000000
Oops: 0002 [#1]
PREEMPT SMP
...
Such output is gained with some ugly if (!nl) printk("\n"); code and
besides being a waste of lines, this is also annoying to read. The
following output looks better (and it is how it looks on x86_64):
BUG: unable to handle kernel NULL pointer dereference at virtual address 00000000
printing eip: c049dfbd *pde = 00000000
Oops: 0002 [#1] PREEMPT SMP
...
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Andi Kleen <ak at suse.de>
---
arch/i386/kernel/traps.c | 16 ++++------------
arch/i386/mm/fault.c | 13 +++++++------
2 files changed, 11 insertions(+), 18 deletions(-)
Index: linux/arch/i386/kernel/traps.c
===================================================================
--- linux.orig/arch/i386/kernel/traps.c
+++ linux/arch/i386/kernel/traps.c
@@ -444,31 +444,23 @@ void die(const char * str, struct pt_reg
local_save_flags(flags);
if (++die.lock_owner_depth < 3) {
- int nl = 0;
unsigned long esp;
unsigned short ss;
report_bug(regs->eip, regs);
- printk(KERN_EMERG "%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);
+ printk(KERN_EMERG "%s: %04lx [#%d] ", str, err & 0xffff, ++die_counter);
#ifdef CONFIG_PREEMPT
- printk(KERN_EMERG "PREEMPT ");
- nl = 1;
+ printk("PREEMPT ");
#endif
#ifdef CONFIG_SMP
- if (!nl)
- printk(KERN_EMERG);
printk("SMP ");
- nl = 1;
#endif
#ifdef CONFIG_DEBUG_PAGEALLOC
- if (!nl)
- printk(KERN_EMERG);
printk("DEBUG_PAGEALLOC");
- nl = 1;
#endif
- if (nl)
- printk("\n");
+ printk("\n");
+
if (notify_die(DIE_OOPS, str, regs, err,
current->thread.trap_no, SIGSEGV) !=
NOTIFY_STOP) {
Index: linux/arch/i386/mm/fault.c
===================================================================
--- linux.orig/arch/i386/mm/fault.c
+++ linux/arch/i386/mm/fault.c
@@ -544,23 +544,22 @@ no_context:
printk(KERN_ALERT "BUG: unable to handle kernel paging"
" request");
printk(" at virtual address %08lx\n",address);
- printk(KERN_ALERT " printing eip:\n");
- printk("%08lx\n", regs->eip);
+ printk(KERN_ALERT "printing eip: %08lx ", regs->eip);
page = read_cr3();
page = ((__typeof__(page) *) __va(page))[address >> PGDIR_SHIFT];
#ifdef CONFIG_X86_PAE
- printk(KERN_ALERT "*pdpt = %016Lx\n", page);
+ printk("*pdpt = %016Lx ", page);
if ((page >> PAGE_SHIFT) < max_low_pfn
&& page & _PAGE_PRESENT) {
page &= PAGE_MASK;
page = ((__typeof__(page) *) __va(page))[(address >> PMD_SHIFT)
& (PTRS_PER_PMD - 1)];
- printk(KERN_ALERT "*pde = %016Lx\n", page);
+ printk(KERN_ALERT "*pde = %016Lx ", page);
page &= ~_PAGE_NX;
}
#else
- printk(KERN_ALERT "*pde = %08lx\n", page);
+ printk("*pde = %08lx ", page);
#endif
/*
@@ -574,8 +573,10 @@ no_context:
page &= PAGE_MASK;
page = ((__typeof__(page) *) __va(page))[(address >> PAGE_SHIFT)
& (PTRS_PER_PTE - 1)];
- printk(KERN_ALERT "*pte = %0*Lx\n", sizeof(page)*2, (u64)page);
+ printk("*pte = %0*Lx ", sizeof(page)*2, (u64)page);
}
+
+ printk("\n");
}
tsk->thread.cr2 = address;
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- kernel.spec 25 Sep 2007 23:06:48 -0000 1.187
+++ kernel.spec 26 Sep 2007 17:09:47 -0000 1.188
@@ -580,7 +580,7 @@
Patch42: linux-2.6-x86-tune-generic.patch
Patch70: linux-2.6-x86_64-silence-up-apic-errors.patch
Patch75: linux-2.6-x86-debug-boot.patch
-Patch76: linux-2.6-x86-debug-edd.patch
+Patch76: linux-2.6-x86-clean-up-oops-bug-reports.patch
Patch100: linux-2.6-g5-therm-shutdown.patch
Patch120: linux-2.6-ppc32-ucmpdi2.patch
@@ -1015,7 +1015,8 @@
#ApplyPatch linux-2.6-x86_64-silence-up-apic-errors.patch
# debug early boot
ApplyPatch linux-2.6-x86-debug-boot.patch
-ApplyPatch linux-2.6-x86-debug-edd.patch
+# shorter i386 oops reports (scheduled for 2.6.24)
+ApplyPatch linux-2.6-x86-clean-up-oops-bug-reports.patch
#
# PowerPC
@@ -1811,6 +1812,10 @@
%changelog
+* Wed Sep 26 2007 Chuck Ebbert <cebbert at redhat.com>
+- Remove extended EDD boot debugging.
+- Shorten i386 oops reports by three lines.
+
* Tue Sep 25 2007 Dave Jones <davej at redhat.com>
- Disable RTC_HCTOSYS. The initscripts already do this for us.
--- linux-2.6-x86-debug-edd.patch DELETED ---
More information about the fedora-extras-commits
mailing list