2011-06-01 01:32:39

by Paul McQuade

Subject: [PATCH] KERNEL: async: Fixed an include coding style issue

>From 2514174efe73e654c46e669ea2df5169a41d0130 Mon Sep 17 00:00:00 2001
From: Paul McQuade <[email protected]>
Date: Tue, 31 May 2011 20:51:55 +0100
Subject: [PATCH] KERNEL: async: Fixed an include coding style issue

async:
Added <linux/atomic.h>,<linux/ktime.h> and Removed <asm/atomic.h>.
Added KERN_DEBUG to printk() functions.

Signed-off-by: Paul McQuade <[email protected]>
---
kernel/async.c | 13 +++++++------
2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/kernel/async.c b/kernel/async.c
index cd9dbb9..91edc17 100644
--- a/kernel/async.c
+++ b/kernel/async.c
@@ -49,12 +49,13 @@ asynchronous and synchronous parts of the kernel.
*/

#include <linux/async.h>
+#include <linux/atomic.h>
+#include <linux/ktime.h>
#include <linux/module.h>
#include <linux/wait.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/workqueue.h>
-#include <asm/atomic.h>

static async_cookie_t next_cookie = 1;

@@ -128,15 +129,15 @@ static void async_run_entry_fn(struct work_struct
*work)

/* 2) run (and print duration) */
if (initcall_debug && system_state == SYSTEM_BOOTING) {
- printk("calling %lli_%pF @ %i\n", (long long)entry->cookie,
- entry->func, task_pid_nr(current));
+ printk(KERN_DEBUG "calling %lli_%pF @ %i\n",
+ (long long)entry->cookie,
+ entry->func, task_pid_nr(current));
calltime = ktime_get();
}
entry->func(entry->data, entry->cookie);
if (initcall_debug && system_state == SYSTEM_BOOTING) {
rettime = ktime_get();
delta = ktime_sub(rettime, calltime);
- printk("initcall %lli_%pF returned 0 after %lld usecs\n",
+ printk(KERN_DEBUG "initcall %lli_%pF returned 0 after %lld usecs\n",
(long long)entry->cookie,
entry->func,
(long long)ktime_to_ns(delta) >> 10);
@@ -270,7 +271,7 @@ void async_synchronize_cookie_domain(async_cookie_t
cookie,
ktime_t starttime, delta, endtime;

if (initcall_debug && system_state == SYSTEM_BOOTING) {
- printk("async_waiting @ %i\n", task_pid_nr(current));
+ printk(KERN_DEBUG "async_waiting @ %i\n", task_pid_nr(current));
starttime = ktime_get();
}

@@ -280,7 +281,7 @@ void async_synchronize_cookie_domain(async_cookie_t
cookie,
endtime = ktime_get();
delta = ktime_sub(endtime, starttime);

- printk("async_continuing @ %i after %lli usec\n",
+ printk(KERN_DEBUG "async_continuing @ %i after %lli usec\n",
task_pid_nr(current),
(long long)ktime_to_ns(delta) >> 10);
}

2011-06-01 01:42:35

by Steven Rostedt

Subject: Re: [PATCH] KERNEL: async: Fixed an include coding style issue

I should have told you to Cc this change to Arjan (as I just did), as he
owns this file.

-- Steve


On Wed, 2011-06-01 at 02:32 +0100, Paul McQuade wrote:
> >From 2514174efe73e654c46e669ea2df5169a41d0130 Mon Sep 17 00:00:00 2001
> From: Paul McQuade <[email protected]>
> Date: Tue, 31 May 2011 20:51:55 +0100
> Subject: [PATCH] KERNEL: async: Fixed an include coding style issue
>
> async:
> Added <linux/atomic.h>,<linux/ktime.h> and Removed <asm/atomic.h>.
> Added KERN_DEBUG to printk() functions.
>
> Signed-off-by: Paul McQuade <[email protected]>
> ---
> kernel/async.c | 13 +++++++------
> 2 files changed, 11 insertions(+), 14 deletions(-)
>
> diff --git a/kernel/async.c b/kernel/async.c
> index cd9dbb9..91edc17 100644
> --- a/kernel/async.c
> +++ b/kernel/async.c
> @@ -49,12 +49,13 @@ asynchronous and synchronous parts of the kernel.
> */
>
> #include <linux/async.h>
> +#include <linux/atomic.h>
> +#include <linux/ktime.h>
> #include <linux/module.h>
> #include <linux/wait.h>
> #include <linux/sched.h>
> #include <linux/slab.h>
> #include <linux/workqueue.h>
> -#include <asm/atomic.h>
>
> static async_cookie_t next_cookie = 1;
>
> @@ -128,15 +129,15 @@ static void async_run_entry_fn(struct work_struct
> *work)
>
> /* 2) run (and print duration) */
> if (initcall_debug && system_state == SYSTEM_BOOTING) {
> - printk("calling %lli_%pF @ %i\n", (long long)entry->cookie,
> - entry->func, task_pid_nr(current));
> + printk(KERN_DEBUG "calling %lli_%pF @ %i\n",
> + (long long)entry->cookie,
> + entry->func, task_pid_nr(current));
> calltime = ktime_get();
> }
> entry->func(entry->data, entry->cookie);
> if (initcall_debug && system_state == SYSTEM_BOOTING) {
> rettime = ktime_get();
> delta = ktime_sub(rettime, calltime);
> - printk("initcall %lli_%pF returned 0 after %lld usecs\n",
> + printk(KERN_DEBUG "initcall %lli_%pF returned 0 after %lld usecs\n",
> (long long)entry->cookie,
> entry->func,
> (long long)ktime_to_ns(delta) >> 10);
> @@ -270,7 +271,7 @@ void async_synchronize_cookie_domain(async_cookie_t
> cookie,
> ktime_t starttime, delta, endtime;
>
> if (initcall_debug && system_state == SYSTEM_BOOTING) {
> - printk("async_waiting @ %i\n", task_pid_nr(current));
> + printk(KERN_DEBUG "async_waiting @ %i\n", task_pid_nr(current));
> starttime = ktime_get();
> }
>
> @@ -280,7 +281,7 @@ void async_synchronize_cookie_domain(async_cookie_t
> cookie,
> endtime = ktime_get();
> delta = ktime_sub(endtime, starttime);
>
> - printk("async_continuing @ %i after %lli usec\n",
> + printk(KERN_DEBUG "async_continuing @ %i after %lli usec\n",
> task_pid_nr(current),
> (long long)ktime_to_ns(delta) >> 10);
> }

2011-06-01 02:12:59

by Arjan van de Ven

Subject: Re: [PATCH] KERNEL: async: Fixed an include coding style issue

On 5/31/2011 6:42 PM, Steven Rostedt wrote:
> I should have told you to Cc this change to Arjan (as I just did), as he
> owns this file.
>
> -- Steve
>
>
> On Wed, 2011-06-01 at 02:32 +0100, Paul McQuade wrote:
>> > From 2514174efe73e654c46e669ea2df5169a41d0130 Mon Sep 17 00:00:00 2001
>> From: Paul McQuade<[email protected]>
>> Date: Tue, 31 May 2011 20:51:55 +0100
>> Subject: [PATCH] KERNEL: async: Fixed an include coding style issue
>>
>> async:
>> Added<linux/atomic.h>,<linux/ktime.h> and Removed<asm/atomic.h>.
>> Added KERN_DEBUG to printk() functions.
>>
>> Signed-off-by: Paul McQuade<[email protected]>

Acked-by: Arjan van de Ven <[email protected]>