android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ocfs2: remove __mlog_cpu_guess

Browse Source 
raw_smp_processor_id() is the means of avoiding the runtime preemptibility
check.

[akpm@linux-foundation.org: fix printk warning]
Cc: Joe Perches <joe@perches.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andrew Morton 2015-06-24 16:54:56 -07:00 committed by Linus Torvalds
parent 7c2bd2f930
commit e327284abb
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fs/ocfs2/cluster/masklog.c
View File

@ -64,19 +64,6 @@ static ssize_t mlog_mask_store(u64 mask, const char *buf, size_t count)
return count; return count;
} }
/*
* smp_processor_id() "helpfully" screams when called outside preemptible
* regions in current kernels. sles doesn't have the variants that don't
* scream. just do this instead of trying to guess which we're building
* against.. *sigh*.
*/
#define __mlog_cpu_guess \
({ \
unsigned long _cpu = get_cpu(); \
put_cpu(); \
_cpu; \
})
void __mlog_printk(const u64 *mask, const char *func, int line, void __mlog_printk(const u64 *mask, const char *func, int line,
const char *fmt, ...) const char *fmt, ...)
{ {
@ -103,9 +90,9 @@ void __mlog_printk(const u64 *mask, const char *func, int line,
vaf.fmt = fmt; vaf.fmt = fmt;
vaf.va = &args; vaf.va = &args;
printk("%s(%s,%u,%lu):%s:%d %s%pV", printk("%s(%s,%u,%u):%s:%d %s%pV",
level, current->comm, task_pid_nr(current), __mlog_cpu_guess, level, current->comm, task_pid_nr(current),
func, line, prefix, &vaf); raw_smp_processor_id(), func, line, prefix, &vaf);
va_end(args); va_end(args);
} }