From 796a1bfcecf4aaaa021fdf772e474050d718a8f2 Mon Sep 17 00:00:00 2001 From: Kent Yoder Date: Thu, 12 Apr 2012 05:39:35 +0000 Subject: [PATCH] --- yaml --- r: 305395 b: refs/heads/master c: 7e3a4fa160387a72d42e3f8c4b887bb0a9c50d7e h: refs/heads/master i: 305393: ac6200562a80856422cc4eba3f8ccafd99df9ff3 305391: 562839f30d50a4ad8a425296c925bb2b591ece1e v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/prom_init.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1e5a7fa6b2c2..fad187b97532 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aef7b31c8833e7dd79c2320f6d0433861a6d3653 +refs/heads/master: 7e3a4fa160387a72d42e3f8c4b887bb0a9c50d7e diff --git a/trunk/arch/powerpc/kernel/prom_init.c b/trunk/arch/powerpc/kernel/prom_init.c index 5b7e514e7919..1b488e5305c5 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_ENCR 0x20 /* PFO Encryption Accelerator */ /* Option Vector 6: IBM PAPR hints */ #define OV6_LINUX 0x02 /* Linux is our OS */ @@ -773,7 +774,7 @@ static unsigned char ibm_architecture_vec[] = { 0, 0, 0, - OV5_PFO_HW_RNG, + OV5_PFO_HW_RNG | OV5_PFO_HW_ENCR, /* option vector 6: IBM PAPR hints */ 4 - 2, /* length */