Merge branch 'x86/urgent' into x86/apic

Bring in the upstream modifications so we can fixup the silent merge
conflict which is introduced by this merge.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 6 insertions, 3 deletions

diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 4e74fc588a3f..d3eff99e938c 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -695,7 +695,7 @@ unsigned char ibm_architecture_vec[] = {
         OV4_MIN_ENT_CAP,                /* minimum VP entitled capacity */
 
         /* option vector 5: PAPR/OF options */
-        VECTOR_LENGTH(18),              /* length */
+        VECTOR_LENGTH(21),              /* length */
         0,                              /* don't ignore, don't halt */
         OV5_FEAT(OV5_LPAR) | OV5_FEAT(OV5_SPLPAR) | OV5_FEAT(OV5_LARGE_PAGES) |
         OV5_FEAT(OV5_DRCONF_MEMORY) | OV5_FEAT(OV5_DONATE_DEDICATE_CPU) |
@@ -726,8 +726,11 @@ unsigned char ibm_architecture_vec[] = {
         0,
         0,
         OV5_FEAT(OV5_PFO_HW_RNG) | OV5_FEAT(OV5_PFO_HW_ENCR) |
-        OV5_FEAT(OV5_PFO_HW_842),
-        OV5_FEAT(OV5_SUB_PROCESSORS),
+        OV5_FEAT(OV5_PFO_HW_842),                               /* Byte 17 */
+        0,                                                      /* Byte 18 */
+        0,                                                      /* Byte 19 */
+        0,                                                      /* Byte 20 */
+        OV5_FEAT(OV5_SUB_PROCESSORS),                           /* Byte 21 */
 
         /* option vector 6: IBM PAPR hints */
         VECTOR_LENGTH(3),               /* length */