Fwd: [PATCH] c6x: kernel: setup: Include "linux/console.h" if both VT and DUMMY_CONSOLE enabled

Fwd: [PATCH] c6x: kernel: setup: Include "linux/console.h" if both VT and DUMMY_CONSOLE enabled

[Chen Gang S]

This patch below is sent from my other email address (762976180@qq.com),
but is rejected by linux-kernel@vger.kernel.org, so I forward it by my
original email address.


Excuse me, I will leave current company soon (sunrus.com.cn), so I have
to change my email address too. At present, gmail in China is still not
stable enough, so I have to use other personal email: 762976180@qq.com.

If linux-kernel mailing list can not accept personal qq email address,
please let me know, I shall try to look for another personal email
addresses.


Thanks.

-------- Forwarded Message --------
Subject: [PATCH] c6x: kernel: setup: Include "linux/console.h" if both VT and DUMMY_CONSOLE enabled
Date: Sun, 01 Mar 2015 15:59:19 +0800
From: Chen Gang <762976180@qq.com>
To: msalter@redhat.com, a-jacquiot@ti.com, robh@kernel.org
CC: linux-c6x-dev@linux-c6x.org <linux-c6x-dev@linux-c6x.org>, linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>

Or c6x will cause building break for allmodconfig, the related error:

    CC      arch/c6x/kernel/setup.o
  arch/c6x/kernel/setup.c: In function 'setup_arch':
  arch/c6x/kernel/setup.c:433:2: error: 'conswitchp' undeclared (first use in this function)
    conswitchp = &dummy_con;
    ^
  arch/c6x/kernel/setup.c:433:2: note: each undeclared identifier is reported only once for each function it appears in
  arch/c6x/kernel/setup.c:433:16: error: 'dummy_con' undeclared (first use in this function)
    conswitchp = &dummy_con;
                  ^

Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
---
 arch/c6x/kernel/setup.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/c6x/kernel/setup.c b/arch/c6x/kernel/setup.c
index 7571288..a5f6e0e 100644
--- a/arch/c6x/kernel/setup.c
+++ b/arch/c6x/kernel/setup.c
@@ -26,7 +26,9 @@
 #include <linux/cpu.h>
 #include <linux/fs.h>
 #include <linux/of.h>
-
+#if defined(CONFIG_VT) && defined(CONFIG_DUMMY_CONSOLE)
+#include <linux/console.h>
+#endif
 
 #include <asm/sections.h>
 #include <asm/div64.h>
-- 
1.9.3

Re: [PATCH] c6x: kernel: setup: Include "linux/console.h" if both VT and DUMMY_CONSOLE enabled

[Mark Salter]

On Sun, 2015-03-01 at 15:59 +0800, Chen Gang wrote:
> Or c6x will cause building break for allmodconfig, the related error:
> 
>     CC      arch/c6x/kernel/setup.o
>   arch/c6x/kernel/setup.c: In function 'setup_arch':
>   arch/c6x/kernel/setup.c:433:2: error: 'conswitchp' undeclared (first use in this function)
>     conswitchp = &dummy_con;
>     ^
>   arch/c6x/kernel/setup.c:433:2: note: each undeclared identifier is reported only once for each function it appears in
>   arch/c6x/kernel/setup.c:433:16: error: 'dummy_con' undeclared (first use in this function)
>     conswitchp = &dummy_con;
>                   ^
> 
> Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
> ---
>  arch/c6x/kernel/setup.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/c6x/kernel/setup.c b/arch/c6x/kernel/setup.c
> index 7571288..a5f6e0e 100644
> --- a/arch/c6x/kernel/setup.c
> +++ b/arch/c6x/kernel/setup.c
> @@ -26,7 +26,9 @@
>  #include <linux/cpu.h>
>  #include <linux/fs.h>
>  #include <linux/of.h>
> -
> +#if defined(CONFIG_VT) && defined(CONFIG_DUMMY_CONSOLE)
> +#include <linux/console.h>
> +#endif

No need for the #ifdefs around the include.
I removed them and pulled this into the c6x tree.

Thanks!

>  
>  #include <asm/sections.h>
>  #include <asm/div64.h>