diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/kernel/prom_init.c | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index d6047c441034..a1d582e38627 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c | |||
@@ -635,6 +635,7 @@ static void __init early_cmdline_parse(void) | |||
635 | /* ibm,dynamic-reconfiguration-memory property supported */ | 635 | /* ibm,dynamic-reconfiguration-memory property supported */ |
636 | #define OV5_DRCONF_MEMORY 0x20 | 636 | #define OV5_DRCONF_MEMORY 0x20 |
637 | #define OV5_LARGE_PAGES 0x10 /* large pages supported */ | 637 | #define OV5_LARGE_PAGES 0x10 /* large pages supported */ |
638 | #define OV5_DONATE_DEDICATE_CPU 0x02 /* donate dedicated CPU support */ | ||
638 | /* PCIe/MSI support. Without MSI full PCIe is not supported */ | 639 | /* PCIe/MSI support. Without MSI full PCIe is not supported */ |
639 | #ifdef CONFIG_PCI_MSI | 640 | #ifdef CONFIG_PCI_MSI |
640 | #define OV5_MSI 0x01 /* PCIe/MSI support */ | 641 | #define OV5_MSI 0x01 /* PCIe/MSI support */ |
@@ -685,7 +686,8 @@ static unsigned char ibm_architecture_vec[] = { | |||
685 | /* option vector 5: PAPR/OF options */ | 686 | /* option vector 5: PAPR/OF options */ |
686 | 3 - 2, /* length */ | 687 | 3 - 2, /* length */ |
687 | 0, /* don't ignore, don't halt */ | 688 | 0, /* don't ignore, don't halt */ |
688 | OV5_LPAR | OV5_SPLPAR | OV5_LARGE_PAGES | OV5_DRCONF_MEMORY | OV5_MSI, | 689 | OV5_LPAR | OV5_SPLPAR | OV5_LARGE_PAGES | OV5_DRCONF_MEMORY | |
690 | OV5_DONATE_DEDICATE_CPU | OV5_MSI, | ||
689 | }; | 691 | }; |
690 | 692 | ||
691 | /* Old method - ELF header with PT_NOTE sections */ | 693 | /* Old method - ELF header with PT_NOTE sections */ |
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 470db6efaeb6..de6c2efd0479 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c | |||
@@ -399,6 +399,7 @@ static void pseries_dedicated_idle_sleep(void) | |||
399 | * a good time to find other work to dispatch. | 399 | * a good time to find other work to dispatch. |
400 | */ | 400 | */ |
401 | get_lppaca()->idle = 1; | 401 | get_lppaca()->idle = 1; |
402 | get_lppaca()->donate_dedicated_cpu = 1; | ||
402 | 403 | ||
403 | /* | 404 | /* |
404 | * We come in with interrupts disabled, and need_resched() | 405 | * We come in with interrupts disabled, and need_resched() |
@@ -431,6 +432,7 @@ static void pseries_dedicated_idle_sleep(void) | |||
431 | 432 | ||
432 | out: | 433 | out: |
433 | HMT_medium(); | 434 | HMT_medium(); |
435 | get_lppaca()->donate_dedicated_cpu = 0; | ||
434 | get_lppaca()->idle = 0; | 436 | get_lppaca()->idle = 0; |
435 | } | 437 | } |
436 | 438 | ||