Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 305383
b: refs/heads/master
c: 828d2b5
h: refs/heads/master
i:
  305381: 844ce3f
  305379: d2e113c
  305375: db283aa
v: v3
  • Loading branch information
Kent Yoder authored and Benjamin Herrenschmidt committed May 14, 2012
1 parent 4440a6f commit a8223ef
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 649e9ea0ab611ab54d4ff606475812d52b6e34fc
refs/heads/master: 828d2b59717380149bae1e56e2820c8f9c00e211
8 changes: 7 additions & 1 deletion trunk/arch/powerpc/kernel/prom_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,7 @@ static void __init early_cmdline_parse(void)
#define OV5_XCMO 0x00
#endif
#define OV5_TYPE1_AFFINITY 0x80 /* Type 1 NUMA affinity */
#define OV5_PFO_HW_RNG 0x80 /* PFO Random Number Generator */

/* Option Vector 6: IBM PAPR hints */
#define OV6_LINUX 0x02 /* Linux is our OS */
Expand Down Expand Up @@ -752,7 +753,7 @@ static unsigned char ibm_architecture_vec[] = {
OV4_MIN_ENT_CAP, /* minimum VP entitled capacity */

/* option vector 5: PAPR/OF options */
13 - 2, /* length */
18 - 2, /* length */
0, /* don't ignore, don't halt */
OV5_LPAR | OV5_SPLPAR | OV5_LARGE_PAGES | OV5_DRCONF_MEMORY |
OV5_DONATE_DEDICATE_CPU | OV5_MSI,
Expand All @@ -768,6 +769,11 @@ static unsigned char ibm_architecture_vec[] = {
*/
#define IBM_ARCH_VEC_NRCORES_OFFSET 101
W(NR_CPUS), /* number of cores supported */
0,
0,
0,
0,
OV5_PFO_HW_RNG,

/* option vector 6: IBM PAPR hints */
4 - 2, /* length */
Expand Down

0 comments on commit a8223ef

Please sign in to comment.