* [PATCH 1/2] serial: s3c: Fix build of header without serial_core.h preinclusion
@ 2014-03-18 11:56 ` Mark Brown
0 siblings, 0 replies; 8+ messages in thread
From: Mark Brown @ 2014-03-18 11:56 UTC (permalink / raw)
To: Kukjin Kim, Greg Kroah-Hartman
Cc: linux-arm-kernel, linux-samsung-soc, linaro-kernel, Mark Brown
From: Mark Brown <broonie@linaro.org>
serial_s3c.h uses upf_t which is defined in serial_core.h but does not
include that itself meaning that users which include serial_s3c.h by
itself don't build.
Signed-off-by: Mark Brown <broonie@linaro.org>
---
This is needed together with patch 2 to fix build failures in -next, I
didn't have the time/enthusiasm to isolate the issue.
include/linux/serial_s3c.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/linux/serial_s3c.h b/include/linux/serial_s3c.h
index 907d9d1d56cf..44e4a6b92ddb 100644
--- a/include/linux/serial_s3c.h
+++ b/include/linux/serial_s3c.h
@@ -29,6 +29,8 @@
#ifndef __ASM_ARM_REGS_SERIAL_H
#define __ASM_ARM_REGS_SERIAL_H
+#include <linux/serial_core.h>
+
#define S3C2410_URXH (0x24)
#define S3C2410_UTXH (0x20)
#define S3C2410_ULCON (0x00)
--
1.9.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 1/2] serial: s3c: Fix build of header without serial_core.h preinclusion
@ 2014-03-18 11:56 ` Mark Brown
0 siblings, 0 replies; 8+ messages in thread
From: Mark Brown @ 2014-03-18 11:56 UTC (permalink / raw)
To: linux-arm-kernel
From: Mark Brown <broonie@linaro.org>
serial_s3c.h uses upf_t which is defined in serial_core.h but does not
include that itself meaning that users which include serial_s3c.h by
itself don't build.
Signed-off-by: Mark Brown <broonie@linaro.org>
---
This is needed together with patch 2 to fix build failures in -next, I
didn't have the time/enthusiasm to isolate the issue.
include/linux/serial_s3c.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/linux/serial_s3c.h b/include/linux/serial_s3c.h
index 907d9d1d56cf..44e4a6b92ddb 100644
--- a/include/linux/serial_s3c.h
+++ b/include/linux/serial_s3c.h
@@ -29,6 +29,8 @@
#ifndef __ASM_ARM_REGS_SERIAL_H
#define __ASM_ARM_REGS_SERIAL_H
+#include <linux/serial_core.h>
+
#define S3C2410_URXH (0x24)
#define S3C2410_UTXH (0x20)
#define S3C2410_ULCON (0x00)
--
1.9.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] ARM: s3c64xx: Fix build for implicit serial_s3c.h inclusion
2014-03-18 11:56 ` Mark Brown
@ 2014-03-18 11:56 ` Mark Brown
-1 siblings, 0 replies; 8+ messages in thread
From: Mark Brown @ 2014-03-18 11:56 UTC (permalink / raw)
To: Kukjin Kim, Greg Kroah-Hartman
Cc: linux-arm-kernel, linux-samsung-soc, linaro-kernel, Mark Brown
From: Mark Brown <broonie@linaro.org>
Some very recent change appears to have removed an implicit inclusion of
serial_s3c.h causing build failures due to references to UART registers
in the serial port restore code in next-20140318. Include it explicitly
to fix the build.
Signed-off-by: Mark Brown <broonie@linaro.org>
---
arch/arm/mach-s3c64xx/include/mach/pm-core.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/mach-s3c64xx/include/mach/pm-core.h b/arch/arm/mach-s3c64xx/include/mach/pm-core.h
index c0537f40a3d8..a30a1e3ffc6a 100644
--- a/arch/arm/mach-s3c64xx/include/mach/pm-core.h
+++ b/arch/arm/mach-s3c64xx/include/mach/pm-core.h
@@ -15,6 +15,8 @@
#ifndef __MACH_S3C64XX_PM_CORE_H
#define __MACH_S3C64XX_PM_CORE_H __FILE__
+#include <linux/serial_s3c.h>
+
#include <mach/regs-gpio.h>
static inline void s3c_pm_debug_init_uart(void)
--
1.9.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] ARM: s3c64xx: Fix build for implicit serial_s3c.h inclusion
@ 2014-03-18 11:56 ` Mark Brown
0 siblings, 0 replies; 8+ messages in thread
From: Mark Brown @ 2014-03-18 11:56 UTC (permalink / raw)
To: linux-arm-kernel
From: Mark Brown <broonie@linaro.org>
Some very recent change appears to have removed an implicit inclusion of
serial_s3c.h causing build failures due to references to UART registers
in the serial port restore code in next-20140318. Include it explicitly
to fix the build.
Signed-off-by: Mark Brown <broonie@linaro.org>
---
arch/arm/mach-s3c64xx/include/mach/pm-core.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/mach-s3c64xx/include/mach/pm-core.h b/arch/arm/mach-s3c64xx/include/mach/pm-core.h
index c0537f40a3d8..a30a1e3ffc6a 100644
--- a/arch/arm/mach-s3c64xx/include/mach/pm-core.h
+++ b/arch/arm/mach-s3c64xx/include/mach/pm-core.h
@@ -15,6 +15,8 @@
#ifndef __MACH_S3C64XX_PM_CORE_H
#define __MACH_S3C64XX_PM_CORE_H __FILE__
+#include <linux/serial_s3c.h>
+
#include <mach/regs-gpio.h>
static inline void s3c_pm_debug_init_uart(void)
--
1.9.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] ARM: s3c64xx: Fix build for implicit serial_s3c.h inclusion
2014-03-18 11:56 ` Mark Brown
@ 2014-03-20 17:56 ` Kukjin Kim
-1 siblings, 0 replies; 8+ messages in thread
From: Kukjin Kim @ 2014-03-20 17:56 UTC (permalink / raw)
To: Mark Brown
Cc: Kukjin Kim, Greg Kroah-Hartman, linux-samsung-soc, linaro-kernel,
linux-arm-kernel, Mark Brown, Tomasz Figa
On 03/18/14 20:56, Mark Brown wrote:
> From: Mark Brown<broonie@linaro.org>
>
> Some very recent change appears to have removed an implicit inclusion of
> serial_s3c.h causing build failures due to references to UART registers
> in the serial port restore code in next-20140318. Include it explicitly
> to fix the build.
>
> Signed-off-by: Mark Brown<broonie@linaro.org>
> ---
> arch/arm/mach-s3c64xx/include/mach/pm-core.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/arm/mach-s3c64xx/include/mach/pm-core.h b/arch/arm/mach-s3c64xx/include/mach/pm-core.h
> index c0537f40a3d8..a30a1e3ffc6a 100644
> --- a/arch/arm/mach-s3c64xx/include/mach/pm-core.h
> +++ b/arch/arm/mach-s3c64xx/include/mach/pm-core.h
> @@ -15,6 +15,8 @@
> #ifndef __MACH_S3C64XX_PM_CORE_H
> #define __MACH_S3C64XX_PM_CORE_H __FILE__
>
> +#include<linux/serial_s3c.h>
> +
> #include<mach/regs-gpio.h>
>
> static inline void s3c_pm_debug_init_uart(void)
Applied, thanks.
- Kukjin
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/2] ARM: s3c64xx: Fix build for implicit serial_s3c.h inclusion
@ 2014-03-20 17:56 ` Kukjin Kim
0 siblings, 0 replies; 8+ messages in thread
From: Kukjin Kim @ 2014-03-20 17:56 UTC (permalink / raw)
To: linux-arm-kernel
On 03/18/14 20:56, Mark Brown wrote:
> From: Mark Brown<broonie@linaro.org>
>
> Some very recent change appears to have removed an implicit inclusion of
> serial_s3c.h causing build failures due to references to UART registers
> in the serial port restore code in next-20140318. Include it explicitly
> to fix the build.
>
> Signed-off-by: Mark Brown<broonie@linaro.org>
> ---
> arch/arm/mach-s3c64xx/include/mach/pm-core.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/arm/mach-s3c64xx/include/mach/pm-core.h b/arch/arm/mach-s3c64xx/include/mach/pm-core.h
> index c0537f40a3d8..a30a1e3ffc6a 100644
> --- a/arch/arm/mach-s3c64xx/include/mach/pm-core.h
> +++ b/arch/arm/mach-s3c64xx/include/mach/pm-core.h
> @@ -15,6 +15,8 @@
> #ifndef __MACH_S3C64XX_PM_CORE_H
> #define __MACH_S3C64XX_PM_CORE_H __FILE__
>
> +#include<linux/serial_s3c.h>
> +
> #include<mach/regs-gpio.h>
>
> static inline void s3c_pm_debug_init_uart(void)
Applied, thanks.
- Kukjin
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] serial: s3c: Fix build of header without serial_core.h preinclusion
2014-03-18 11:56 ` Mark Brown
@ 2014-03-18 17:30 ` Tomasz Figa
-1 siblings, 0 replies; 8+ messages in thread
From: Tomasz Figa @ 2014-03-18 17:30 UTC (permalink / raw)
To: Mark Brown, Kukjin Kim, Greg Kroah-Hartman
Cc: linux-arm-kernel, linux-samsung-soc, linaro-kernel, Mark Brown
Hi Mark,
On 18.03.2014 12:56, Mark Brown wrote:
> From: Mark Brown <broonie@linaro.org>
>
> serial_s3c.h uses upf_t which is defined in serial_core.h but does not
> include that itself meaning that users which include serial_s3c.h by
> itself don't build.
>
> Signed-off-by: Mark Brown <broonie@linaro.org>
> ---
>
> This is needed together with patch 2 to fix build failures in -next, I
> didn't have the time/enthusiasm to isolate the issue.
>
> include/linux/serial_s3c.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/include/linux/serial_s3c.h b/include/linux/serial_s3c.h
> index 907d9d1d56cf..44e4a6b92ddb 100644
> --- a/include/linux/serial_s3c.h
> +++ b/include/linux/serial_s3c.h
> @@ -29,6 +29,8 @@
> #ifndef __ASM_ARM_REGS_SERIAL_H
> #define __ASM_ARM_REGS_SERIAL_H
>
> +#include <linux/serial_core.h>
> +
> #define S3C2410_URXH (0x24)
> #define S3C2410_UTXH (0x20)
> #define S3C2410_ULCON (0x00)
>
Thanks for fixing this up. However due to this header ending up being
included by arch/arm/kernel/debug.S, this breaks mach-exynos. I have
fixed this up by moving the inclusion down the file, under #ifndef
__ASSEMBLY__ and posted next version along with other fixups.
Best regards,
Tomasz
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] serial: s3c: Fix build of header without serial_core.h preinclusion
@ 2014-03-18 17:30 ` Tomasz Figa
0 siblings, 0 replies; 8+ messages in thread
From: Tomasz Figa @ 2014-03-18 17:30 UTC (permalink / raw)
To: linux-arm-kernel
Hi Mark,
On 18.03.2014 12:56, Mark Brown wrote:
> From: Mark Brown <broonie@linaro.org>
>
> serial_s3c.h uses upf_t which is defined in serial_core.h but does not
> include that itself meaning that users which include serial_s3c.h by
> itself don't build.
>
> Signed-off-by: Mark Brown <broonie@linaro.org>
> ---
>
> This is needed together with patch 2 to fix build failures in -next, I
> didn't have the time/enthusiasm to isolate the issue.
>
> include/linux/serial_s3c.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/include/linux/serial_s3c.h b/include/linux/serial_s3c.h
> index 907d9d1d56cf..44e4a6b92ddb 100644
> --- a/include/linux/serial_s3c.h
> +++ b/include/linux/serial_s3c.h
> @@ -29,6 +29,8 @@
> #ifndef __ASM_ARM_REGS_SERIAL_H
> #define __ASM_ARM_REGS_SERIAL_H
>
> +#include <linux/serial_core.h>
> +
> #define S3C2410_URXH (0x24)
> #define S3C2410_UTXH (0x20)
> #define S3C2410_ULCON (0x00)
>
Thanks for fixing this up. However due to this header ending up being
included by arch/arm/kernel/debug.S, this breaks mach-exynos. I have
fixed this up by moving the inclusion down the file, under #ifndef
__ASSEMBLY__ and posted next version along with other fixups.
Best regards,
Tomasz
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-03-20 17:56 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-18 11:56 [PATCH 1/2] serial: s3c: Fix build of header without serial_core.h preinclusion Mark Brown
2014-03-18 11:56 ` Mark Brown
2014-03-18 11:56 ` [PATCH 2/2] ARM: s3c64xx: Fix build for implicit serial_s3c.h inclusion Mark Brown
2014-03-18 11:56 ` Mark Brown
2014-03-20 17:56 ` Kukjin Kim
2014-03-20 17:56 ` Kukjin Kim
2014-03-18 17:30 ` [PATCH 1/2] serial: s3c: Fix build of header without serial_core.h preinclusion Tomasz Figa
2014-03-18 17:30 ` Tomasz Figa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.