From f3811f8373238f4a51c72382465d0cc4d5fe6f58 Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Thu, 19 Jul 2012 09:42:39 -0500 Subject: [PATCH] --- yaml --- r: 329719 b: refs/heads/master c: da29aa8f2ab178903a1ac23ce19442f92be4f09c h: refs/heads/master i: 329717: 1791801731bfa6ebe980558fee6c7fb322d87414 329715: 506759a22c669975f60602ed8891bcea4b0e6c65 329711: 7d5810be8210d5abe71e483d4f7db1f8696a49ff v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/prom_init.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7e647ef89446..00aac2150386 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 322cacce0a3c36d3ad89d8836b9ed6fcb06e1a61 +refs/heads/master: da29aa8f2ab178903a1ac23ce19442f92be4f09c diff --git a/trunk/arch/powerpc/kernel/prom_init.c b/trunk/arch/powerpc/kernel/prom_init.c index 0794a3017b1b..9ec5e5525777 100644 --- a/trunk/arch/powerpc/kernel/prom_init.c +++ b/trunk/arch/powerpc/kernel/prom_init.c @@ -705,6 +705,7 @@ static void __init early_cmdline_parse(void) #endif #define OV5_TYPE1_AFFINITY 0x80 /* Type 1 NUMA affinity */ #define OV5_PFO_HW_RNG 0x80 /* PFO Random Number Generator */ +#define OV5_PFO_HW_842 0x40 /* PFO Compression Accelerator */ #define OV5_PFO_HW_ENCR 0x20 /* PFO Encryption Accelerator */ /* Option Vector 6: IBM PAPR hints */ @@ -774,8 +775,7 @@ static unsigned char ibm_architecture_vec[] = { 0, 0, 0, - OV5_PFO_HW_RNG | OV5_PFO_HW_ENCR, - + OV5_PFO_HW_RNG | OV5_PFO_HW_ENCR | OV5_PFO_HW_842, /* option vector 6: IBM PAPR hints */ 4 - 2, /* length */ 0,