---

yaml
---
r: 6197
b: refs/heads/master
c: 60ba449
h: refs/heads/master
i:
  6195: 88b5519
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ab20002f4b41f4b1799bad5948389da1c4c8444
+refs/heads/master: 60ba44945714d9b7dae8b85ab0926f6f13809c73

trunk/arch/ppc64/kernel/head.S

@@ -93,6 +93,7 @@ END_FTR_SECTION(0, 1)
 
 	/* Catch branch to 0 in real mode */
 	trap
+
 #ifdef CONFIG_PPC_ISERIES
 	/*
 	 * At offset 0x20, there is a pointer to iSeries LPAR data.
@@ -119,7 +120,7 @@ embedded_sysmap_start:
 embedded_sysmap_end:
 	.llong	0
 
-#else /* CONFIG_PPC_ISERIES */
+#endif /* CONFIG_PPC_ISERIES */
 
 	/* Secondary processors spin on this value until it goes to 1. */
 	.globl  __secondary_hold_spinloop
@@ -169,7 +170,6 @@ _GLOBAL(__secondary_hold)
 	BUG_OPCODE
 #endif
 #endif
-#endif
 
 /* This value is used to mark exception frames on the stack. */
 	.section ".toc","aw"