diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-05-24 12:17:43 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-05-24 12:17:43 +0800 |
| commit | 6c1be3bf831c5b1f2ba51425315287df2c350633 (patch) | |
| tree | fd07371829b4b5ea7db114502ac12fd989aa4e2a /arch/arm/mach-socfpga/headsmp.S | |
| parent | ada3625ee9203002b2cac60be802dae952ae3e22 (diff) | |
| parent | 3b6aa07b936b09d38c1bfcee1e06845b968df475 (diff) | |
Merge tag 'v3.18.34' into linux-linaro-lsk-v3.18lsk-v3.18-16.05
This is the 3.18.34 stable release
Diffstat (limited to 'arch/arm/mach-socfpga/headsmp.S')
| -rw-r--r-- | arch/arm/mach-socfpga/headsmp.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-socfpga/headsmp.S b/arch/arm/mach-socfpga/headsmp.S index f65ea0af4af3..a2b1c4a3afd8 100644 --- a/arch/arm/mach-socfpga/headsmp.S +++ b/arch/arm/mach-socfpga/headsmp.S @@ -12,6 +12,7 @@ #include <asm/memory.h> .arch armv7-a + .arm ENTRY(secondary_trampoline) /* CPU1 will always fetch from 0x0 when it is brought out of reset. |