* [PATCH] - trivial comment fixups in init/main.c
@ 2004-07-13 18:39 Tim Bird
2004-08-17 9:53 ` Rusty Russell
0 siblings, 1 reply; 6+ messages in thread
From: Tim Bird @ 2004-07-13 18:39 UTC (permalink / raw)
To: linux kernel; +Cc: trivial, Adam Kropelin
This patch has some trivial comment fixups for init/main.c, to bring
the comments into consistency with the coding style of the kernel.
These modifications were originally made by Adam Kropelin
These came to our attention while working on a patch to
calibrate_delay(), and I thought we should separate these
changes from that patch.
The patch applies silently against 2.6.7 and cleanly but
with hunk offsets to 2.6.7-bk20.
main.c | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
Please apply.
=============================
Tim Bird
Architecture Group Co-Chair, CE Linux Forum
Senior Staff Engineer, Sony Electronics
E-mail: tim.bird@am.sony.com
=============================
Signed-off-by: Tim Bird <tim.bird@am.sony.com>
--
diff -u -X /home/tbird/dontdiff -ruN linux-2.6.7.orig/init/main.c patch5/init/main.c
--- linux-2.6.7.orig/init/main.c 2004-06-15 22:19:01.000000000 -0700
+++ patch5/init/main.c 2004-07-12 12:34:55.000000000 -0700
@@ -238,8 +264,10 @@
__setup("debug", debug_kernel);
__setup("quiet", quiet_kernel);
-/* Unknown boot options get handed to init, unless they look like
- failed parameters */
+/*
+ * Unknown boot options get handed to init, unless they look like
+ * failed parameters
+ */
static int __init unknown_bootoption(char *param, char *val)
{
/* Change NUL term back to "=", to make "param" the whole string. */
@@ -250,8 +278,10 @@
if (obsolete_checksetup(param))
return 0;
- /* Preemptive maintenance for "why didn't my mispelled command
- line work?" */
+ /*
+ * Preemptive maintenance for "why didn't my mispelled command
+ * line work?"
+ */
if (strchr(param, '.') && (!val || strchr(param, '.') < val)) {
printk(KERN_ERR "Unknown boot option `%s': ignoring\n", param);
return 0;
@@ -289,7 +319,8 @@
unsigned int i;
execute_command = str;
- /* In case LILO is going to boot us with default command line,
+ /*
+ * In case LILO is going to boot us with default command line,
* it prepends "auto" before the whole cmdline which makes
* the shell think it should execute a script with such name.
* So we ignore all arguments entered _before_ init=... [MJ]
@@ -483,9 +514,9 @@
check_bugs();
/*
- * We count on the initial thread going ok
- * Like idlers init is an unlocked kernel thread, which will
- * make syscalls (and thus be locked).
+ * We count on the initial thread going ok
+ * Like idlers init is an unlocked kernel thread, which will
+ * make syscalls (and thus be locked).
*/
init_idle(current, smp_processor_id());
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] - trivial comment fixups in init/main.c
2004-07-13 18:39 [PATCH] - trivial comment fixups in init/main.c Tim Bird
@ 2004-08-17 9:53 ` Rusty Russell
2004-08-17 11:45 ` Adam Kropelin
2004-08-17 17:31 ` Tim Bird
0 siblings, 2 replies; 6+ messages in thread
From: Rusty Russell @ 2004-08-17 9:53 UTC (permalink / raw)
To: Tim Bird; +Cc: linux kernel, Adam Kropelin
In message <40F42C44.5010603@am.sony.com> you write:
> This patch has some trivial comment fixups for init/main.c, to bring
> the comments into consistency with the coding style of the kernel.
Personally, I prefer my comments quiet and unobtrusive, and I think
you'll find Linus' code tends to be the same.
Not to start a flame war, but since I started using a colorizing
editor for code, I found there was no need to waste vertical space
with large banners. (This in my mind justifies the X project's entire
existence).
Sorry,
Rusty.
> diff -u -X /home/tbird/dontdiff -ruN linux-2.6.7.orig/init/main.c patch5/init/main.c
> --- linux-2.6.7.orig/init/main.c 2004-06-15 22:19:01.000000000 -0700
> +++ patch5/init/main.c 2004-07-12 12:34:55.000000000 -0700
> @@ -238,8 +264,10 @@
> __setup("debug", debug_kernel);
> __setup("quiet", quiet_kernel);
>
> -/* Unknown boot options get handed to init, unless they look like
> - failed parameters */
> +/*
> + * Unknown boot options get handed to init, unless they look like
> + * failed parameters
> + */
> static int __init unknown_bootoption(char *param, char *val)
> {
> /* Change NUL term back to "=", to make "param" the whole string. */
> @@ -250,8 +278,10 @@
> if (obsolete_checksetup(param))
> return 0;
>
> - /* Preemptive maintenance for "why didn't my mispelled command
> - line work?" */
> + /*
> + * Preemptive maintenance for "why didn't my mispelled command
> + * line work?"
> + */
> if (strchr(param, '.') && (!val || strchr(param, '.') < val)) {
> printk(KERN_ERR "Unknown boot option `%s': ignoring\n", param);
> return 0;
> @@ -289,7 +319,8 @@
> unsigned int i;
>
> execute_command = str;
> - /* In case LILO is going to boot us with default command line,
> + /*
> + * In case LILO is going to boot us with default command line,
> * it prepends "auto" before the whole cmdline which makes
> * the shell think it should execute a script with such name.
> * So we ignore all arguments entered _before_ init=... [MJ]
> @@ -483,9 +514,9 @@
> check_bugs();
>
> /*
> - * We count on the initial thread going ok
> - * Like idlers init is an unlocked kernel thread, which will
> - * make syscalls (and thus be locked).
> + * We count on the initial thread going ok
> + * Like idlers init is an unlocked kernel thread, which will
> + * make syscalls (and thus be locked).
> */
> init_idle(current, smp_processor_id());
--
Anyone who quotes me in their sig is an idiot. -- Rusty Russell.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] - trivial comment fixups in init/main.c
2004-08-17 9:53 ` Rusty Russell
@ 2004-08-17 11:45 ` Adam Kropelin
2004-08-17 17:31 ` Tim Bird
1 sibling, 0 replies; 6+ messages in thread
From: Adam Kropelin @ 2004-08-17 11:45 UTC (permalink / raw)
To: Rusty Russell, Tim Bird; +Cc: linux kernel, Andrew Morton
Rusty Russell wrote:
> In message <40F42C44.5010603@am.sony.com> you write:
>> This patch has some trivial comment fixups for init/main.c, to bring
>> the comments into consistency with the coding style of the kernel.
>
> Personally, I prefer my comments quiet and unobtrusive, and I think
> you'll find Linus' code tends to be the same.
>
> Not to start a flame war, but since I started using a colorizing
> editor for code, I found there was no need to waste vertical space
> with large banners. (This in my mind justifies the X project's entire
> existence).
Personally, I agree with you. Andrew specifically requested this patch to
bring a few oddball comments in line with those throughout the rest of the
file. I'd be happy to go the other way instead.
--Adam
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] - trivial comment fixups in init/main.c
2004-08-17 9:53 ` Rusty Russell
2004-08-17 11:45 ` Adam Kropelin
@ 2004-08-17 17:31 ` Tim Bird
2004-08-17 17:42 ` Christoph Hellwig
1 sibling, 1 reply; 6+ messages in thread
From: Tim Bird @ 2004-08-17 17:31 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux kernel, Adam Kropelin, Andrew Morton
Rusty Russell wrote:
> In message <40F42C44.5010603@am.sony.com> you write:
>
>>This patch has some trivial comment fixups for init/main.c, to bring
>>the comments into consistency with the coding style of the kernel.
>
>
> Personally, I prefer my comments quiet and unobtrusive, and I think
> you'll find Linus' code tends to be the same.
>
> Not to start a flame war, but since I started using a colorizing
> editor for code, I found there was no need to waste vertical space
> with large banners. (This in my mind justifies the X project's entire
> existence).
>
> Sorry,
Fine with me. These comments were modified at the request of
Andrew Morton, who wanted the comment style to be consistent.
I actually agree with your position, but I wanted to follow
what Andrew wanted here.
=============================
Tim Bird
Architecture Group Co-Chair, CE Linux Forum
Senior Staff Engineer, Sony Electronics
E-mail: tim.bird@am.sony.com
=============================
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] - trivial comment fixups in init/main.c
2004-08-17 17:31 ` Tim Bird
@ 2004-08-17 17:42 ` Christoph Hellwig
2004-08-26 8:42 ` Rusty Russell
0 siblings, 1 reply; 6+ messages in thread
From: Christoph Hellwig @ 2004-08-17 17:42 UTC (permalink / raw)
To: Tim Bird; +Cc: Rusty Russell, linux kernel, Adam Kropelin, Andrew Morton
> Fine with me. These comments were modified at the request of
> Andrew Morton, who wanted the comment style to be consistent.
> I actually agree with your position, but I wanted to follow
> what Andrew wanted here.
Please fix the comments anyway. Rusty's preffered style is by far the
minority in core kernel code.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] - trivial comment fixups in init/main.c
2004-08-17 17:42 ` Christoph Hellwig
@ 2004-08-26 8:42 ` Rusty Russell
0 siblings, 0 replies; 6+ messages in thread
From: Rusty Russell @ 2004-08-26 8:42 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: Tim Bird, linux kernel, Adam Kropelin, Andrew Morton
On Wed, 2004-08-18 at 03:42, Christoph Hellwig wrote:
> > Fine with me. These comments were modified at the request of
> > Andrew Morton, who wanted the comment style to be consistent.
> > I actually agree with your position, but I wanted to follow
> > what Andrew wanted here.
>
> Please fix the comments anyway. Rusty's preffered style is by far the
> minority in core kernel code.
I went back and looked; you're right. Generally, I hate to waste
vertical whitespace inside a function.
As I said, the balance with a color-coded editor is different than when
reading code on paper.
Cheers,
Rusty.
--
Anyone who quotes me in their signature is an idiot -- Rusty Russell
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2004-08-26 9:58 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-07-13 18:39 [PATCH] - trivial comment fixups in init/main.c Tim Bird
2004-08-17 9:53 ` Rusty Russell
2004-08-17 11:45 ` Adam Kropelin
2004-08-17 17:31 ` Tim Bird
2004-08-17 17:42 ` Christoph Hellwig
2004-08-26 8:42 ` Rusty Russell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox