diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2006-11-27 19:18:57 +0100 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2006-12-04 20:41:16 +1100 |
| commit | e22ba7e38144c1cccac5024cfd6ec88bb64d3e1f (patch) | |
| tree | 869b43ec4fcc66b0ff6bb6eb7f735b1846859b8c /arch/powerpc/mm/Makefile | |
| parent | [POWERPC] ps3: Missed renames of CONFIG_PS3 to CONFIG_PPC_PS3 (diff) | |
| download | linux-dev-e22ba7e38144c1cccac5024cfd6ec88bb64d3e1f.tar.xz linux-dev-e22ba7e38144c1cccac5024cfd6ec88bb64d3e1f.zip | |
[POWERPC] ps3: multiplatform build fixes
A few code paths need to check whether or not they are running
on the PS3's LV1 hypervisor before making hcalls. This introduces
a new firmware feature bit for this, FW_FEATURE_PS3_LV1.
Now when both PS3 and IBM_CELL_BLADE are enabled, but not PSERIES,
FW_FEATURE_PS3_LV1 and FW_FEATURE_LPAR get enabled at compile time,
which is a bug. The same problem can also happen for (PPC_ISERIES &&
!PPC_PSERIES && PPC_SOMETHING_ELSE). In order to solve this, I
introduce a new CONFIG_PPC_NATIVE option that is set when at least
one platform is selected that can run without a hypervisor and then
turns the firmware feature check into a run-time option.
The new cell oprofile support that was recently merged does not
work on hypervisor based platforms like the PS3, therefore make
it depend on PPC_CELL_NATIVE instead of PPC_CELL. This may change
if we get oprofile support for PS3.
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Diffstat (limited to 'arch/powerpc/mm/Makefile')
| -rw-r--r-- | arch/powerpc/mm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile index 93441e7a2921..38a81967ca07 100644 --- a/arch/powerpc/mm/Makefile +++ b/arch/powerpc/mm/Makefile @@ -8,7 +8,7 @@ endif obj-y := fault.o mem.o lmb.o obj-$(CONFIG_PPC32) += init_32.o pgtable_32.o mmu_context_32.o -hash-$(CONFIG_PPC_MULTIPLATFORM) := hash_native_64.o +hash-$(CONFIG_PPC_NATIVE) := hash_native_64.o obj-$(CONFIG_PPC64) += init_64.o pgtable_64.o mmu_context_64.o \ hash_utils_64.o hash_low_64.o tlb_64.o \ slb_low.o slb.o stab.o mmap.o imalloc.o \ |