Skip to contentSkip to conversation

Patch "MIPS: ralink: Fix build error due to missing header" has been added to the 4.12-stable tree

PATCH [email protected] 1 participant 1 message Aug 7, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

MIPS: ralink: Fix build error due to missing header

to the 4.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mips-ralink-fix-build-error-due-to-missing-header.patch
and it can be found in the queue-4.12 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From e3ccf1d1dee5129beb839fe05c61eb134131bdd6 Mon Sep 17 00:00:00 2001

From: Harvey Hunt <[email protected]>
Date: Tue, 18 Jul 2017 14:25:45 +0100
Subject: MIPS: ralink: Fix build error due to missing header
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Harvey Hunt <[email protected]>

commit e3ccf1d1dee5129beb839fe05c61eb134131bdd6 upstream.

Previously, <linux/module.h> was included before ralink_regs.h in all ralink files - leading to <linux/io.h> being implicitly included.

After commit 26dd3e4ff9ac ("MIPS: Audit and remove any unnecessary uses of module.h") removed the inclusion of module.h from multiple places, some ralink platforms failed to build with the following error:

In file included from arch/mips/ralink/mt7620.c:17:0:
./arch/mips/include/asm/mach-ralink/ralink_regs.h: In function ‘rt_sysc_w32’:
./arch/mips/include/asm/mach-ralink/ralink_regs.h:38:2: error: implicit declaration of function ‘__raw_writel’ [-Werror=implicit-function-declaration]
__raw_writel(val, rt_sysc_membase + reg);
^
./arch/mips/include/asm/mach-ralink/ralink_regs.h: In function ‘rt_sysc_r32’:
./arch/mips/include/asm/mach-ralink/ralink_regs.h:43:2: error: implicit declaration of function ‘__raw_readl’ [-Werror=implicit-function-declaration]
return __raw_readl(rt_sysc_membase + reg);

Fix this by including <linux/io.h>.

Fixes 26dd3e4ff9ac ("MIPS: Audit and remove any unnecessary uses of module.h")
Cc John Crispin <[email protected]>

Patchwork: https://patchwork.linux-mips.org/patch/16780/

---
 arch/mips/include/asm/mach-ralink/ralink_regs.h |    2 ++
 1 file changed, 2 insertions(+)
arch/mips/include/asm/mach-ralink/ralink_regs.h +2 -0
@@ -13,6 +13,8 @@
 #ifndef _RALINK_REGS_H_
 #define _RALINK_REGS_H_
 
+#include <linux/io.h>
+
 enum ralink_soc_type {
 	RALINK_UNKNOWN = 0,
 	RT2880_SOC,

Patches currently in stable-queue which might be from [email protected] are

queue-4.12/mips-ralink-fix-build-error-due-to-missing-header.patch