diff mbox

[Xen-devel,v3,0/5] xen/arm: Merge early_printk function in console code

Message ID 53232380.2010503@linaro.org
State Accepted, archived
Headers show

Commit Message

Julien Grall March 14, 2014, 3:42 p.m. UTC 
Hi Ian,

On 03/14/2014 02:42 PM, Ian Campbell wrote:
> On Wed, 2014-03-12 at 14:34 +0000, Julien Grall wrote:
>> Hello all,
>>
>> This patch series aims to merge early printk in the console code. This will
>> avoid the developper to care whether the message is printed before or after
>> the console is initialized.
>>
>> Sincerely yours,
>>
>> Julien Grall (5):
>>   xen/arm: earlyprintk: move early_flush in early_puts
>>   xen/arm: earlyprintk: export early_puts
>>   xen/arm: Rename EARLY_PRINTK compile option to CONFIG_EARLY_PRINTK
> 
> Something in these three (I think) causes:
> In file included from device_tree.c:26:0:
> /local/scratch/ianc/devel/committer.git/xen/include/asm/early_printk.h: In function ‘early_puts’:
> /local/scratch/ianc/devel/committer.git/xen/include/asm/early_printk.h:35:1: error: parameter name omitted
> make[4]: *** [device_tree.o] Error 1
> make[4]: *** Waiting for unfinished jobs....

Patch #2 is wrong, I forgot to give a name for the paremater of
early_puts. The patch should be:
diff mbox

Patch

diff --git a/xen/arch/arm/early_printk.c b/xen/arch/arm/early_printk.c
index b59ea2e..6b90998 100644
--- a/xen/arch/arm/early_printk.c
+++ b/xen/arch/arm/early_printk.c
@@ -21,7 +21,7 @@  void early_flush(void);
 /* Early printk buffer */
 static char __initdata buf[512];

-static void __init early_puts(const char *s)
+void early_puts(const char *s)
 {
     while (*s != '\0') {
         if (*s == '\n')
diff --git a/xen/include/asm-arm/early_printk.h
b/xen/include/asm-arm/early_printk.h
index 8047141..1b0fbdf 100644
--- a/xen/include/asm-arm/early_printk.h
+++ b/xen/include/asm-arm/early_printk.h
@@ -24,6 +24,7 @@ 

 #ifdef EARLY_PRINTK

+void early_puts(const char *s);
 void early_printk(const char *fmt, ...)
     __attribute__((format (printf, 1, 2)));
 void noreturn early_panic(const char *fmt, ...)
@@ -31,6 +32,8 @@  void noreturn early_panic(const char *fmt, ...)

 #else

+static inline void early_puts(const char *s) {}
+
 static inline  __attribute__((format (printf, 1, 2))) void
 early_printk(const char *fmt, ...)
 {}