summaryrefslogtreecommitdiff
path: root/arch/arm
AgeCommit message (Collapse)AuthorFilesLines
2017-01-20Merge remote-tracking branch 'origin/tizen_common' into tizensubmit/tizen/20170120.150631submit/tizen/20170120.150201accepted/tizen/common/20170123.181945Maciej Wereski1-15/+88
2017-01-19ARM: LLVMLinux: Change "extern inline" to "static inline" in glue-cache.hBehan Webster1-11/+11
With compilers which follow the C99 standard (like modern versions of gcc and clang), "extern inline" does the wrong thing (emits code for an externally linkable version of the inline function). "static inline" is the correct choice instead. Author: Behan Webster <behanw@converseincode.com> Signed-off-by: Behan Webster <behanw@converseincode.com> Reviewed-by: Mark Charlebois <charlebm@gmail.com> Change-Id: Ia8eed79f7bcb910db7bfbc673a5820accf979915
2017-01-19ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.hBehan Webster2-6/+1
With compilers which follow the C99 standard (like modern versions of gcc and clang), "extern inline" does the wrong thing (emits code for an externally linkable version of the inline function). In this case using static inline and removing the NULL version of return_address in return_address.c does the right thing. Signed-off-by: Behan Webster <behanw@converseincode.com> Reviewed-by: Mark Charlebois <charlebm@gmail.com> Acked-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Change-Id: Ia248e544cb8585fa7bfab5df3b4f3fca3089ab0c
2015-06-01defconfig: add wifi atheros modulessubmit/tizen_common/20150601.091241submit/tizen_3.0_common/20161104.104000accepted/tizen/common/20150601.092045accepted/tizen/3.0/common/20161114.112056tizen_commontizen_3.0.m2tizen_3.0.2015.q2_commonaccepted/tizen_3.0_commonPhilippe Coval1-5/+11
Change-Id: Ib003862d100e3a4f397bfef4319ee70fc8e3c3e4 Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>
2015-05-28config: adjusted for 3.14.28-ltsisubmit/tizen_common/20150528.135532accepted/tizen/common/20150529.082401Stephane Desneux1-7/+4
Change-Id: I0fa7eba65b6ca62eefbd95ddff160f901def4a11 Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
2015-05-28Enable support of DisplayLink framebuffer driverStephane Desneux1-0/+1
Change-Id: I609519939f89ba6d9f10d00846a4d7d30af3dd88 Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
2015-05-28adjusted configurations for 3.14.25Stephane Desneux1-8/+43
Change-Id: I891ad0800ee0dda13f0fca593d38d94f43b2062f Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
2015-05-28import configuration from old branch tizen_3.14.19Stephane Desneux1-5/+39
Change-Id: I2dcc39dd803829ba8ab0f26528e47386a2aa9222 Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
2015-02-26defconfig: enable CONFIG_DEVPTS_MULTIPLE_INSTANCESMaciej Wereski1-0/+1
This is required by systemd. Related: https://git.tizen.org/cgit/platform/upstream/systemd.git/commit/?h=upstream&id=b52a4a3b05a2a0d69868d57fd54f6e4b8fa0e7ca Change-Id: Ib395e71a387a64bd14944b0087cb7a6e85b637ed Signed-off-by: Maciej Wereski <m.wereski@partner.samsung.com>
2015-02-05packaging, defconfig: bump to 3.14.28-ltsiStephane Desneux1-17/+1
Change-Id: I789149825987f75058b2f806cc4ac905b421433e Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
2015-02-04ARM: vexpress_defconfig: enable ACL and security labels for ext4Łukasz Stelmach1-0/+2
This patch enables security features of ext4 file-system required by many conteporary user-space setups. Forwarded: http://lists.infradead.org/pipermail/linux-arm-kernel/2014-December/310299.html Change-Id: Ia9396b810f7d84c926b762cc33a58a2ec9dfd781 Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
2015-02-04defconfig: set options according to systemd requirementsŁukasz Stelmach1-5/+23
Change-Id: I74038b718861eefbb634d578cb092c4c1ce56fea Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
2015-02-04Initialize default configurations for x86,x86_64,armStephane Desneux1-33/+7
Change-Id: I3877e860311f8313d2ad09aff707484268409c1f Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
2015-02-04of/fdt: update of_get_flat_dt_prop in prep for libfdtRob Herring4-5/+5
Make of_get_flat_dt_prop arguments compatible with libfdt fdt_getprop call in preparation to convert FDT code to use libfdt. Make the return value const and the property length ptr type an int. Signed-off-by: Rob Herring <robh@kernel.org> Tested-by: Michal Simek <michal.simek@xilinx.com> Tested-by: Grant Likely <grant.likely@linaro.org> Tested-by: Stephen Chivers <schivers@csc.com> (cherry picked from commit 9d0c4dfedd96ee54fc075b16d02f82499c8cc3a6) Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Conflicts: arch/arm/plat-samsung/s5p-dev-mfc.c arch/powerpc/platforms/powernv/opal.c drivers/of/fdt.c drivers/of/of_reserved_mem.c
2015-02-04ARM: shmobile: koelsch: Remove non-existent i2c6 pinmuxGeert Uytterhoeven1-7/+0
On r8a7791, i2c6 (aka iic3) doesn't need pinmux, but the koelsch dts refers to non-existent pinmux configuration data: pinmux core: sh-pfc does not support function i2c6 sh-pfc e6060000.pfc: invalid function i2c6 in map table Remove it to fix this. Fixes: commit 1d41f36a68c0f4e9b01d563ce33bab5201858b54 ("ARM: shmobile: koelsch dts: Add VDD MPU regulator for DVFS") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Olof Johansson <olof@lixom.net> (cherry picked from commit 12266db732ff3845eaa9ba9354c4938249787aaf) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: r8a7791: add missing 0x0100 for SDCKCRKuninori Morimoto1-1/+1
4bfb358b1d6cdeff8c6a13677f01ed78e9696b98 (ARM: shmobile: Add r8a7791 legacy SDHI clocks) added r8a7791 SDHI clock support. But, it is missing "0x0100: x 1/8" division ratio. This patch fixes hidden bug. It is based on R-Car H2 v0.7, R-Car M2 v0.9. Reported-by: Yusuke Goda <yusuke.goda.sx@renesas.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit 58b80ad6472c0fa12926dfa1f9103d3a326bdf18) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: r8a7790: add missing 0x0100 for SDCKCRKuninori Morimoto1-2/+2
9f13ee6f83c52065112d3e396e42e3780911ef53 (ARM: shmobile: r8a7790: add div4 clocks) added r8a7790 DIV4 clock support. But, it is missing "0x0100: x 1/8" division ratio. This patch fixes hidden bug. It is based on R-Car H2 v0.7, R-Car M2 v0.9. Reported-by: Yusuke Goda <yusuke.goda.sx@renesas.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit 4fb12fe9c34928c1d2bed817e144aec3f44540e9) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: defconfig: Remove MACH_GENMAILaurent Pinchart1-1/+0
The CONFIG_MACH_GENMAI is scheduled for removal so remove it from shmobile_defconfig. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> [horms+renesas@verge.net.au: revised changelog for updated commit order] Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit 92db2b7af591d3c3212183a34856b4cb190b6999) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: sh73a0: Remove spurious 0x from SCIFB clock nameSimon Horman1-1/+1
A stray '0x' crept into a0f7e7496d56ac2d ("ARM: shmobile: sh73a0: add CMT1 clock support for DT"). This patch removes it. This change should not have any run-time affect at this time as the clock in question is used by a SCIF device that is not enabled by default. Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit 2c3758b01aa6f11382d2b018614b5d48ecf30350) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: genmai: remove defconfigSimon Horman1-122/+0
The genmai board code is scheduled for removal and once that occurs the defconfig will be of no use. Remove it. Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Acked-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit 3ed27bd90d6d0c8b4d686a2468b6d50cc1ef74e4) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: sh73a0: add CMT1 clock support for DTSimon Horman1-0/+1
This will be used when initialising CMT1 device using DT until common clock framework support is added. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit a0f7e7496d56ac2da7c684e2035815318c17973a) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: r8a7740: add CMT1 clock support for DTSimon Horman1-0/+1
This will be used when initialising CMT1 device using DT until common clock framework support is added. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit 2e11179da78a56c2a44fc3fe097f2af8dc18f9d6) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: r8a73a4: add CMT1 clock support for DTSimon Horman1-0/+1
This will be used when initialising CMT1 device using DT until common clock framework support is added. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit aad64dc31954dbbb84cd8fcfaf1bc028f3bc2616) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: r8a7740: add TMU clock support for DTSimon Horman1-0/+2
This will be used when initialising TMU devices using DT until common clock framework support is added. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit ef9cb75ca70c8d31b2493d1fd6cbf8b3dd1dec95) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: r8a7778: add TMU clock support for DTSimon Horman1-0/+2
This will be used when initialising TMU devices using DT until common clock framework support is added. Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit 0985f38d1379291c8701572e761c809f0d5f6476) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: kzm9g-reference: Initialise SCIF device using DTSimon Horman2-7/+15
Initialise SCIF device using DT when booting armadillo800eva using DT reference. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit 700ce7c2bb2a4963472d95eba1436d6b0945918e) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: sh73a0: Add SCIF nodesSimon Horman1-0/+72
This describes all of the SCIF hardware of the sh73a0. Each node is disabled and may be enabled as necessary by board DTS files. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit 2131421b85c9f25082a2b0ec371c7ad0c47cc943) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: armadillo800eva-reference: Initialise SCIF device using DTSimon Horman2-7/+15
Initialise SCIF device using DT when booting armadillo800eva using DT reference. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit c4fac6f2f92331fa5788811357f8b8c3352e5ad8) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: r8a7740: Add SCIF nodesSimon Horman1-0/+63
This describes all of the SCIF hardware of the r8a7740. Each node is disabled and may be enabled as necessary by board DTS files. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit fa12355b24a430729f34c349473b9c0a3d125679) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: ape6evm-reference: Initialise SCIF device using DTSimon Horman2-9/+17
Initialise SCIF device using DT when booting ape6evm using DT reference. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit 27bc82353a3f214a383d7f3b1ccaefdb70d6c94f) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: r8a73a4: Add SCIF nodesSimon Horman1-0/+42
This describes all of the SCIF hardware of the r8a73a4. Each node is disabled and may be enabled as necessary by board DTS files. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit 94f1a03db6988c64601dc84eaf6c8ef1b956d9e7) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: bockw-reference: Initialise SCIF device using DTSimon Horman2-9/+17
Initialise SCIF device using DT when booting bockw using DT reference. Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit 5be97ca4a4f6e11c4a839ec3c08dea25589dfeb4) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: r8a7778: Add SCIF nodesSimon Horman1-0/+42
This describes all of the SCIF hardware of the r8a7778. Each node is disabled and may be enabled as necessary by board DTS files. Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit 9930dc8ee1f59271a54ed4b4922c9c944625a8d6) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: sh73a0: add SCI clock support for DTSimon Horman1-0/+9
This will be used when initialising SCI devices using DT until common clock framework support is added. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit ff4ce48e1f163d945c037c1c90ce12950961d91d) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: r8a7740: correct SCI clock support for DTSimon Horman1-9/+9
When initialising SCI devices their names will be .serial not .sci. This will be used when initialising SCI devices using DT until common clock framework support is added. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit d1ec90f2875471df2c954f7cbd45b2389ff86aa2) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: r8a73a4: add SCI clock support for DTSimon Horman1-0/+6
This will be used when initialising SCI devices using DT until common clock framework support is added. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit 9947efaac0545fd833b0ff5147578aba79d297bc) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: r8a7778: add SCI clock support for DTSimon Horman1-0/+6
This will be used when initialising SCI devices using DT until common clock framework support is added. Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit 7a0c99478dca80f862912be02bf8ec240a9098d1) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: r8a7790: lager: use iic cores instead of i2cWolfram Sang1-11/+11
On Lager board, i2c and iic cores can be interchanged since they can be muxed to the same wires. Commit e489c2a9bc82713167d9f721ca764f4b0d37e543 ("ARM: shmobile: lager: enable i2c devices") activated the i2c cores, yet the iic cores should be default since they have the more interesting features for generic use cases, i.e. SMBUS_QUICK and DMA (yet to be supported). Reported-by: Khiem Nguyen <khiem.nguyen.xt@renesas.com> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit cb9a2b12e0cb524022c9a81d8ed29f2453ec240d) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: Lager: Correct I2C bus for VDD MPU regulatorKhiem Nguyen1-5/+5
I2C bus for VDD MPU regulator is IIC3, not I2C3. Signed-off-by: Khiem Nguyen <khiem.nguyen.xt@renesas.com> Reviewed-by: Wolfram Sang <wsa@sang-engineering.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit 5179ffd099446e65a1e094b9cb17cc7edab45583) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: Remove opps table check for cpufreqGaku Inami1-15/+1
This patch is based on feedback from Viresh Kumar. Since cpufreq-cpu0 driver has already check opp table, there is no need to same check in mach-shmobile. Signed-off-by: Gaku Inami <gaku.inami.xw@bp.renesas.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit e423d12cbcb9576785e891617888f627f1f57bf4) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: Enable R-Car Gen 2 PCIe in shmobile_defconfigSimon Horman1-0/+1
The R-Car Gen 2 PCIe driver provides PCIe host support for Renesas R-Car Gen2 platforms. To increase hardware support enable the driver in the shmobile_defconfig multiplatform configuration. Cc: Phil Edworthy <phil.edworthy@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit 8cbf869a0a278c4d39e50daa4f4101b394a72a93) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: marzen: Consistently use tabs for indentationSimon Horman1-6/+6
Unify white space usage by consistently using tabs for indentation. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit 08af64097d4c5cb17f9df4dadf80ed5f508db743) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: kzm9g-reference: Remove early_printk from command lineSimon Horman1-1/+1
As early printk is not supported when devices are initialised using DT, so remove it from the command line. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit 0b7324706ea24489a0ddcbd9d472e232520aad80) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: armadillo800eva-reference: Remove early_printk from command lineSimon Horman1-1/+1
As early printk is not supported when devices are initialised using DT, so remove it from the command line. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit b2386fa51696ffcae82f27ebbdc667b037be5048) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: r8a7779: Consistently use tabs for indentationSimon Horman1-7/+7
Unify white space usage by consistently using tabs for indentation. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit cc703a59c0f8769456a7eb0d53a8d709e5c19387) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: henninger: Consistently use tabs for indentationSimon Horman1-1/+1
Unify white space usage by consistently using tabs for indentation. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit eb0f12e24f357f1663b4da8c571214d5a11eb011) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: henninger: enable internal PCISergei Shtylyov1-0/+22
Enable internal AHB-PCI bridges for the USB EHCI/OHCI controllers attached to them. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Acked-by: Arnd Bergmann <arnd@arndb.de> [horms+renesas@verge.net.au: minor witespace changes] Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit 83ccfa8d0c6a734720ed8cd23b97256ffcae156a) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: koelsch: enable internal PCISergei Shtylyov1-0/+22
Enable internal AHB-PCI bridges for the USB EHCI/OHCI controllers attached to them. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Acked-by: Arnd Bergmann <arnd@arndb.de> [horms+renesas@verge.net.au: minor witespace changes] Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit 7540aeb0dd2c830ed490e7227d51bc3050ac798c) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: r8a7791: add internal PCI bridge nodesSergei Shtylyov1-0/+40
Add device nodes for the R8A7791 internal PCI bridge devices. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Acked-by: Arnd Bergmann <arnd@arndb.de> [horms+renesas@verge.net.au: minor witespace changes] Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit aace0809e9bbbfe1570a298a3284d9802fbf2d1a) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-02-04ARM: shmobile: fix shmobile_smp_apmu_suspend_init build failure for !SUSPENDArnd Bergmann1-2/+0
Patch d6d757c9a4e ("ARM: shmobile: APMU: Add Core-Standby-state for Suspend to RAM") added both an inline wrapper for shmobile_smp_apmu_suspend_init and an empty function in arch/arm/mach-shmobile/platsmp-apmu.c. We get a build failure when both are present, so this patch removes the one in the .c file and keeps the inline version. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit d358c99838f3cf63ad7536124be4318cc84b11fa) Signed-off-by: Simon Horman <horms+renesas@verge.net.au>