Skip to contentSkip to conversation

KERNEL: async: Fixed an include coding style issue

PATCH In review Paul McQuade 3 participants 4 messages Jun 1, 2011 – Jul 5, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 KERNEL: async: Fixed an include coding style issue

Quoted 1 line

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.

---
 kernel/async.c        |   13 +++++++------
 2 files changed, 11 insertions(+), 14 deletions(-)
kernel/async.c +2 -1
index cd9dbb9..91edc17 100644
@@ -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);
}

#1 lore raw

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

-- Steve

Quoted 74 lines · Paul McQuade
Quoted 1 line

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.

---
 kernel/async.c        |   13 +++++++------
 2 files changed, 11 insertions(+), 14 deletions(-)
kernel/async.c +8 -6
index cd9dbb9..91edc17 100644
@@ -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);

}

#2 lore raw
Quoted 17 lines · Steven Rostedt

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

-- Steve

Quoted 10 lines · Paul McQuade
Quoted 1 line

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.

#3 lore raw

[tip:perf/core] async: Fixed an include coding style issue

In reply to Paul McQuade
Commit-ID:  84c15027a7f2fbd7f1180d7cbb60e41abbbaedd2
Gitweb:     http://git.kernel.org/tip/84c15027a7f2fbd7f1180d7cbb60e41abbbaedd2
Author:     Paul McQuade <[email protected]>
AuthorDate: Tue, 31 May 2011 20:51:55 +0100
Committer:  Steven Rostedt <[email protected]>
CommitDate: Tue, 14 Jun 2011 22:48:46 -0400

async: Fixed an include coding style issue

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

---
 kernel/async.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
kernel/async.c +7 -5
index cd9dbb9..d5fe7af 100644
@@ -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,7 +129,8 @@ 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,
+		printk(KERN_DEBUG "calling  %lli_%pF @ %i\n",
+			(long long)entry->cookie,
 			entry->func, task_pid_nr(current));
 		calltime = ktime_get();
 	}
@@ -136,7 +138,7 @@ static void async_run_entry_fn(struct work_struct *work)
 	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 +272,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 +282,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);
 	}