Apologize for the duplicated message,
in my previous email I mistyped Ingo's email address.
------>
Further codying style fixes on top of:
http://marc.info/?l=linux-kernel&m=119940325306693&w=2
Checkpatch before the patch:
total: 3 errors, 13 warnings, 602 lines checked
Checkpatch after the patch:
total: 0 errors, 1 warnings, 601 lines checked
1 Warning is still not killed:
WARNING: externs should be avoided in .c files
#509: FILE: profile.c:509:
+ extern int setup_profiling_timer(unsigned int multiplier);
I don't know how to fix it :-/
Compile tested.
Signed-off-by: Paolo Ciarrocchi <[email protected]>
---
Dunno whether the size change means that the patch is doing
something wrong but here it is the report, before and after
the patch:
paolo@paolo-desktop:/tmp$ size profile.o
text data bss dec hex filename
3718 144 12 3874 f22 profile.o
paolo@paolo-desktop:/tmp$ size profile.o.after
text data bss dec hex filename
3693 144 12 3849 f09 profile.o.after
kernel/profile.c | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/kernel/profile.c b/kernel/profile.c
index c99153b..9a1c4b4 100644
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@ -125,7 +125,7 @@ void profile_task_exit(struct task_struct *task)
blocking_notifier_call_chain(&task_exit_notifier, 0, task);
}
-int profile_handoff_task(struct task_struct * task)
+int profile_handoff_task(struct task_struct *task)
{
int ret;
ret = atomic_notifier_call_chain(&task_free_notifier, 0, task);
@@ -141,11 +141,13 @@ int task_handoff_register(struct notifier_block *n)
{
return atomic_notifier_chain_register(&task_free_notifier, n);
}
+EXPORT_SYMBOL_GPL(task_handoff_register);
int task_handoff_unregister(struct notifier_block *n)
{
return atomic_notifier_chain_unregister(&task_free_notifier, n);
}
+EXPORT_SYMBOL_GPL(task_handoff_unregister);
int profile_event_register(enum profile_type type, struct notifier_block *n)
{
@@ -164,7 +166,7 @@ int profile_event_register(enum profile_type type, struct notifier_block *n)
return err;
}
-
+EXPORT_SYMBOL_GPL(profile_event_register);
int profile_event_unregister(enum profile_type type, struct notifier_block *n)
{
@@ -183,6 +185,7 @@ int profile_event_unregister(enum profile_type type, struct notifier_block *n)
return err;
}
+EXPORT_SYMBOL_GPL(profile_event_unregister);
int register_timer_hook(int (*hook)(struct pt_regs *))
{
@@ -191,6 +194,7 @@ int register_timer_hook(int (*hook)(struct pt_regs *))
timer_hook = hook;
return 0;
}
+EXPORT_SYMBOL_GPL(register_timer_hook);
void unregister_timer_hook(int (*hook)(struct pt_regs *))
{
@@ -199,13 +203,7 @@ void unregister_timer_hook(int (*hook)(struct pt_regs *))
/* make sure all CPUs see the NULL hook */
synchronize_sched(); /* Allow ongoing interrupts to complete. */
}
-
-EXPORT_SYMBOL_GPL(register_timer_hook);
EXPORT_SYMBOL_GPL(unregister_timer_hook);
-EXPORT_SYMBOL_GPL(task_handoff_register);
-EXPORT_SYMBOL_GPL(task_handoff_unregister);
-EXPORT_SYMBOL_GPL(profile_event_register);
-EXPORT_SYMBOL_GPL(profile_event_unregister);
#endif /* CONFIG_PROFILING */
@@ -366,7 +364,7 @@ static int __devinit profile_cpu_callback(struct notifier_block *info,
per_cpu(cpu_profile_hits, cpu)[0] = page_address(page);
}
break;
- out_free:
+out_free:
page = virt_to_page(per_cpu(cpu_profile_hits, cpu)[1]);
per_cpu(cpu_profile_hits, cpu)[1] = NULL;
__free_page(page);
@@ -408,9 +406,8 @@ void profile_hits(int type, void *__pc, unsigned int nr_hits)
pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
}
-#endif /* !CONFIG_SMP */
-
EXPORT_SYMBOL_GPL(profile_hits);
+#endif /* !CONFIG_SMP */
void profile_tick(int type)
{
@@ -427,7 +424,7 @@ void profile_tick(int type)
#include <asm/uaccess.h>
#include <asm/ptrace.h>
-static int prof_cpu_mask_read_proc (char *page, char **start, off_t off,
+static int prof_cpu_mask_read_proc(char *page, char **start, off_t off,
int count, int *eof, void *data)
{
int len = cpumask_scnprintf(page, count, *(cpumask_t *)data);
@@ -437,8 +434,8 @@ static int prof_cpu_mask_read_proc (char *page, char **start, off_t off,
return len;
}
-static int prof_cpu_mask_write_proc (struct file *file, const char __user *buffer,
- unsigned long count, void *data)
+static int prof_cpu_mask_write_proc(struct file *file,
+ const char __user *buffer, unsigned long count, void *data)
{
cpumask_t *mask = (cpumask_t *)data;
unsigned long full_count = count, err;
@@ -457,7 +454,8 @@ void create_prof_cpu_mask(struct proc_dir_entry *root_irq_dir)
struct proc_dir_entry *entry;
/* create /proc/irq/prof_cpu_mask */
- if (!(entry = create_proc_entry("prof_cpu_mask", 0600, root_irq_dir)))
+ entry = create_proc_entry("prof_cpu_mask", 0600, root_irq_dir);
+ if (!entry)
return;
entry->data = (void *)&prof_cpu_mask;
entry->read_proc = prof_cpu_mask_read_proc;
@@ -508,7 +506,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
size_t count, loff_t *ppos)
{
#ifdef CONFIG_SMP
- extern int setup_profiling_timer (unsigned int multiplier);
+ extern int setup_profiling_timer(unsigned int multiplier);
if (count == sizeof(int)) {
unsigned int multiplier;
@@ -591,7 +589,8 @@ static int __init create_proc_profile(void)
return 0;
if (create_hash_tables())
return -1;
- if (!(entry = create_proc_entry("profile", S_IWUSR | S_IRUGO, NULL)))
+ entry = create_proc_entry("profile", S_IWUSR | S_IRUGO, NULL);
+ if (!entry)
return 0;
entry->proc_fops = &proc_profile_operations;
entry->size = (1+prof_len) * sizeof(atomic_t);
--
1.5.4.rc2.17.g257f
* Paolo Ciarrocchi <[email protected]> wrote:
> Further codying style fixes on top of:
> http://marc.info/?l=linux-kernel&m=119940325306693&w=2
thanks, applied.
> 1 Warning is still not killed:
> WARNING: externs should be avoided in .c files
> #509: FILE: profile.c:509:
> + extern int setup_profiling_timer(unsigned int multiplier);
>
> I don't know how to fix it :-/
simply move that line to include/linux/profile.h. (no need to preserve
the CONFIG_SMP - on !SMP the function prototype line will not be used)
Ingo
On Jan 6, 2008 11:25 AM, Ingo Molnar <[email protected]> wrote:
>
> * Paolo Ciarrocchi <[email protected]> wrote:
>
> > Further codying style fixes on top of:
> > http://marc.info/?l=linux-kernel&m=119940325306693&w=2
>
> thanks, applied.
Hi Ingo,
I posted a new version of that patch:
http://lkml.org/lkml/2008/1/4/197
It's in your inbox with subject:
[PATCH] profile: further Codying Style fixes, take 2
The patch you applied was changing the funtionality in case of
non-SMP build.
This was reported by Sam Ravnborg , see:
http://linux.derkeiler.com/Mailing-Lists/Kernel/2008-01/msg01383.html
Can you please apply the new patch?
> > 1 Warning is still not killed:
> > WARNING: externs should be avoided in .c files
> > #509: FILE: profile.c:509:
> > + extern int setup_profiling_timer(unsigned int multiplier);
> >
> > I don't know how to fix it :-/
>
> simply move that line to include/linux/profile.h. (no need to preserve
> the CONFIG_SMP - on !SMP the function prototype line will not be used)
Thanks.
Ciao,
--
Paolo
http://paolo.ciarrocchi.googlepages.com/
* Paolo Ciarrocchi <[email protected]> wrote:
> Hi Ingo,
> I posted a new version of that patch:
> http://lkml.org/lkml/2008/1/4/197
> It's in your inbox with subject:
> [PATCH] profile: further Codying Style fixes, take 2
ok, picked it up.
Ingo