diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-09 16:46:06 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-09 16:46:06 -0800 |
commit | 35d34df711e8b44846e759d8cfddb4ec6877cccb (patch) | |
tree | 6ee37bcc2594add1050a77fdb272eda4414fe6c8 /arch/powerpc/kernel/paca.c | |
parent | ab02a9540541dd7b2012f32f5e311c3cbd772387 (diff) | |
parent | 36e8695ca5dcf48c837a6efe6f780c47ac9ec808 (diff) | |
download | op-kernel-dev-35d34df711e8b44846e759d8cfddb4ec6877cccb.zip op-kernel-dev-35d34df711e8b44846e759d8cfddb4ec6877cccb.tar.gz |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/pseries: Disable VPNH feature
powerpc/iseries: Fix early init access to lppaca
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 ebf9846..f4adf89 100644 --- a/arch/powerpc/kernel/paca.c +++ b/arch/powerpc/kernel/paca.c @@ -27,20 +27,6 @@ extern unsigned long __toc_start; #ifdef CONFIG_PPC_BOOK3S /* - * We only have to have statically allocated lppaca structs on - * legacy iSeries, which supports at most 64 cpus. - */ -#ifdef CONFIG_PPC_ISERIES -#if NR_CPUS < 64 -#define NR_LPPACAS NR_CPUS -#else -#define NR_LPPACAS 64 -#endif -#else /* not iSeries */ -#define NR_LPPACAS 1 -#endif - -/* * The structure which the hypervisor knows about - this structure * should not cross a page boundary. The vpa_init/register_vpa call * is now known to fail if the lppaca structure crosses a page |