Skip to content

Commit

Permalink
[S390] oprofile: disable hw sampling for CONFIG_32BIT
Browse files Browse the repository at this point in the history
Doesn't work and build for CONFIG_32BIT. So disable it.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  • Loading branch information
Heiko Carstens authored and Martin Schwidefsky committed Mar 23, 2011
1 parent 894e491 commit 984e848
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
3 changes: 2 additions & 1 deletion arch/s390/oprofile/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
oprofilefs.o oprofile_stats.o \
timer_int.o )

oprofile-y := $(DRIVER_OBJS) init.o backtrace.o hwsampler.o
oprofile-y := $(DRIVER_OBJS) init.o backtrace.o
oprofile-$(CONFIG_64BIT) += hwsampler.o
15 changes: 13 additions & 2 deletions arch/s390/oprofile/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
#include <linux/fs.h>

#include "../../../drivers/oprofile/oprof.h"

extern void s390_backtrace(struct pt_regs * const regs, unsigned int depth);

#ifdef CONFIG_64BIT

#include "hwsampler.h"

#define DEFAULT_INTERVAL 4096
Expand All @@ -37,8 +42,6 @@ static int hwsampler_running; /* start_mutex must be held to change */

static struct oprofile_operations timer_ops;

extern void s390_backtrace(struct pt_regs * const regs, unsigned int depth);

static int oprofile_hwsampler_start(void)
{
int retval;
Expand Down Expand Up @@ -172,14 +175,22 @@ static void oprofile_hwsampler_exit(void)
hwsampler_shutdown();
}

#endif /* CONFIG_64BIT */

int __init oprofile_arch_init(struct oprofile_operations *ops)
{
ops->backtrace = s390_backtrace;

#ifdef CONFIG_64BIT
return oprofile_hwsampler_init(ops);
#else
return -ENODEV;
#endif
}

void oprofile_arch_exit(void)
{
#ifdef CONFIG_64BIT
oprofile_hwsampler_exit();
#endif
}

0 comments on commit 984e848

Please sign in to comment.