Skip to contentSkip to conversation

use kzalloc instead of kcalloc(1,

KJ Marion Jaillet 6 participants 8 messages Nov 27, 2005 – Nov 29, 2005

Subsystems (3)
Kernel janitors Input drivers kprobes
lore
Share & tools
lore
#1 lore raw
Quoted 1 line · Marion Jaillet

Patch against linux-2.6.14.2

Please patch against current mainline (e.g. 2.6.15-rc2)

Quoted 1 line
Signed-off-by Christophe Jaillet

Signed-off-by lines have a standard form (from SubmittingPatches).

"Signed-off-by: Random J Developer <[email protected]>"

Quoted 1 line

Desc : use kzalloc instead of kcalloc(1,...)

Patch should be inlined if possible. Also, it's not a .c file (it's a patch, not code).

Finally, patch needs to be -p1 applicable. diff -urpN from the parent directory of the source should be sufficient.

Thanks,
Nish

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

#2 lore raw
In reply to Marion Jaillet
Quoted 8 lines · Alexey Dobriyan
Quoted 4 lines · Nishanth Aravamudan
Quoted 1 line · Marion Jaillet

Patch against linux-2.6.14.2

Please patch against current mainline (e.g. 2.6.15-rc2)

True, but this particular occurence is already replaced. Also, kmalloc() error checking in this file is funny.

Yeah, I kinda hoped this was the case (without looking). Point being, we can avoid unnecessary patches on the ML if all patches are against current mainline when submitted.

Thanks,
Nish

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

#4 lore raw
In reply to Marion Jaillet

from: Christophe Jaillet [email protected]

use kzalloc instead of kcalloc(1,...) in /kernel/kprobes.c and /include/linux/gameport.h

Signed-off-by Christophe Jaillet [email protected]

---
Patch applicable to linux-2.6.15-rc2

I hope that for this third try :
the form is OK
the patch is usefull
CJ

kernel/kprobes.c 2005-11-28 22:20:58.000000000 +0100 renamed from kernel/kprobes.c.old 2005-11-11 06:33:12.000000000 +0100 +2 -2
@@ -420,3 +420,3 @@ static inline void add_aggr_kprobe(struc
  * the intricacies
- * TODO: Move kcalloc outside the spinlock
+ * TODO: Move kzalloc outside the spinlock
  */

@@ -432,3 +432,3 @@ static int __kprobes register_aggr_kprob
  } else {
-  ap = kcalloc(1, sizeof(struct kprobe), GFP_ATOMIC);
+  ap = kzalloc(sizeof(struct kprobe), GFP_ATOMIC);
   if (!ap)
include/linux/gameport.h 2005-11-28 22:19:48.000000000 +0100 renamed from include/linux/gameport.h.old 2005-11-11 06:33:12.000000000 +0100 +1 -1
@@ -104,3 +104,3 @@ static inline struct gameport *gameport_
 {
- struct gameport *gameport = kcalloc(1, sizeof(struct gameport), GFP_KERNEL);
+ struct gameport *gameport = kzalloc(sizeof(struct gameport), GFP_KERNEL);

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

#5 lore raw
In reply to Marion Jaillet
Quoted 7 lines · Christophe Jaillet

from: Christophe Jaillet [email protected]

use kzalloc instead of kcalloc(1,...) in /kernel/kprobes.c and /include/linux/gameport.h

Signed-off-by Christophe Jaillet [email protected]

Brackets around the e-mail address please (in both From & Signed-off-by).

Otherwise ok, I think.

Thanks,
Nish

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

#6 lore raw
In reply to Marion Jaillet
Quoted 10 lines · Christophe Jaillet

from: Christophe Jaillet [email protected]

use kzalloc instead of kcalloc(1,...) in /kernel/kprobes.c and /include/linux/gameport.h

Signed-off-by Christophe Jaillet [email protected]

---
Patch applicable to linux-2.6.15-rc2

I hope that for this third try :
the form is OK
the patch is usefull

Patch looks ok to me, but doesn't seem to want to apply:

juhl@dragon:~/kernel/linux-2.6.15-rc2$ patch -p1 < ../Christophe.patch
patching file kernel/kprobes.c
Hunk #1 FAILED at 420.
Hunk #2 FAILED at 432.
2 out of 2 hunks FAILED -- saving rejects to file kernel/kprobes.c.rej
patching file include/linux/gameport.h
Hunk #1 FAILED at 104.
1 out of 1 hunk FAILED -- saving rejects to file include/linux/gameport.h.rej

Could be due to the email encoding or you generated the patch against a different kernel version? I didn't investigate...

Ohh and another thing, if ever you plan to send patches to LKML, then this

Quoted 2 lines
Content-Type: text/html;
	charset="iso-8859-1"

is a very bad idea as it'll cause your mail to never reach the mailing list.

Just use plain text.

Signature · 8 lines
Jesper Juhl <[email protected]>
Don't top-post  http://www.catb.org/~esr/jargon/html/T/top-post.html
Plain text mails only, please      http://www.expita.com/nomime.html

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
#7 lore raw
In reply to Marion Jaillet
Quoted 3 lines · Daniel Marjam?ki

I believe you are patching against the wrong version, my friend.

I applied the changes manually and then made a new patch:

:-/ Every time I view it in mutt, everything is OK. Every time I save email, I get space-space at the beggining of context lines, which, of course, confuses patch(1).

Quoted 12 lines
kernel/kprobes.c +1 -1
@@ -408,7 +408,7 @@ static inline void add_aggr_kprobe(struc
 /*
  * This is the second or subsequent kprobe at the address - handle
  * the intricacies
- * TODO: Move kcalloc outside the spin_lock
+ * TODO: Move kzalloc outside the spin_lock
  */
 static int __kprobes register_aggr_kprobe(struct kprobe *old_p,
 					  struct kprobe *p)

kernel/kprobes.c static int __kprobes register_aggr_kprob · line 426

Quoted 8 lines
kernel/kprobes.c +1 -1
@@ -420,7 +420,7 @@ static int __kprobes register_aggr_kprob
 		copy_kprobe(old_p, p);
 		ret = add_new_kprobe(old_p, p);
 	} else {
-		ap = kcalloc(1, sizeof(struct kprobe), GFP_ATOMIC);
+		ap = kzalloc(sizeof(struct kprobe), GFP_ATOMIC);
 		if (!ap)
 			return -ENOMEM;
 		add_aggr_kprobe(ap, old_p);

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors