[PATCH] qcom-scm: Include <linux/err.h> header

[PATCH] qcom-scm: Include <linux/err.h> header

[Fabio Estevam]

Since commit e6f6d63ed14c ("drm/msm: add headless gpu device for imx5")
the DRM_MSM symbol can be selected by SOC_IMX5 causing the following
error when building imx_v6_v7_defconfig:

In file included from ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:17:0:
../include/linux/qcom_scm.h: In function 'qcom_scm_set_cold_boot_addr':
../include/linux/qcom_scm.h:73:10: error: 'ENODEV' undeclared (first use in this function)
  return -ENODEV;

Include the <linux/err.h> header file to fix this problem.

Reported-by: kernelci.org bot <bot@kernelci.org>
Fixes: e6f6d63ed14c ("drm/msm: add headless gpu device for imx5")
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
 include/linux/qcom_scm.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/linux/qcom_scm.h b/include/linux/qcom_scm.h
index 06996ad4f2bc..ce5a476fd733 100644
--- a/include/linux/qcom_scm.h
+++ b/include/linux/qcom_scm.h
@@ -13,6 +13,7 @@
 #ifndef __QCOM_SCM_H
 #define __QCOM_SCM_H
 
+#include <linux/err.h>
 #include <linux/types.h>
 #include <linux/cpumask.h>
 
-- 
2.17.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] qcom-scm: Include <linux/err.h> header

[Bjorn Andersson]

On Wed 26 Dec 04:06 PST 2018, Fabio Estevam wrote:

> Since commit e6f6d63ed14c ("drm/msm: add headless gpu device for imx5")
> the DRM_MSM symbol can be selected by SOC_IMX5 causing the following
> error when building imx_v6_v7_defconfig:
> 
> In file included from ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:17:0:
> ../include/linux/qcom_scm.h: In function 'qcom_scm_set_cold_boot_addr':
> ../include/linux/qcom_scm.h:73:10: error: 'ENODEV' undeclared (first use in this function)
>   return -ENODEV;
> 
> Include the <linux/err.h> header file to fix this problem.
> 

Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>

Andy, please pick up for inclusion in -rc

Fabio, please use get_maintainers, so your patches hits the appropriate
mailing lists (linux-arm-msm@ in this case)

Regards,
Bjorn

> Reported-by: kernelci.org bot <bot@kernelci.org>
> Fixes: e6f6d63ed14c ("drm/msm: add headless gpu device for imx5")
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
> ---
>  include/linux/qcom_scm.h | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/include/linux/qcom_scm.h b/include/linux/qcom_scm.h
> index 06996ad4f2bc..ce5a476fd733 100644
> --- a/include/linux/qcom_scm.h
> +++ b/include/linux/qcom_scm.h
> @@ -13,6 +13,7 @@
>  #ifndef __QCOM_SCM_H
>  #define __QCOM_SCM_H
>  
> +#include <linux/err.h>
>  #include <linux/types.h>
>  #include <linux/cpumask.h>
>  
> -- 
> 2.17.1
> 
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] qcom-scm: Include <linux/err.h> header

[Jonathan marek]

FYI, I already had a patch fixing this error (it is in linux-next: 
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/log/include/linux/qcom_scm.h). 
This one is probably better though.

On 12/28/2018 02:31 PM, Bjorn Andersson wrote:
> On Wed 26 Dec 04:06 PST 2018, Fabio Estevam wrote:
> 
>> Since commit e6f6d63ed14c ("drm/msm: add headless gpu device for imx5")
>> the DRM_MSM symbol can be selected by SOC_IMX5 causing the following
>> error when building imx_v6_v7_defconfig:
>>
>> In file included from ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:17:0:
>> ../include/linux/qcom_scm.h: In function 'qcom_scm_set_cold_boot_addr':
>> ../include/linux/qcom_scm.h:73:10: error: 'ENODEV' undeclared (first use in this function)
>>    return -ENODEV;
>>
>> Include the <linux/err.h> header file to fix this problem.
>>
> 
> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> 
> Andy, please pick up for inclusion in -rc
> 
> Fabio, please use get_maintainers, so your patches hits the appropriate
> mailing lists (linux-arm-msm@ in this case)
> 
> Regards,
> Bjorn
> 
>> Reported-by: kernelci.org bot <bot@kernelci.org>
>> Fixes: e6f6d63ed14c ("drm/msm: add headless gpu device for imx5")
>> Signed-off-by: Fabio Estevam <festevam@gmail.com>
>> ---
>>   include/linux/qcom_scm.h | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/include/linux/qcom_scm.h b/include/linux/qcom_scm.h
>> index 06996ad4f2bc..ce5a476fd733 100644
>> --- a/include/linux/qcom_scm.h
>> +++ b/include/linux/qcom_scm.h
>> @@ -13,6 +13,7 @@
>>   #ifndef __QCOM_SCM_H
>>   #define __QCOM_SCM_H
>>   
>> +#include <linux/err.h>
>>   #include <linux/types.h>
>>   #include <linux/cpumask.h>
>>   
>> -- 
>> 2.17.1
>>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] qcom-scm: Include <linux/err.h> header

[Bjorn Andersson]

On Fri 28 Dec 07:39 PST 2018, Jonathan marek wrote:

> FYI, I already had a patch fixing this error (it is in linux-next: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/log/include/linux/qcom_scm.h).
> This one is probably better though.
> 

I thought I had seen this before, but I was unable to find your patch
when searching my inbox.

That patch has been sent to and picked up by arm-soc for v4.21, so we're
good.

Thanks,
Bjorn

> On 12/28/2018 02:31 PM, Bjorn Andersson wrote:
> > On Wed 26 Dec 04:06 PST 2018, Fabio Estevam wrote:
> > 
> > > Since commit e6f6d63ed14c ("drm/msm: add headless gpu device for imx5")
> > > the DRM_MSM symbol can be selected by SOC_IMX5 causing the following
> > > error when building imx_v6_v7_defconfig:
> > > 
> > > In file included from ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:17:0:
> > > ../include/linux/qcom_scm.h: In function 'qcom_scm_set_cold_boot_addr':
> > > ../include/linux/qcom_scm.h:73:10: error: 'ENODEV' undeclared (first use in this function)
> > >    return -ENODEV;
> > > 
> > > Include the <linux/err.h> header file to fix this problem.
> > > 
> > 
> > Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> > 
> > Andy, please pick up for inclusion in -rc
> > 
> > Fabio, please use get_maintainers, so your patches hits the appropriate
> > mailing lists (linux-arm-msm@ in this case)
> > 
> > Regards,
> > Bjorn
> > 
> > > Reported-by: kernelci.org bot <bot@kernelci.org>
> > > Fixes: e6f6d63ed14c ("drm/msm: add headless gpu device for imx5")
> > > Signed-off-by: Fabio Estevam <festevam@gmail.com>
> > > ---
> > >   include/linux/qcom_scm.h | 1 +
> > >   1 file changed, 1 insertion(+)
> > > 
> > > diff --git a/include/linux/qcom_scm.h b/include/linux/qcom_scm.h
> > > index 06996ad4f2bc..ce5a476fd733 100644
> > > --- a/include/linux/qcom_scm.h
> > > +++ b/include/linux/qcom_scm.h
> > > @@ -13,6 +13,7 @@
> > >   #ifndef __QCOM_SCM_H
> > >   #define __QCOM_SCM_H
> > > +#include <linux/err.h>
> > >   #include <linux/types.h>
> > >   #include <linux/cpumask.h>
> > > -- 
> > > 2.17.1
> > > 
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] qcom-scm: Include <linux/err.h> header

[Fabio Estevam]

Hi Bjorn,

On Fri, Dec 28, 2018 at 5:31 PM Bjorn Andersson
<bjorn.andersson@linaro.org> wrote:
>
> On Wed 26 Dec 04:06 PST 2018, Fabio Estevam wrote:
>
> > Since commit e6f6d63ed14c ("drm/msm: add headless gpu device for imx5")
> > the DRM_MSM symbol can be selected by SOC_IMX5 causing the following
> > error when building imx_v6_v7_defconfig:
> >
> > In file included from ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:17:0:
> > ../include/linux/qcom_scm.h: In function 'qcom_scm_set_cold_boot_addr':
> > ../include/linux/qcom_scm.h:73:10: error: 'ENODEV' undeclared (first use in this function)
> >   return -ENODEV;
> >
> > Include the <linux/err.h> header file to fix this problem.
> >
>
> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
>
> Andy, please pick up for inclusion in -rc

Yes, it would be really nice if we could get this fix into 4.20-rc1 so
that imx_v6_v7_defconfig could be built.

> Fabio, please use get_maintainers, so your patches hits the appropriate
> mailing lists (linux-arm-msm@ in this case)

Sorry, I copied the folks involved in the offending commit:
e6f6d63ed14c ("drm/msm: add headless gpu device for imx5")

By the way, I just ran get_maintainers in this patch and linux-arm-msm
is not listed.

Thanks
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] qcom-scm: Include <linux/err.h> header

[Fabio Estevam]

Hi Bjorn,

On Fri, Dec 28, 2018 at 5:52 PM Fabio Estevam <festevam@gmail.com> wrote:

> By the way, I just ran get_maintainers in this patch and linux-arm-msm
> is not listed.

Would you like to me to submit a patch like this to fix this problem?

diff --git a/MAINTAINERS b/MAINTAINERS
index 7a9804a891fd..e014de05b046 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4797,6 +4797,7 @@ L:        freedreno@lists.freedesktop.org
 T:     git git://people.freedesktop.org/~robclark/linux
 S:     Maintained
 F:     drivers/gpu/drm/msm/
+F:     include/linux/qcom_scm.h
 F:     include/uapi/drm/msm_drm.h
 F:     Documentation/devicetree/bindings/display/msm/
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] qcom-scm: Include <linux/err.h> header

[Fabio Estevam]

On Fri, Dec 28, 2018 at 5:56 PM Fabio Estevam <festevam@gmail.com> wrote:
>
> Hi Bjorn,
>
> On Fri, Dec 28, 2018 at 5:52 PM Fabio Estevam <festevam@gmail.com> wrote:
>
> > By the way, I just ran get_maintainers in this patch and linux-arm-msm
> > is not listed.
>
> Would you like to me to submit a patch like this to fix this problem?

Just realized that include/linux/qcom_scm.h is used in several
subsystems, so maybe a better location would be under ARM/QUALCOMM
SUPPORT?

diff --git a/MAINTAINERS b/MAINTAINERS
index 7a9804a891fd..77836b9a8ffd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1950,6 +1950,7 @@ F:        drivers/tty/serial/msm_serial.c
 F:     drivers/*/pm8???-*
 F:     drivers/mfd/ssbi.c
 F:     drivers/firmware/qcom_scm*
+F:     include/linux/qcom_scm.h
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git

 ARM/RADISYS ENP2611 MACHINE SUPPORT
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] qcom-scm: Include <linux/err.h> header

[Fabio Estevam]

On Fri, Dec 28, 2018 at 5:52 PM Fabio Estevam <festevam@gmail.com> wrote:

> > Andy, please pick up for inclusion in -rc
>
> Yes, it would be really nice if we could get this fix into 4.20-rc1 so
> that imx_v6_v7_defconfig could be built.

Ops, I meant 4.21-rc1 :-)
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] qcom-scm: Include <linux/err.h> header

[Bjorn Andersson]

On Fri 28 Dec 11:52 PST 2018, Fabio Estevam wrote:

> Hi Bjorn,
> 
> On Fri, Dec 28, 2018 at 5:31 PM Bjorn Andersson
> <bjorn.andersson@linaro.org> wrote:
[..]
> > Fabio, please use get_maintainers, so your patches hits the appropriate
> > mailing lists (linux-arm-msm@ in this case)
[..]
> By the way, I just ran get_maintainers in this patch and linux-arm-msm
> is not listed.
> 

Sorry about that, I forgot that the header file is not covered by the
MAINTAINERS file. 

Your second patch looks good, but I'm hoping we can merge the upcoming
v3 of Amit's patch right after the merge window. It fixes this and a lot
of other pieces where we would like to include linux-arm-msm@:

https://lore.kernel.org/lkml/d153a86748f99526e7790bfc4ef8781a2016fd51.1545126964.git.amit.kucheria@linaro.org/

Regards,
Bjorn
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] qcom-scm: Include <linux/err.h> header

[Fabio Estevam]

Hi Bjorn,

On Fri, Dec 28, 2018 at 10:27 PM Bjorn Andersson
<bjorn.andersson@linaro.org> wrote:

> Sorry about that, I forgot that the header file is not covered by the
> MAINTAINERS file.
>
> Your second patch looks good, but I'm hoping we can merge the upcoming
> v3 of Amit's patch right after the merge window. It fixes this and a lot
> of other pieces where we would like to include linux-arm-msm@:
>
> https://lore.kernel.org/lkml/d153a86748f99526e7790bfc4ef8781a2016fd51.1545126964.git.amit.kucheria@linaro.org/

Amit's patch adds the following entry:

+F: include/linux/*/qcom*

