Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 2739e8cf113ce6e931608986a28bab5a42c0acd9

Authored by David Gibson
Committed by Paul Mackerras
1 parent b74d0bd534
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[PATCH] Restore lparmap.s include for iSeries 

A mistake rebasing the series of ppc64 head.S cleanup patches meant
the #include of lparmap.s, needed for iSeries was lost.  This patch
puts it back again.

Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Showing 1 changed file with 10 additions and 1 deletions Side-by-side Diff

arch/ppc64/kernel/head.S
Diff comments   View file @ 2739e8c
... ... @@ -1269,7 +1269,16 @@
1269 1269 .= 0x7000
1270 1270 .globl fwnmi_data_area
1271 1271 fwnmi_data_area:
1272   - .space PAGE_SIZE
  1272 +
  1273 + /* iSeries does not use the FWNMI stuff, so it is safe to put
  1274 + * this here, even if we later allow kernels that will boot on
  1275 + * both pSeries and iSeries */
  1276 +#ifdef CONFIG_PPC_ISERIES
  1277 + . = LPARMAP_PHYS
  1278 +#include "lparmap.s"
  1279 +#endif /* CONFIG_PPC_ISERIES */
  1280 +
  1281 + . = 0x8000
1273 1282  
1274 1283 /*
1275 1284 * On pSeries, secondary processors spin in the following code.