From 96e65513d16a15c4c1b0a83ad671eb5e47da6a5b Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Thu, 17 Jun 2010 14:33:06 +0000 Subject: [PATCH] --- yaml --- r: 200907 b: refs/heads/master c: 33ad5e4b6cab3ad8cf3afda49b66393f1833150e h: refs/heads/master i: 200905: a4d4ec40350f3598791525b1649056d9b20493e7 200903: 75848c4c43ffb61ca7b71eb40767689cd2e48fe2 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/prom_init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e853fff606d2..69887fc7c5a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3880ecb05bc5ece4c6e392a21ea77518e55b4935 +refs/heads/master: 33ad5e4b6cab3ad8cf3afda49b66393f1833150e diff --git a/trunk/arch/powerpc/kernel/prom_init.c b/trunk/arch/powerpc/kernel/prom_init.c index 97d4bd9442d3..3b6f8ae9b8cc 100644 --- a/trunk/arch/powerpc/kernel/prom_init.c +++ b/trunk/arch/powerpc/kernel/prom_init.c @@ -872,7 +872,7 @@ static void __init prom_send_capabilities(void) "ibm_architecture_vec structure inconsistent: 0x%x !\n", *cores); } else { - *cores = NR_CPUS / prom_count_smt_threads(); + *cores = DIV_ROUND_UP(NR_CPUS, prom_count_smt_threads()); prom_printf("Max number of cores passed to firmware: 0x%x\n", (unsigned long)*cores); }