but it does not catch include/linux/qcom_scm.h

It also needs

+F: include/linux/qcom*

in order to catch include/linux/qcom-geni-se.h  and include/linux/qcom_scm.h

I can add that entry after Amit's patch gets applied.
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] qcom-scm: Include <linux/err.h> header

[Andy Gross]

On Sat, Dec 29, 2018 at 10:19:32AM -0200, Fabio Estevam wrote:
> Hi Bjorn,
> 
> On Fri, Dec 28, 2018 at 10:27 PM Bjorn Andersson
> <bjorn.andersson@linaro.org> wrote:
> 
> > Sorry about that, I forgot that the header file is not covered by the
> > MAINTAINERS file.
> >
> > Your second patch looks good, but I'm hoping we can merge the upcoming
> > v3 of Amit's patch right after the merge window. It fixes this and a lot
> > of other pieces where we would like to include linux-arm-msm@:
> >
> > https://lore.kernel.org/lkml/d153a86748f99526e7790bfc4ef8781a2016fd51.1545126964.git.amit.kucheria@linaro.org/
> 
> Amit's patch adds the following entry:
> 
> +F: include/linux/*/qcom*
> 
> but it does not catch include/linux/qcom_scm.h
> 
> It also needs
> 
> +F: include/linux/qcom*
> 
> in order to catch include/linux/qcom-geni-se.h  and include/linux/qcom_scm.h
> 
> I can add that entry after Amit's patch gets applied.

Or I can add it to Amit's.  I'll ping him to make sure that's ok.

Thanks,

Andy
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] qcom-scm: Include <linux/err.h> header

[Amit Kucheria]

On Sun, Dec 30, 2018 at 1:21 AM Andy Gross <andy.gross@linaro.org> wrote:
>
> On Sat, Dec 29, 2018 at 10:19:32AM -0200, Fabio Estevam wrote:
> > Hi Bjorn,
> >
> > On Fri, Dec 28, 2018 at 10:27 PM Bjorn Andersson
> > <bjorn.andersson@linaro.org> wrote:
> >
> > > Sorry about that, I forgot that the header file is not covered by the
> > > MAINTAINERS file.
> > >
> > > Your second patch looks good, but I'm hoping we can merge the upcoming
> > > v3 of Amit's patch right after the merge window. It fixes this and a lot
> > > of other pieces where we would like to include linux-arm-msm@:
> > >
> > > https://lore.kernel.org/lkml/d153a86748f99526e7790bfc4ef8781a2016fd51.1545126964.git.amit.kucheria@linaro.org/
> >
> > Amit's patch adds the following entry:
> >
> > +F: include/linux/*/qcom*
> >
> > but it does not catch include/linux/qcom_scm.h
> >
> > It also needs
> >
> > +F: include/linux/qcom*
> >
> > in order to catch include/linux/qcom-geni-se.h  and include/linux/qcom_scm.h
> >
> > I can add that entry after Amit's patch gets applied.
>
> Or I can add it to Amit's.  I'll ping him to make sure that's ok.
>

I'd forgotten about this patch! Just sent out v3 which is still
missing "F: include/linux/qcom*".

Let me know if you want me to send out v4 with this added.

Regards,
Amit
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] qcom-scm: Include <linux/err.h> header

[Chris Healy]

Perhaps I am confused but it appears that this patch has already
landed upstream and got included in 5.0-rc2:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/include/linux/qcom_scm.h?h=v5.0-rc2&id=2076607a20bd4dfba699185616cbbbce06d3fa59

