Преглед изворни кода

powerpc/oprofile: Don't build server oprofile drivers on 64-bit BookE

They will fail to build due to the lack of mtmsrd, and wouldn't
be useful anyways

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Benjamin Herrenschmidt пре 15 година
родитељ
комит
1caca371e8
2 измењених фајлова са 2 додато и 2 уклоњено
  1. 1 1
      arch/powerpc/oprofile/Makefile
  2. 1 1
      arch/powerpc/oprofile/common.c

+ 1 - 1
arch/powerpc/oprofile/Makefile

@@ -16,6 +16,6 @@ oprofile-y := $(DRIVER_OBJS) common.o backtrace.o
 oprofile-$(CONFIG_OPROFILE_CELL) += op_model_cell.o \
 oprofile-$(CONFIG_OPROFILE_CELL) += op_model_cell.o \
 		cell/spu_profiler.o cell/vma_map.o \
 		cell/spu_profiler.o cell/vma_map.o \
 		cell/spu_task_sync.o
 		cell/spu_task_sync.o
-oprofile-$(CONFIG_PPC64) += op_model_rs64.o op_model_power4.o op_model_pa6t.o
+oprofile-$(CONFIG_PPC_BOOK3S_64) += op_model_rs64.o op_model_power4.o op_model_pa6t.o
 oprofile-$(CONFIG_FSL_EMB_PERFMON) += op_model_fsl_emb.o
 oprofile-$(CONFIG_FSL_EMB_PERFMON) += op_model_fsl_emb.o
 oprofile-$(CONFIG_6xx) += op_model_7450.o
 oprofile-$(CONFIG_6xx) += op_model_7450.o

+ 1 - 1
arch/powerpc/oprofile/common.c

@@ -199,7 +199,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
 		return -ENODEV;
 		return -ENODEV;
 
 
 	switch (cur_cpu_spec->oprofile_type) {
 	switch (cur_cpu_spec->oprofile_type) {
-#ifdef CONFIG_PPC64
+#ifdef CONFIG_PPC_BOOK3S_64
 #ifdef CONFIG_OPROFILE_CELL
 #ifdef CONFIG_OPROFILE_CELL
 		case PPC_OPROFILE_CELL:
 		case PPC_OPROFILE_CELL:
 			if (firmware_has_feature(FW_FEATURE_LPAR))
 			if (firmware_has_feature(FW_FEATURE_LPAR))