linux-next: build failure after merge of the pm tree

linux-next: build failure after merge of the pm tree

[Mark Brown]

Hi Rafael,

After merging the pm tree, today's linux-next build (arm64 defconfig)
failed like this:

drivers/acpi/ec.o: In function `acpi_ec_dispatch_gpe':
/home/broonie/next/next/drivers/acpi/ec.c:1040: undefined reference to `acpi_dispatch_gpe'
/home/broonie/next/next/drivers/acpi/ec.c:1040:(.text+0x228c): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `acpi_dispatch_gpe'

Probably caused by commit

  8f81c457105b5d4 ("ACPI: EC: Dispatch the EC GPE directly on s2idle wake")

(though the symbol appears to be there and like it should be built and
the relocation warning looks funky...).  I've used the PM tree from the
last -next.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20180524/fcc5a5bf/attachment.sig>

linux-next: build failure after merge of the pm tree

[Stephen Rothwell]

Hi Rafael,

After merging the pm tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

arch/arm/mach-mediatek/mediatek.c: In function 'mediatek_timer_init':
arch/arm/mach-mediatek/mediatek.c:43:2: error: implicit declaration of function 'clocksource_of_init' [-Werror=implicit-function-declaration]
  clocksource_of_init();
  ^

Caused by commit

  3722ed2380ad ("clocksource: cosmetic: Drop OF 'dependency' from symbols")

interacting with commit

  9821e545c5e0 ("ARM: mediatek: enable gpt6 on boot up to make arch timer working")

from the arm-soc tree.

I applied the following merge fix patch for today (someone should tell
Linus when theese trees are merged):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 1 Nov 2015 17:52:26 +1100
Subject: [PATCH] ARM: mediatek: fixup for clocksource_of_init API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/arm/mach-mediatek/mediatek.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-mediatek/mediatek.c b/arch/arm/mach-mediatek/mediatek.c
index 19dc738c1abc..c88a47a3dc37 100644
--- a/arch/arm/mach-mediatek/mediatek.c
+++ b/arch/arm/mach-mediatek/mediatek.c
@@ -40,7 +40,7 @@ static void __init mediatek_timer_init(void)
 	}
 
 	of_clk_init(NULL);
-	clocksource_of_init();
+	clocksource_probe();
 };
 
 static const char * const mediatek_board_dt_compat[] = {
-- 
2.6.1

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

linux-next: build failure after merge of the pm tree

[Rafael J. Wysocki]

On Sunday, November 01, 2015 05:57:18 PM Stephen Rothwell wrote:
> Hi Rafael,

Hi,

Thanks for the patch!

> After merging the pm tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> arch/arm/mach-mediatek/mediatek.c: In function 'mediatek_timer_init':
> arch/arm/mach-mediatek/mediatek.c:43:2: error: implicit declaration of function 'clocksource_of_init' [-Werror=implicit-function-declaration]
>   clocksource_of_init();
>   ^
> 
> Caused by commit
> 
>   3722ed2380ad ("clocksource: cosmetic: Drop OF 'dependency' from symbols")
> 
> interacting with commit
> 
>   9821e545c5e0 ("ARM: mediatek: enable gpt6 on boot up to make arch timer working")
> 
> from the arm-soc tree.
> 
> I applied the following merge fix patch for today (someone should tell
> Linus when theese trees are merged):

I'll do that.

Thanks,
Rafael