diff options
| author | Len Brown <len.brown@intel.com> | 2011-03-23 02:33:54 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-03-23 02:33:54 -0400 |
| commit | 5c129a8600100a5d0f5fdbc1014c5dba1d307bc4 (patch) | |
| tree | 9877a14b49cff43d0ba10c12f407ec551c77daa5 /arch/powerpc/kernel/paca.c | |
| parent | 797b10a07069e153d41aedb4ae8e76660279e2ee (diff) | |
| parent | 521cb40b0c44418a4fd36dc633f575813d59a43d (diff) | |
Merge commit 'v2.6.38' into release
Diffstat (limited to 'arch/powerpc/kernel/paca.c')
| -rw-r--r-- | arch/powerpc/kernel/paca.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c index ebf9846f3c3b..f4adf89d7614 100644 --- a/arch/powerpc/kernel/paca.c +++ b/arch/powerpc/kernel/paca.c | |||
| @@ -27,20 +27,6 @@ extern unsigned long __toc_start; | |||
| 27 | #ifdef CONFIG_PPC_BOOK3S | 27 | #ifdef CONFIG_PPC_BOOK3S |
| 28 | 28 | ||
| 29 | /* | 29 | /* |
| 30 | * We only have to have statically allocated lppaca structs on | ||
| 31 | * legacy iSeries, which supports at most 64 cpus. | ||
| 32 | */ | ||
| 33 | #ifdef CONFIG_PPC_ISERIES | ||
| 34 | #if NR_CPUS < 64 | ||
| 35 | #define NR_LPPACAS NR_CPUS | ||
| 36 | #else | ||
| 37 | #define NR_LPPACAS 64 | ||
| 38 | #endif | ||
| 39 | #else /* not iSeries */ | ||
| 40 | #define NR_LPPACAS 1 | ||
| 41 | #endif | ||
| 42 | |||
| 43 | /* | ||
| 44 | * The structure which the hypervisor knows about - this structure | 30 | * The structure which the hypervisor knows about - this structure |
| 45 | * should not cross a page boundary. The vpa_init/register_vpa call | 31 | * should not cross a page boundary. The vpa_init/register_vpa call |
| 46 | * is now known to fail if the lppaca structure crosses a page | 32 | * is now known to fail if the lppaca structure crosses a page |