Skip to contentSkip to conversation

serial: s3c: Fix build of header without serial_core.h preinclusion

PATCH New Mark Brown 3 participants 4 messages Mar 18, 2014 – Mar 20, 2014

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm Samsung Exynos
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/2 serial: s3c: Fix build of header without serial_core.h preinclusion

From: Mark Brown <[email protected]>

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 <[email protected]>

---

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(+)
include/linux/serial_s3c.h +2 -0
index 907d9d1d56cf..44e4a6b92ddb 100644
@@ -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)
Signature · 1 line
1.9.0
author
#1 lore raw

PATCH 2/2 ARM: s3c64xx: Fix build for implicit serial_s3c.h inclusion

From: Mark Brown <[email protected]>

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 <[email protected]>
---
 arch/arm/mach-s3c64xx/include/mach/pm-core.h | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/mach-s3c64xx/include/mach/pm-core.h +2 -0
index c0537f40a3d8..a30a1e3ffc6a 100644
@@ -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)
Signature · 1 line
1.9.0
Applied
#2 lore raw

PATCH 2/2 ARM: s3c64xx: Fix build for implicit serial_s3c.h inclusion

Quoted 17 lines · Mark Brown

From: Mark Brown<[email protected]>

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<[email protected]>
---
  arch/arm/mach-s3c64xx/include/mach/pm-core.h | 2 ++
  1 file changed, 2 insertions(+)
arch/arm/mach-s3c64xx/include/mach/pm-core.h +0 -0
index c0537f40a3d8..a30a1e3ffc6a 100644

arch/arm/mach-s3c64xx/include/mach/pm-core.h line 22

Quoted 8 lines
arch/arm/mach-s3c64xx/include/mach/pm-core.h +2 -0
@@ -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

#3 lore raw

PATCH 1/2 serial: s3c: Fix build of header without serial_core.h preinclusion

In reply to Mark Brown

Hi Mark,

Quoted 21 lines · Mark Brown

From: Mark Brown <[email protected]>

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 <[email protected]>

---

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(+)
include/linux/serial_s3c.h +0 -0
index 907d9d1d56cf..44e4a6b92ddb 100644

include/linux/serial_s3c.h line 36

Quoted 8 lines
include/linux/serial_s3c.h +2 -0
@@ -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