From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: stable@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
patches@lists.linux.dev, Guenter Roeck <linux@roeck-us.net>,
Alexander Sverdlin <alexander.sverdlin@gmail.com>,
Arnd Bergmann <arnd@arndb.de>, Sasha Levin <sashal@kernel.org>
Subject: [PATCH 4.14 2/2] Revert "ARM: ep93xx: fix missing-prototype warnings"
Date: Thu, 31 Aug 2023 13:09:43 +0200 [thread overview]
Message-ID: <20230831110828.673811945@linuxfoundation.org> (raw)
In-Reply-To: <20230831110828.577111137@linuxfoundation.org>
4.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This reverts commit 2e50d55578b05664b11538f0a280541c100caefe which is
commit 419013740ea1e4343d8ade535d999f59fa28e460 upstream.
It breaks the build, so should be reverted.
Reported-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/98dbc981-56fa-4919-afcc-fdf63e0a1c53@roeck-us.net
Cc: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/arm/mach-ep93xx/timer-ep93xx.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- a/arch/arm/mach-ep93xx/timer-ep93xx.c
+++ b/arch/arm/mach-ep93xx/timer-ep93xx.c
@@ -9,7 +9,6 @@
#include <linux/io.h>
#include <asm/mach/time.h>
#include "soc.h"
-#include "platform.h"
/*************************************************************************
* Timer handling for EP93xx
@@ -61,7 +60,7 @@ static u64 notrace ep93xx_read_sched_clo
return ret;
}
-static u64 ep93xx_clocksource_read(struct clocksource *c)
+u64 ep93xx_clocksource_read(struct clocksource *c)
{
u64 ret;
next prev parent reply other threads:[~2023-08-31 11:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-31 11:09 [PATCH 4.14 0/2] 4.14.325-rc1 review Greg Kroah-Hartman
2023-08-31 11:09 ` [PATCH 4.14 1/2] Revert "MIPS: Alchemy: fix dbdma2" Greg Kroah-Hartman
2023-08-31 11:09 ` Greg Kroah-Hartman [this message]
2023-09-01 13:10 ` [PATCH 4.14 0/2] 4.14.325-rc1 review Naresh Kamboju
2023-09-02 4:16 ` Guenter Roeck
2023-09-02 7:28 ` Jon Hunter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230831110828.673811945@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=alexander.sverdlin@gmail.com \
--cc=arnd@arndb.de \
--cc=linux@roeck-us.net \
--cc=patches@lists.linux.dev \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).