On Mon, Jan 14, 2019 at 11:51 AM Amit Kucheria
<amit.kucheria@verdurent.com> wrote:
>
> On Sun, Dec 30, 2018 at 1:21 AM Andy Gross <andy.gross@linaro.org> wrote:
> >
> > On Sat, Dec 29, 2018 at 10:19:32AM -0200, Fabio Estevam wrote:
> > > Hi Bjorn,
> > >
> > > On Fri, Dec 28, 2018 at 10:27 PM Bjorn Andersson
> > > <bjorn.andersson@linaro.org> wrote:
> > >
> > > > Sorry about that, I forgot that the header file is not covered by the
> > > > MAINTAINERS file.
> > > >
> > > > Your second patch looks good, but I'm hoping we can merge the upcoming
> > > > v3 of Amit's patch right after the merge window. It fixes this and a lot
> > > > of other pieces where we would like to include linux-arm-msm@:
> > > >
> > > > https://lore.kernel.org/lkml/d153a86748f99526e7790bfc4ef8781a2016fd51.1545126964.git.amit.kucheria@linaro.org/
> > >
> > > Amit's patch adds the following entry:
> > >
> > > +F: include/linux/*/qcom*
> > >
> > > but it does not catch include/linux/qcom_scm.h
> > >
> > > It also needs
> > >
> > > +F: include/linux/qcom*
> > >
> > > in order to catch include/linux/qcom-geni-se.h  and include/linux/qcom_scm.h
> > >
> > > I can add that entry after Amit's patch gets applied.
> >
> > Or I can add it to Amit's.  I'll ping him to make sure that's ok.
> >
>
> I'd forgotten about this patch! Just sent out v3 which is still
> missing "F: include/linux/qcom*".
>
> Let me know if you want me to send out v4 with this added.
>
> Regards,
> Amit
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] qcom-scm: Include <linux/err.h> header

[Fabio Estevam]

Hi Chris,

On Mon, Jan 14, 2019 at 5:54 PM Chris Healy <cphealy@gmail.com> wrote:
>
> Perhaps I am confused but it appears that this patch has already
> landed upstream and got included in 5.0-rc2:

The patch that Amit is referring is the following entry in MAINTAINERS file:

+F: include/linux/qcom*

so that the proper lists can be put on Cc on future changes of this file.
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] qcom-scm: Include <linux/err.h> header

[Chris Healy]

There we go, I was definitely confused...  Tnx

On Mon, Jan 14, 2019 at 12:02 PM Fabio Estevam <festevam@gmail.com> wrote:
>
> Hi Chris,
>
> On Mon, Jan 14, 2019 at 5:54 PM Chris Healy <cphealy@gmail.com> wrote:
> >
> > Perhaps I am confused but it appears that this patch has already
> > landed upstream and got included in 5.0-rc2:
>
> The patch that Amit is referring is the following entry in MAINTAINERS file:
>
> +F: include/linux/qcom*
>
> so that the proper lists can be put on Cc on future changes of this file.
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] qcom-scm: Include <linux/err.h> header

[Guenter Roeck]

On Wed, Dec 26, 2018 at 10:06:19AM -0200, Fabio Estevam wrote:
> Since commit e6f6d63ed14c ("drm/msm: add headless gpu device for imx5")
> the DRM_MSM symbol can be selected by SOC_IMX5 causing the following
> error when building imx_v6_v7_defconfig:
> 
> In file included from ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:17:0:
> ../include/linux/qcom_scm.h: In function 'qcom_scm_set_cold_boot_addr':
> ../include/linux/qcom_scm.h:73:10: error: 'ENODEV' undeclared (first use in this function)
>   return -ENODEV;
> 
> Include the <linux/err.h> header file to fix this problem.
> 
> Reported-by: kernelci.org bot <bot@kernelci.org>
> Fixes: e6f6d63ed14c ("drm/msm: add headless gpu device for imx5")
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>

Tested-by: Guenter Roeck <linux@roeck-us.net>

Still broken upstream, and the commit window is about to close.
Any chance to send this patch upstream anytime soon ?

Guenter

> ---
>  include/linux/qcom_scm.h | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/include/linux/qcom_scm.h b/include/linux/qcom_scm.h
> index 06996ad4f2bc..ce5a476fd733 100644
> --- a/include/linux/qcom_scm.h
> +++ b/include/linux/qcom_scm.h
> @@ -13,6 +13,7 @@
>  #ifndef __QCOM_SCM_H
>  #define __QCOM_SCM_H
>  
> +#include <linux/err.h>
>  #include <linux/types.h>
>  #include <linux/cpumask.h>
>