aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-01-12 18:36:20 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-01-12 18:36:20 -0800
commit5518e20e6d4dbc61544137266dd3c621399610eb (patch)
treebe192b0e0c5c4514d11b9e8f923e9cbfc3c402d6
parent7db82b136749c36506a75c54fdf60ae268efaf04 (diff)
downloadltsi-kernel-5518e20e6d4dbc61544137266dd3c621399610eb.tar.gz
add altera build error patchv4.1.15-ltsi-rc2
-rw-r--r--patches.altera/arm-socfpga-fix-build-error-due-to-secondary_startup.patch33
-rw-r--r--series1
2 files changed, 34 insertions, 0 deletions
diff --git a/patches.altera/arm-socfpga-fix-build-error-due-to-secondary_startup.patch b/patches.altera/arm-socfpga-fix-build-error-due-to-secondary_startup.patch
new file mode 100644
index 00000000000000..513e6a407a4015
--- /dev/null
+++ b/patches.altera/arm-socfpga-fix-build-error-due-to-secondary_startup.patch
@@ -0,0 +1,33 @@
+From 89b8da06ba302dd130df60df7964ccd3ab151cd6 Mon Sep 17 00:00:00 2001
+From: Kevin Hilman <khilman@linaro.org>
+Date: Thu, 11 Jun 2015 15:41:58 -0700
+Subject: ARM: socfpga: fix build error due to secondary_startup
+
+After commit 02b4e2756e01 (ARM: v7 setup function should invalidate L1
+cache) the soc specific secondary_startup is removed, causing build
+failures:
+
+../arch/arm/mach-socfpga/platsmp.c: In function 'socfpga_a10_boot_secondary':
+../arch/arm/mach-socfpga/platsmp.c:66:140: error: 'socfpga_secondary_startup' undeclared (first use in this function)
+../arch/arm/mach-socfpga/platsmp.c:66:140: note: each undeclared identifier is reported only once for each function it appears in
+
+To fix, use the generic secondary_startup.
+
+Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
+Signed-off-by: Kevin Hilman <khilman@linaro.org>
+
+---
+ arch/arm/mach-socfpga/platsmp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/mach-socfpga/platsmp.c
++++ b/arch/arm/mach-socfpga/platsmp.c
+@@ -63,7 +63,7 @@ static int socfpga_a10_boot_secondary(un
+ SOCFPGA_A10_RSTMGR_MODMPURST);
+ memcpy(phys_to_virt(0), &secondary_trampoline, trampoline_size);
+
+- writel(virt_to_phys(socfpga_secondary_startup),
++ writel(virt_to_phys(secondary_startup),
+ sys_manager_base_addr + (socfpga_cpu1start_addr & 0x00000fff));
+
+ flush_cache_all();
diff --git a/series b/series
index 4a50044e2eb253..0889bb7e781ccd 100644
--- a/series
+++ b/series
@@ -425,6 +425,7 @@ patches.altera/0004-PCI-altera-Fix-loop-in-tlp_read_packet.patch
patches.altera/0005-PCI-altera-Fix-Requester-ID-for-config-accesses.patch
patches.altera/0006-PCI-altera-Check-TLP-completion-status.patch
patches.altera/0007-PCI-altera-Fix-error-when-INTx-is-4.patch
+patches.altera/arm-socfpga-fix-build-error-due-to-secondary_startup.patch
#############################################################################
# Misc patches