Messages in this thread Patch in this message | | | From | Mark Brown <> | Subject | Applied "regmap: include <linux/ktime.h> from include/linux/regmap.h" to the regmap tree | Date | Tue, 24 Apr 2018 18:46:14 +0100 |
| |
The patch
regmap: include <linux/ktime.h> from include/linux/regmap.h
has been applied to the regmap tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
From f15cd6d99198e9c15229aefec639a34a6e8174c6 Mon Sep 17 00:00:00 2001 From: Sean Wang <sean.wang@mediatek.com> Date: Mon, 23 Apr 2018 14:42:44 +0800 Subject: [PATCH] regmap: include <linux/ktime.h> from include/linux/regmap.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
Similar to the readx_poll_timeout() macro calling ktime_* and using ktime_t type, which is declared in <linux/ktime.h>. So, make include/linux/regmap.h explicitly include <linux/ktime.h>, like include/linux/iopoll.h does. Otherwise, users of the macro will see below errors.
error: implicit declaration of function âktime_add_usâ [-Werror=implicit-function-declaration]
error: implicit declaration of function âktime_getâ [-Werror=implicit-function-declaration]
error: implicit declaration of function âktime_compareâ [-Werror=implicit-function-declaration]
include/linux/regmap.h:128:2: error: unknown type name âktime_tâ ktime_t __timeout = ktime_add_us(ktime_get(), __timeout_us); \
Signed-off-by: Sean Wang <sean.wang@mediatek.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- include/linux/regmap.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 5f7ad0552c03..b6865f070464 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -15,6 +15,7 @@ #include <linux/list.h> #include <linux/rbtree.h> +#include <linux/ktime.h> #include <linux/delay.h> #include <linux/err.h> #include <linux/bug.h> -- 2.17.0
| |