[PATCH] fastboot: fix mismerged conflict in init/main.c

[PATCH] fastboot: fix mismerged conflict in init/main.c

[Arjan van de Ven]

From: Arjan van de Ven <arjan@linux.intel.com>
Subject: [PATCH] fastboot: fix mismerged conflict in init/main.c

a merge conflict via the -tip tree has resulted in a not-quite-right
piece of code; this patch fixes this up by consolidating things
into a single printk (and do this for both the entry and exit paths)

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
---
 init/main.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/init/main.c b/init/main.c
index b156c61..e50657c 100644
--- a/init/main.c
+++ b/init/main.c
@@ -726,8 +726,7 @@ int do_one_initcall(initcall_t fn)
 	int result;
 
 	if (initcall_debug) {
-		printk("calling  %pF\n", fn);
-		printk(" @ %i\n",  task_pid_nr(current));
+		printk("calling  %pF @ %i\n", fn, task_pid_nr(current));
 		t0 = ktime_get();
 	}
 
@@ -737,9 +736,8 @@ int do_one_initcall(initcall_t fn)
 		t1 = ktime_get();
 		delta = ktime_sub(t1, t0);
 
-		print_fn_descriptor_symbol("initcall %s", fn);
-		printk(" returned %d after %Ld msecs\n", result,
-			(unsigned long long) delta.tv64 >> 20);
+		printk("initcall %pF returned %d after %Ld msecs\n", fn,
+			result, (unsigned long long) delta.tv64 >> 20);
 	}
 
 	msgbuf[0] = 0;
-- 
1.5.5.1


-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org

Re: [PATCH] fastboot: fix mismerged conflict in init/main.c

[Arjan van de Ven]

On Fri, 19 Sep 2008 19:42:15 -0700
Arjan van de Ven <arjan@infradead.org> wrote:

> 
> 
> From: Arjan van de Ven <arjan@linux.intel.com>
> Subject: [PATCH] fastboot: fix mismerged conflict in init/main.c

ok turns out it was a real conflict, not a mismerge. I've just fixed it
and pushed out my git tree.

The following changes since commit
77e9695b9d5c9ce761dedc193045d9cb64b8e245: Arjan van de Ven (1):
        Add a script to visualize the kernel boot process / time

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-fastboot.git
master

Arjan van de Ven (2):
      fastboot: fix issues and improve output of bootgraph.pl
      use the fancy new printk flags to print the function pointer

Arnaud Patard (1):
      fastboot: Fix bootgraph.pl initcall name regexp

 init/main.c          |    8 +++-----
 scripts/bootgraph.pl |   33 +++++++++++++++++++++------------
 2 files changed, 24 insertions(+), 17 deletions(-)

-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org

Re: [PATCH] fastboot: fix mismerged conflict in init/main.c

[Ingo Molnar]

* Arjan van de Ven <arjan@infradead.org> wrote:

> > From: Arjan van de Ven <arjan@linux.intel.com>
> > Subject: [PATCH] fastboot: fix mismerged conflict in init/main.c
> 
> ok turns out it was a real conflict, not a mismerge. I've just fixed it
> and pushed out my git tree.
> 
> The following changes since commit
> 77e9695b9d5c9ce761dedc193045d9cb64b8e245: Arjan van de Ven (1):
>         Add a script to visualize the kernel boot process / time
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-fastboot.git
> master
> 
> Arjan van de Ven (2):
>       fastboot: fix issues and improve output of bootgraph.pl
>       use the fancy new printk flags to print the function pointer
> 
> Arnaud Patard (1):
>       fastboot: Fix bootgraph.pl initcall name regexp
> 
>  init/main.c          |    8 +++-----
>  scripts/bootgraph.pl |   33 +++++++++++++++++++++------------
>  2 files changed, 24 insertions(+), 17 deletions(-)

pulled into tip/fastboot, thanks Arjan!

	Ingo