diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 01:11:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 01:11:30 -0400 |
commit | 45c091bb2d453ce4a8b06cf19872ec7a77fc4799 (patch) | |
tree | 06fb2e05518ebfba163f8424e028e7faf5672d66 /arch/powerpc/oprofile/common.c | |
parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
parent | 2191fe3e39159e3375f4b7ec1420df149f154101 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (139 commits)
[POWERPC] re-enable OProfile for iSeries, using timer interrupt
[POWERPC] support ibm,extended-*-frequency properties
[POWERPC] Extra sanity check in EEH code
[POWERPC] Dont look for class-code in pci children
[POWERPC] Fix mdelay badness on shared processor partitions
[POWERPC] disable floating point exceptions for init
[POWERPC] Unify ppc syscall tables
[POWERPC] mpic: add support for serial mode interrupts
[POWERPC] pseries: Print PCI slot location code on failure
[POWERPC] spufs: one more fix for 64k pages
[POWERPC] spufs: fail spu_create with invalid flags
[POWERPC] spufs: clear class2 interrupt status before wakeup
[POWERPC] spufs: fix Makefile for "make clean"
[POWERPC] spufs: remove stop_code from struct spu
[POWERPC] spufs: fix spu irq affinity setting
[POWERPC] spufs: further abstract priv1 register access
[POWERPC] spufs: split the Cell BE support into generic and platform dependant parts
[POWERPC] spufs: dont try to access SPE channel 1 count
[POWERPC] spufs: use kzalloc in create_spu
[POWERPC] spufs: fix initial state of wbox file
...
Manually resolved conflicts in:
drivers/net/phy/Makefile
include/asm-powerpc/spu.h
Diffstat (limited to 'arch/powerpc/oprofile/common.c')
-rw-r--r-- | arch/powerpc/oprofile/common.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/oprofile/common.c b/arch/powerpc/oprofile/common.c index 5b1de7e8041e..27ad56bd227e 100644 --- a/arch/powerpc/oprofile/common.c +++ b/arch/powerpc/oprofile/common.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <asm/pmc.h> | 22 | #include <asm/pmc.h> |
23 | #include <asm/cputable.h> | 23 | #include <asm/cputable.h> |
24 | #include <asm/oprofile_impl.h> | 24 | #include <asm/oprofile_impl.h> |
25 | #include <asm/firmware.h> | ||
25 | 26 | ||
26 | static struct op_powerpc_model *model; | 27 | static struct op_powerpc_model *model; |
27 | 28 | ||
@@ -130,6 +131,9 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) | |||
130 | if (!cur_cpu_spec->oprofile_cpu_type) | 131 | if (!cur_cpu_spec->oprofile_cpu_type) |
131 | return -ENODEV; | 132 | return -ENODEV; |
132 | 133 | ||
134 | if (firmware_has_feature(FW_FEATURE_ISERIES)) | ||
135 | return -ENODEV; | ||
136 | |||
133 | switch (cur_cpu_spec->oprofile_type) { | 137 | switch (cur_cpu_spec->oprofile_type) { |
134 | #ifdef CONFIG_PPC64 | 138 | #ifdef CONFIG_PPC64 |
135 | case PPC_OPROFILE_RS64: | 139 | case PPC_OPROFILE_RS64: |
@@ -162,7 +166,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) | |||
162 | ops->stop = op_powerpc_stop; | 166 | ops->stop = op_powerpc_stop; |
163 | ops->backtrace = op_powerpc_backtrace; | 167 | ops->backtrace = op_powerpc_backtrace; |
164 | 168 | ||
165 | printk(KERN_INFO "oprofile: using %s performance monitoring.\n", | 169 | printk(KERN_DEBUG "oprofile: using %s performance monitoring.\n", |
166 | ops->cpu_type); | 170 | ops->cpu_type); |
167 | 171 | ||
168 | return 0; | 172 | return 0; |