samsung-s3ve3g: fix signature mismatch for msm_pm_boot_init (MR 3248)

This previously caused msm_pm_boot_init to incorrectly get handled as
__init function when it needs to be an __devinit function as it is
called by msm_pm_boot_probe, which is an __devinit function.

[ci:skip-build]: already built successfully in CI
This commit is contained in:
bjorn3 2022-06-22 13:10:29 +02:00 committed by Oliver Smith
parent c7dd25cb51
commit 6712fc6922
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 35 additions and 2 deletions

View file

@ -0,0 +1,31 @@
From 8722cd082aff5d3afae4ea7f7d631dd76d616aff Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Wed, 22 Jun 2022 13:01:01 +0200
Subject: [PATCH] Fix signature mismatch for msm_pm_boot_init
This previously caused msm_pm_boot_init to incorrectly get handled as
__init function when it needs to be an __devinit function as it is
called by msm_pm_boot_probe, which is an __devinit function.
---
arch/arm/mach-msm/pm-boot.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-msm/pm-boot.h b/arch/arm/mach-msm/pm-boot.h
index 2d5110d306..8b5f69e423 100644
--- a/arch/arm/mach-msm/pm-boot.h
+++ b/arch/arm/mach-msm/pm-boot.h
@@ -31,9 +31,9 @@ struct msm_pm_boot_platform_data {
};
#ifdef CONFIG_PM
-int __init msm_pm_boot_init(struct msm_pm_boot_platform_data *pdata);
+int __devinit msm_pm_boot_init(struct msm_pm_boot_platform_data *pdata);
#else
-static inline int __init msm_pm_boot_init(
+static inline int __devinit msm_pm_boot_init(
struct msm_pm_boot_platform_data *pdata)
{
return 0;
--
2.26.2.7.g19db9cfb68

View file

@ -3,7 +3,7 @@
pkgname=linux-samsung-s3ve3g
pkgver=3.4.113
pkgrel=5
pkgrel=6
pkgdesc="Samsung Galaxy S III Neo kernel fork"
arch="armv7"
_carch="arm"
@ -29,6 +29,7 @@ source="
0003-fix-video-argb-setting.patch
0004-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch
0005-alternative-patch-to-fix-refresh-rate.patch
0006-Fix-signature-mismatch-for-msm_pm_boot_init.patch
"
builddir="$srcdir/$_repository-$_commit"
_outdir="out"
@ -62,4 +63,5 @@ ad0182a483791fc88e058838bc331b2f04a75ba291e763767babdb815efadfc3b4fda97e69e2e3f0
99710981a40c5ce465fc6de9c438349224c52a4175a0bcbec95bd4d860a44abfa0d59151e94b85a40f049aadff66cb02b74ea84c51424ec5b19b76b17edb5b20 0002-always-reserve-framebuffer-memory.patch
ff4ebae2d4e9d3c78849d9f00879d91a4d554ae68eebe9853388154686f9bd48de1c68e586c855204e6bff61972d2fbc77c5b1c9c6f9ff66e101bc2d04cb5e29 0003-fix-video-argb-setting.patch
9b7fc59035714badcecb5138da4b58d2bda5b8260a04cbad9e1baa57ec6cdebfeea1752744e551a2341e164da78c119564892b43c823aded2f50f2417bbc47ce 0004-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch
2f8305cd137e5fbc888d3c81201976ae2819275715dde8ee6f63845a0d36021566af8e78ab765e084b6def1bb10cfc4dde1714a472ea4fab8a9c95e7bee9e2c5 0005-alternative-patch-to-fix-refresh-rate.patch"
2f8305cd137e5fbc888d3c81201976ae2819275715dde8ee6f63845a0d36021566af8e78ab765e084b6def1bb10cfc4dde1714a472ea4fab8a9c95e7bee9e2c5 0005-alternative-patch-to-fix-refresh-rate.patch
25217ec622dbcb811c9a7375c6e360f313e58c8433a300c9a9afd3f17712ec0d322e16501c72c49fef9e38a2d3a69718401bf4269977fccd075a4a57d8458c5d 0006-Fix-signature-mismatch-for-msm_pm_boot_init.patch"