oprofile: Convert oprofilefs_lock to raw_spinlock
Subsystems (2)
PATCH 1/1 oprofile: Convert oprofilefs_lock to raw_spinlock
oprofilefs_lock needs to be a real spinlock on preempt-rt. Convert it to a raw_spinlock. No change for !RT kernels.
Signed-off-by Thomas Gleixner <[email protected]>
Cc Robert Richter <[email protected]>
--- arch/arm/oprofile/common.c | 4 ++-- arch/x86/oprofile/nmi_int.c | 4 ++-- drivers/oprofile/event_buffer.c | 4 ++-- drivers/oprofile/oprofilefs.c | 6 +++--- include/linux/oprofile.h | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-)
arch/arm/oprofile/common.c +2 -2
@@ -48,9 +48,9 @@ static int op_arm_setup(void) {int ret; -spin_lock (&oprofilefs_lock); +raw_spin_lock (&oprofilefs_lock); ret = op_arm_model->setup_ctrs (); -spin_unlock (&oprofilefs_lock); +raw_spin_unlock (&oprofilefs_lock);return ret; }
arch/x86/oprofile/nmi_int.c +2 -2
@@ -321,10 +321,10 @@ static void nmi_cpu_setup(void *dummy)int cpu =smp_processor_id ();struct op_msrs *msrs = &per_cpu (cpu_msrs, cpu);nmi_cpu_save_registers (msrs); -spin_lock (&oprofilefs_lock); +raw_spin_lock (&oprofilefs_lock); model->setup_ctrs (model, msrs);nmi_cpu_setup_mux (cpu, msrs); -spin_unlock (&oprofilefs_lock); +raw_spin_unlock (&oprofilefs_lock);per_cpu (saved_lvtpc, cpu) =apic_read (APIC_LVTPC );apic_write (APIC_LVTPC ,APIC_DM_NMI ); }
drivers/oprofile/event_buffer.c +2 -2
@@ -82,10 +82,10 @@ int alloc_event_buffer(void) {unsigned long flags; -spin_lock_irqsave (&oprofilefs_lock, flags); +raw_spin_lock_irqsave (&oprofilefs_lock, flags); buffer_size = oprofile_buffer_size; buffer_watershed = oprofile_buffer_watershed; -spin_unlock_irqrestore (&oprofilefs_lock, flags); +raw_spin_unlock_irqrestore (&oprofilefs_lock, flags);if (buffer_watershed >= buffer_size)return -EINVAL ;
drivers/oprofile/oprofilefs.c +3 -3
@@ -21,7 +21,7 @@#define OPROFILEFS_MAGIC 0x6f70726f -DEFINE_SPINLOCK (oprofilefs_lock); +DEFINE_RAW_SPINLOCK (oprofilefs_lock);static struct inode *oprofilefs_get_inode (struct super_block *sb,int mode) {
@@ -75,9 +75,9 @@ int oprofilefs_ulong_from_user(unsignedif (copy_from_user (tmpbuf, buf, count))return -EFAULT ; -spin_lock_irqsave (&oprofilefs_lock, flags); +raw_spin_lock_irqsave (&oprofilefs_lock, flags); *val =simple_strtoul (tmpbuf,NULL ,0 ); -spin_unlock_irqrestore (&oprofilefs_lock, flags); +raw_spin_unlock_irqrestore (&oprofilefs_lock, flags);return 0 ; }
include/linux/oprofile.h +1 -1
@@ -156,7 +156,7 @@ ssize_t oprofilefs_ulong_to_user(unsigneint oprofilefs_ulong_from_user (unsigned long * val,char const __user * buf,size_t count);/** lock for read/write safety */ -extern spinlock_t oprofilefs_lock; +extern raw_spinlock_t oprofilefs_lock;/** * Add the contents of a circular buffer to the event buffer.
Quoted 5 lines · Thomas Gleixner
oprofilefs_lockneeds to be a real spinlock on preempt-rt. Convert it to araw_spinlock. No change for !RT kernels.Signed-off-by Thomas Gleixner <[email protected]>Cc Robert Richter <[email protected]>
Quoted 7 lines
--- arch/arm/oprofile/common.c | 4 ++-- arch/x86/oprofile/nmi_int.c | 4 ++-- drivers/oprofile/event_buffer.c | 4 ++-- drivers/oprofile/oprofilefs.c | 6 +++--- include/linux/oprofile.h | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-)
Acked-by Robert Richter <[email protected]>
Thomas, do you want to send it upstream via RT updates?
-Robert
Signature · 3 lines
Advanced Micro Devices, Inc. Operating System Research Center email: [email protected]