printk: arch/i386/kernel/doublefault.c
PATCH 1/1 printk: arch/i386/kernel/doublefault.c
printk() should include the appropriate KERN_* constant.
--- linux-2.6.14-rc2.orig/arch/i386/kernel/doublefault.c 2005-09-20
05:00:41.000000000 +0200
+++ linux-2.6.14-rc2/arch/i386/kernel/doublefault.c 2005-09-30
22:40:50.000000000 +0200
@@ -23,23 +23,23 @@ static void doublefault_fn(void)
store_gdt(&gdt_desc);
gdt = gdt_desc.address;- printk("double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
+ printk(KERN_ERR"double fault, gdt at %08lx [%d bytes]\n", gdt,
gdt_desc.size);
if (ptr_ok(gdt)) {
gdt += GDT_ENTRY_TSS << 3;
tss = *(u16 *)(gdt+2);
tss += *(u8 *)(gdt+4) << 16;
tss += *(u8 *)(gdt+7) << 24;- printk("double fault, tss at %08lx\n", tss);
+ printk(KERN_ERR"double fault, tss at %08lx\n", tss);
if (ptr_ok(tss)) {
struct tss_struct *t = (struct tss_struct *)tss;- printk("eip = %08lx, esp = %08lx\n", t->eip, t->esp);
+ printk(KERN_ERR"eip = %08lx, esp = %08lx\n", t->eip, t->esp);
- printk("eax = %08lx, ebx = %08lx, ecx = %08lx, edx = %08lx\n",
+ printk(KERN_ERR"eax = %08lx, ebx = %08lx, ecx = %08lx, edx
= %08lx\n",
t->eax, t->ebx, t->ecx, t->edx);
- printk("esi = %08lx, edi = %08lx\n",
+ printk(KERN_ERR"esi = %08lx, edi = %08lx\n",
t->esi, t->edi);
}
}This is my first patch so please be nice to me ;-) . I've tried to make it as good and correct as I could so there shouldn't be _too_ much errors. Hope this is the right way to do this...
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
Your patch is line-wrapped. Also, you need to include a Signed-off-by line. Please see Documentation/SubmittingPatches.
Thanks,
Nish
Quoted 39 lines · Dinolinux
printk()should include the appropriate KERN_* constant.---
linux-2.6.14-rc2.orig/arch/i386/kernel/doublefault.c2005-09-20
05:00:41.000000000 +0200
+++linux-2.6.14-rc2/arch/i386/kernel/doublefault.c2005-09-30
22:40:50.000000000 +0200(quoted diff) +5
-5@@ -23,23 +23,23 @@ static void doublefault_fn(void) store_gdt(&gdt_desc); gdt = gdt_desc.address; - printk("double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size); + printk(KERN_ERR"double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size); if (ptr_ok(gdt)) { gdt += GDT_ENTRY_TSS << 3; tss = *(u16 *)(gdt+2); tss += *(u8 *)(gdt+4) << 16; tss += *(u8 *)(gdt+7) << 24; - printk("double fault, tss at %08lx\n", tss); + printk(KERN_ERR"double fault, tss at %08lx\n", tss); if (ptr_ok(tss)) { struct tss_struct *t = (struct tss_struct *)tss; - printk("eip = %08lx, esp = %08lx\n", t->eip, t->esp); + printk(KERN_ERR"eip = %08lx, esp = %08lx\n", t->eip, t->esp); - printk("eax = %08lx, ebx = %08lx, ecx = %08lx, edx = %08lx\n", + printk(KERN_ERR"eax = %08lx, ebx = %08lx, ecx = %08lx, edx = %08lx\n", t->eax, t->ebx, t->ecx, t->edx); - printk("esi = %08lx, edi = %08lx\n", + printk(KERN_ERR"esi = %08lx, edi = %08lx\n", t->esi, t->edi);} }
Quoted 9 lines
This is my first patch so please be nice to me ;-) . I've tried to make it as good and correct as I could so there shouldn't be _too_ much errors. Hope this is the right way to do this...
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
PATCH 1/1 printk: arch/i386/kernel/doublefault.c [UPDATED]
In reply to Dinolinux--- linux-2.6.14-rc2.orig/arch/i386/kernel/doublefault.c 2005-09-20
05:00:41.000000000 +0200
+++ linux-2.6.14-rc2/arch/i386/kernel/doublefault.c 2005-10-01
00:02:07.000000000 +0200
@@ -23,23 +23,23 @@ static void doublefault_fn(void)
store_gdt(&gdt_desc);
gdt = gdt_desc.address;- printk("double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
+ printk(KERN_ERR "double fault, gdt at %08lx [%d bytes]\n", gdt,
gdt_desc.size);
if (ptr_ok(gdt)) {
gdt += GDT_ENTRY_TSS << 3;
tss = *(u16 *)(gdt+2);
tss += *(u8 *)(gdt+4) << 16;
tss += *(u8 *)(gdt+7) << 24;- printk("double fault, tss at %08lx\n", tss);
+ printk(KERN_ERR "double fault, tss at %08lx\n", tss);
if (ptr_ok(tss)) {
struct tss_struct *t = (struct tss_struct *)tss;- printk("eip = %08lx, esp = %08lx\n", t->eip, t->esp);
+ printk(KERN_ERR "eip = %08lx, esp = %08lx\n", t->eip, t->esp);
- printk("eax = %08lx, ebx = %08lx, ecx = %08lx, edx = %08lx\n",
+ printk(KERN_ERR "eax = %08lx, ebx = %08lx, ecx = %08lx, edx
= %08lx\n",
t->eax, t->ebx, t->ecx, t->edx);
- printk("esi = %08lx, edi = %08lx\n",
+ printk(KERN_ERR "esi = %08lx, edi = %08lx\n",
t->esi, t->edi);
}
}Fixed the missing spaces.
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
Re: [KJ] [PATCH] printk: arch/i386/kernel/doublefault.c [UPDATED]
In reply to DinolinuxStill no Signed-off-by and line-wrapped.
Thanks,
Nish
Quoted 36 lines · Dinolinux
---
linux-2.6.14-rc2.orig/arch/i386/kernel/doublefault.c2005-09-20
05:00:41.000000000 +0200
+++linux-2.6.14-rc2/arch/i386/kernel/doublefault.c2005-10-01
00:02:07.000000000 +0200(quoted diff) +5
-5@@ -23,23 +23,23 @@ static void doublefault_fn(void) store_gdt(&gdt_desc); gdt = gdt_desc.address; - printk("double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size); + printk(KERN_ERR "double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size); if (ptr_ok(gdt)) { gdt += GDT_ENTRY_TSS << 3; tss = *(u16 *)(gdt+2); tss += *(u8 *)(gdt+4) << 16; tss += *(u8 *)(gdt+7) << 24; - printk("double fault, tss at %08lx\n", tss); + printk(KERN_ERR "double fault, tss at %08lx\n", tss); if (ptr_ok(tss)) { struct tss_struct *t = (struct tss_struct *)tss; - printk("eip = %08lx, esp = %08lx\n", t->eip, t->esp); + printk(KERN_ERR "eip = %08lx, esp = %08lx\n", t->eip, t->esp); - printk("eax = %08lx, ebx = %08lx, ecx = %08lx, edx = %08lx\n", + printk(KERN_ERR "eax = %08lx, ebx = %08lx, ecx = %08lx, edx = %08lx\n", t->eax, t->ebx, t->ecx, t->edx); - printk("esi = %08lx, edi = %08lx\n", + printk(KERN_ERR "esi = %08lx, edi = %08lx\n", t->esi, t->edi);} }
Quoted 7 lines
Fixed the missing spaces.
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
Besides the points Nish alreaqdy brought up:
Quoted 1 line · Dinolinux
printk()should include the appropriate KERN_* constant.
But not always KERN_ERR. See include/linux/kernel.h for all KERN_* constants. Also it is better to write:
printk(KERN_ERR "Some error message"); instead of printk(KERN_ERR"Some error message");
as you did.
Cheers, Tobias
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
PATCH 1/1 printk: arch/i386/kernel/doublefault.c
In reply to Dinolinuxprintk() should include the appropriate KERN_* constant.
Signed off by: Anton Brondz ([email protected])
*--- linux-2.6.14-rc2.orig/arch/i386/kernel/doublefault.c 2005-09-20 05:00:41.000000000 +0200*
*+++ linux-2.6.14-rc2/arch/i386/kernel/doublefault.c 2005-10-01 00:02:07.000000000 +0200*
@@ -23,23 +23,23 @@ static void doublefault_fn(void)
store_gdt(&gdt_desc);
gdt = gdt_desc.address;
- printk("double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
+ printk(KERN_ERR "double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
if (ptr_ok(gdt)) {
gdt += GDT_ENTRY_TSS << 3;
tss = *(u16 *)(gdt+2);
tss += *(u8 *)(gdt+4) << 16;
tss += *(u8 *)(gdt+7) << 24;
- printk("double fault, tss at %08lx\n", tss);
+ printk(KERN_ERR "double fault, tss at %08lx\n", tss);
if (ptr_ok(tss)) {
struct tss_struct *t = (struct tss_struct *)tss;
- printk("eip = %08lx, esp = %08lx\n", t->eip, t->esp);
+ printk(KERN_ERR "eip = %08lx, esp = %08lx\n", t->eip, t->esp);
- printk("eax = %08lx, ebx = %08lx, ecx = %08lx, edx = %08lx\n",
+ printk(KERN_ERR "eax = %08lx, ebx = %08lx, ecx = %08lx, edx = %08lx\n",
t->eax, t->ebx, t->ecx, t->edx);
- printk("esi = %08lx, edi = %08lx\n",
+ printk(KERN_ERR "esi = %08lx, edi = %08lx\n",
t->esi, t->edi);
}
}
Hope this is working now. I've tried to fix the word wrap. My usual email address isn't working today, so I'm sending from this one. Just in case, I'm sending the patch as an attacment too.
arch/i386/kernel/doublefault.c +5 -5
@@ -23,23 +23,23 @@ static void doublefault_fn(void)store_gdt (&gdt_desc); gdt = gdt_desc.address; -printk ("double fault, gdt at %08lx [%d bytes]\n" , gdt, gdt_desc.size); +printk (KERN_ERR "double fault, gdt at %08lx [%d bytes]\n" , gdt, gdt_desc.size);if (ptr_ok (gdt)) { gdt +=GDT_ENTRY_TSS <<3 ; tss = *(u16 *)(gdt+2 ); tss += *(u8 *)(gdt+4 ) <<16 ; tss += *(u8 *)(gdt+7 ) <<24 ; -printk ("double fault, tss at %08lx\n" , tss); +printk (KERN_ERR "double fault, tss at %08lx\n" , tss);if (ptr_ok (tss)) {struct tss_struct *t = (struct tss_struct *)tss; -printk ("eip = %08lx, esp = %08lx\n" , t->eip, t->esp); +printk (KERN_ERR "eip = %08lx, esp = %08lx\n" , t->eip, t->esp); -printk ("eax = %08lx, ebx = %08lx, ecx = %08lx, edx = %08lx\n" , +printk (KERN_ERR "eax = %08lx, ebx = %08lx, ecx = %08lx, edx = %08lx\n" , t->eax, t->ebx, t->ecx, t->edx); -printk ("esi = %08lx, edi = %08lx\n" , +printk (KERN_ERR "esi = %08lx, edi = %08lx\n" , t->esi, t->edi); } }
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
Quoted 6 lines · Powerflash
printk()should include the appropriate KERN_* constant.Signed off by: Anton Brondz ([email protected])
*---
linux-2.6.14-rc2.orig/arch/i386/kernel/doublefault.c2005-09-20 05:00:41.000000000 +0200*
*+++linux-2.6.14-rc2/arch/i386/kernel/doublefault.c2005-10-01 00:02:07.000000000 +0200*
^
Huh? It doesn't seem to appear in the attached patch file.
Review static void doublefault_fn(void) · line 26
Quoted 6 lines
(quoted diff) +1
-1@@ -23,23 +23,23 @@ static void doublefault_fn(void) store_gdt(&gdt_desc); gdt = gdt_desc.address; - printk("double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size); + printk(KERN_ERR "double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
I don't think KERN_ERR is appropriate here. Again, see include/linux/kernel.h for all KERN_* constants and pay attention to the comments. Or see the many patches Christophe already sent for this TODO entry.
Review static void doublefault_fn(void) · line 32
Quoted 7 lines
(quoted diff) +1
-1if (ptr_ok(gdt)) { gdt += GDT_ENTRY_TSS << 3; tss = *(u16 *)(gdt+2); tss += *(u8 *)(gdt+4) << 16; tss += *(u8 *)(gdt+7) << 24; - printk("double fault, tss at %08lx\n", tss); + printk(KERN_ERR "double fault, tss at %08lx\n", tss);
Ditto
Review static void doublefault_fn(void) · line 36
Quoted 5 lines
(quoted diff) +1
-1if (ptr_ok(tss)) { struct tss_struct *t = (struct tss_struct *)tss; - printk("eip = %08lx, esp = %08lx\n", t->eip, t->esp); + printk(KERN_ERR "eip = %08lx, esp = %08lx\n", t->eip, t->esp);
Ditto
Review static void doublefault_fn(void) · line 37
Quoted 2 lines
(quoted diff) +1
-1- printk("eax = %08lx, ebx = %08lx, ecx = %08lx, edx = %08lx\n", + printk(KERN_ERR "eax = %08lx, ebx = %08lx, ecx = %08lx, edx = %08lx\n",
Ditto
Review static void doublefault_fn(void) · line 39
Quoted 3 lines
(quoted diff) +1
-1t->eax, t->ebx, t->ecx, t->edx); - printk("esi = %08lx, edi = %08lx\n", + printk(KERN_ERR "esi = %08lx, edi = %08lx\n",
Ditto
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors