diff options
author | Jan Glauber <jang@linux.vnet.ibm.com> | 2011-05-23 04:24:46 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-05-23 04:24:32 -0400 |
commit | 43a679d6c9f59d7aa20443d43d8041ea9d9aa363 (patch) | |
tree | 08cf1c9bdf236badacd4a94e93b944f5c34fbe85 /arch/s390/oprofile | |
parent | 9529cdc51f36ca0c87ce0246627c5951c40cbc01 (diff) |
[S390] s390,oprofile: fix compile error for !CONFIG_SMP
Use ctl_set_bit instead of the smp_ctl_set_bit (likewise for clear bit)
to prevent the following build error for !CONFIG_SMP:
CC arch/s390/oprofile/hwsampler.o
arch/s390/oprofile/hwsampler.c: In function ‘hwsampler_deallocate’:
arch/s390/oprofile/hwsampler.c:1012: error: implicit declaration of function ‘smp_ctl_clear_bit’
arch/s390/oprofile/hwsampler.c: In function ‘hwsampler_start_all’:
arch/s390/oprofile/hwsampler.c:1201: error: implicit declaration of function ‘smp_ctl_set_bit’
CC kernel/seccomp.o
make[1]: *** [arch/s390/oprofile/hwsampler.o] Error 1
make: *** [arch/s390/oprofile] Error 2
Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/oprofile')
-rw-r--r-- | arch/s390/oprofile/hwsampler.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/oprofile/hwsampler.c b/arch/s390/oprofile/hwsampler.c index 90c5a8770a99..8e686bfe2959 100644 --- a/arch/s390/oprofile/hwsampler.c +++ b/arch/s390/oprofile/hwsampler.c | |||
@@ -1009,7 +1009,7 @@ int hwsampler_deallocate() | |||
1009 | if (hws_state != HWS_STOPPED) | 1009 | if (hws_state != HWS_STOPPED) |
1010 | goto deallocate_exit; | 1010 | goto deallocate_exit; |
1011 | 1011 | ||
1012 | smp_ctl_clear_bit(0, 5); /* set bit 58 CR0 off */ | 1012 | ctl_clear_bit(0, 5); /* set bit 58 CR0 off */ |
1013 | deallocate_sdbt(); | 1013 | deallocate_sdbt(); |
1014 | 1014 | ||
1015 | hws_state = HWS_DEALLOCATED; | 1015 | hws_state = HWS_DEALLOCATED; |
@@ -1123,7 +1123,7 @@ int hwsampler_shutdown() | |||
1123 | mutex_lock(&hws_sem); | 1123 | mutex_lock(&hws_sem); |
1124 | 1124 | ||
1125 | if (hws_state == HWS_STOPPED) { | 1125 | if (hws_state == HWS_STOPPED) { |
1126 | smp_ctl_clear_bit(0, 5); /* set bit 58 CR0 off */ | 1126 | ctl_clear_bit(0, 5); /* set bit 58 CR0 off */ |
1127 | deallocate_sdbt(); | 1127 | deallocate_sdbt(); |
1128 | } | 1128 | } |
1129 | if (hws_wq) { | 1129 | if (hws_wq) { |
@@ -1198,7 +1198,7 @@ start_all_exit: | |||
1198 | hws_oom = 1; | 1198 | hws_oom = 1; |
1199 | hws_flush_all = 0; | 1199 | hws_flush_all = 0; |
1200 | /* now let them in, 1407 CPUMF external interrupts */ | 1200 | /* now let them in, 1407 CPUMF external interrupts */ |
1201 | smp_ctl_set_bit(0, 5); /* set CR0 bit 58 */ | 1201 | ctl_set_bit(0, 5); /* set CR0 bit 58 */ |
1202 | 1202 | ||
1203 | return 0; | 1203 | return 0; |
1204 | } | 1204 | } |