* [PATCH] KERNEL: async: Fixed an include coding style issue
@ 2011-06-01 0:51 Paul McQuade
2011-06-01 1:11 ` Steven Rostedt
0 siblings, 1 reply; 6+ messages in thread
From: Paul McQuade @ 2011-06-01 0:51 UTC (permalink / raw)
To: linux-kernel; +Cc: Steven Rostedt, Frederic Weisbecker
>From 2514174efe73e654c46e669ea2df5169a41d0130 Mon Sep 17 00:00:00 2001
From: Paul McQuade <tungstentide@gmail.com>
Date: Tue, 31 May 2011 20:51:55 +0100
Subject: [PATCH] KERNEL: async: Fixed an include coding style issue
KERNEL: trace: ftrace: 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.
ftrace:
Removed <asm/ftrace.h> because <linux/ftrace.h> was already declared.
Braces of struct's coding style fixed.
Signed-off-by: Paul McQuade <tungstentide@gmail.com>
---
kernel/async.c | 13 +++++++------
kernel/trace/ftrace.c | 12 ++++--------
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);
}
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 1ee417f..02c1cef 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -32,7 +32,6 @@
#include <trace/events/sched.h>
-#include <asm/ftrace.h>
#include <asm/setup.h>
#include "trace_output.h"
@@ -82,8 +81,7 @@ static int ftrace_disabled __read_mostly;
static DEFINE_MUTEX(ftrace_lock);
-static struct ftrace_ops ftrace_list_end __read_mostly =
-{
+static struct ftrace_ops ftrace_list_end __read_mostly = {
.func = ftrace_stub,
};
@@ -785,8 +783,7 @@ static void unregister_ftrace_profiler(void)
unregister_ftrace_graph();
}
#else
-static struct ftrace_ops ftrace_profile_ops __read_mostly =
-{
+static struct ftrace_ops ftrace_profile_ops __read_mostly = {
.func = function_profile_call,
};
@@ -999,7 +996,7 @@ struct ftrace_page {
};
#define ENTRIES_PER_PAGE \
- ((PAGE_SIZE - sizeof(struct ftrace_page)) / sizeof(struct dyn_ftrace))
+((PAGE_SIZE - sizeof(struct ftrace_page)) / sizeof(struct dyn_ftrace))
/* estimate from running different kernels */
#define NR_TO_INIT 10000
@@ -2483,8 +2480,7 @@ function_trace_probe_call(unsigned long ip,
unsigned long parent_ip)
preempt_enable_notrace();
}
-static struct ftrace_ops trace_probe_ops __read_mostly =
-{
+static struct ftrace_ops trace_probe_ops __read_mostly = {
.func = function_trace_probe_call,
};
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] KERNEL: async: Fixed an include coding style issue
2011-06-01 0:51 [PATCH] KERNEL: " Paul McQuade
@ 2011-06-01 1:11 ` Steven Rostedt
0 siblings, 0 replies; 6+ messages in thread
From: Steven Rostedt @ 2011-06-01 1:11 UTC (permalink / raw)
To: Paul McQuade; +Cc: linux-kernel, Frederic Weisbecker
On Wed, 2011-06-01 at 01:51 +0100, Paul McQuade wrote:
> >From 2514174efe73e654c46e669ea2df5169a41d0130 Mon Sep 17 00:00:00 2001
> From: Paul McQuade <tungstentide@gmail.com>
> Date: Tue, 31 May 2011 20:51:55 +0100
> Subject: [PATCH] KERNEL: async: Fixed an include coding style issue
> KERNEL: trace: ftrace: 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.
The async changes need to be separate from the ftrace changes.
Just make two patches.
>
> ftrace:
> Removed <asm/ftrace.h> because <linux/ftrace.h> was already declared.
> Braces of struct's coding style fixed.
> Signed-off-by: Paul McQuade <tungstentide@gmail.com>
> ---
> kernel/async.c | 13 +++++++------
> kernel/trace/ftrace.c | 12 ++++--------
> 2 files changed, 11 insertions(+), 14 deletions(-)
>
> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
> index 1ee417f..02c1cef 100644
> --- a/kernel/trace/ftrace.c
> +++ b/kernel/trace/ftrace.c
> @@ -32,7 +32,6 @@
>
> #include <trace/events/sched.h>
>
> };
>
> #define ENTRIES_PER_PAGE \
> - ((PAGE_SIZE - sizeof(struct ftrace_page)) / sizeof(struct dyn_ftrace))
> +((PAGE_SIZE - sizeof(struct ftrace_page)) / sizeof(struct dyn_ftrace))
I'm fine with all the ftrace.c changes but this one. I like the
indentation here, as it makes it easier to read that it is a
continuation of the previous line.
-- Steve
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] KERNEL: async: Fixed an include coding style issue
@ 2011-06-01 1:32 Paul McQuade
2011-06-01 1:42 ` Steven Rostedt
2011-07-05 12:51 ` [tip:perf/core] " tip-bot for Paul McQuade
0 siblings, 2 replies; 6+ messages in thread
From: Paul McQuade @ 2011-06-01 1:32 UTC (permalink / raw)
To: linux-kernel, Steven Rostedt, Frederic Weisbecker
>From 2514174efe73e654c46e669ea2df5169a41d0130 Mon Sep 17 00:00:00 2001
From: Paul McQuade <tungstentide@gmail.com>
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 <tungstentide@gmail.com>
---
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);
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] KERNEL: async: Fixed an include coding style issue
2011-06-01 1:32 [PATCH] KERNEL: async: Fixed an include coding style issue Paul McQuade
@ 2011-06-01 1:42 ` Steven Rostedt
2011-06-01 2:12 ` Arjan van de Ven
2011-07-05 12:51 ` [tip:perf/core] " tip-bot for Paul McQuade
1 sibling, 1 reply; 6+ messages in thread
From: Steven Rostedt @ 2011-06-01 1:42 UTC (permalink / raw)
To: Paul McQuade; +Cc: linux-kernel, Frederic Weisbecker, Arjan van de Ven
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 <tungstentide@gmail.com>
> 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 <tungstentide@gmail.com>
> ---
> 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);
> }
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] KERNEL: async: Fixed an include coding style issue
2011-06-01 1:42 ` Steven Rostedt
@ 2011-06-01 2:12 ` Arjan van de Ven
0 siblings, 0 replies; 6+ messages in thread
From: Arjan van de Ven @ 2011-06-01 2:12 UTC (permalink / raw)
To: Steven Rostedt; +Cc: Paul McQuade, linux-kernel, Frederic Weisbecker
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<tungstentide@gmail.com>
>> 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<tungstentide@gmail.com>
Acked-by: Arjan van de Ven <arjan@linux.intel.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [tip:perf/core] async: Fixed an include coding style issue
2011-06-01 1:32 [PATCH] KERNEL: async: Fixed an include coding style issue Paul McQuade
2011-06-01 1:42 ` Steven Rostedt
@ 2011-07-05 12:51 ` tip-bot for Paul McQuade
1 sibling, 0 replies; 6+ messages in thread
From: tip-bot for Paul McQuade @ 2011-07-05 12:51 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, rostedt, arjan, tungstentide, tglx
Commit-ID: 84c15027a7f2fbd7f1180d7cbb60e41abbbaedd2
Gitweb: http://git.kernel.org/tip/84c15027a7f2fbd7f1180d7cbb60e41abbbaedd2
Author: Paul McQuade <tungstentide@gmail.com>
AuthorDate: Tue, 31 May 2011 20:51:55 +0100
Committer: Steven Rostedt <rostedt@goodmis.org>
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.
Acked-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Paul McQuade <tungstentide@gmail.com>
Link: http://lkml.kernel.org/r/4DE596B4.7030904@gmail.com
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
kernel/async.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/kernel/async.c b/kernel/async.c
index cd9dbb9..d5fe7af 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,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);
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-07-05 12:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-01 1:32 [PATCH] KERNEL: async: Fixed an include coding style issue Paul McQuade
2011-06-01 1:42 ` Steven Rostedt
2011-06-01 2:12 ` Arjan van de Ven
2011-07-05 12:51 ` [tip:perf/core] " tip-bot for Paul McQuade
-- strict thread matches above, loose matches on Subject: below --
2011-06-01 0:51 [PATCH] KERNEL: " Paul McQuade
2011-06-01 1:11 ` Steven Rostedt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox