Commit 984e8486 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] oprofile: disable hw sampling for CONFIG_32BIT 



Doesn't work and build for CONFIG_32BIT. So disable it.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 894e491e

arch/s390/oprofile/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -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

arch/s390/oprofile/init.c

+13 −2
Original line number Diff line number Diff line
@@ -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
@@ -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;
@@ -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

}