mirror of
https://github.com/SCST-project/scst.git
synced 2026-07-20 15:02:18 +00:00
scst.h, scst_debug.h, scst_pres.h: RHEL 5.3 build fix
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4601 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
@@ -3039,7 +3039,11 @@ static inline bool scst_cmd_atomic(struct scst_cmd *cmd)
|
||||
*/
|
||||
if (unlikely((in_atomic() || in_interrupt() || irqs_disabled()) &&
|
||||
!res)) {
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 28)
|
||||
printk(KERN_ERR "ERROR: atomic context and non-atomic cmd!\n");
|
||||
#else
|
||||
pr_err("ERROR: atomic context and non-atomic cmd!\n");
|
||||
#endif
|
||||
dump_stack();
|
||||
cmd->atomic = 1;
|
||||
res = 1;
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
* 311d0761 - Introduction of pr_cont() in <linux/kernel.h>.
|
||||
* 968ab183 - Moved pr_info() etc. from <linux/kernel.h> to <linux/printk.h>
|
||||
*/
|
||||
#ifndef pr_info
|
||||
#ifndef pr_emerg
|
||||
#ifndef pr_fmt
|
||||
#define pr_fmt(fmt) fmt
|
||||
#endif
|
||||
@@ -57,6 +57,8 @@
|
||||
#define pr_warn pr_warning
|
||||
#define pr_notice(fmt, ...) \
|
||||
printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__)
|
||||
#endif
|
||||
#ifndef pr_info
|
||||
#define pr_info(fmt, ...) \
|
||||
printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
|
||||
#endif
|
||||
|
||||
@@ -20,6 +20,11 @@
|
||||
#define SCST_PRES_H_
|
||||
|
||||
#include <linux/delay.h>
|
||||
#ifdef INSIDE_KERNEL_TREE
|
||||
#include <scst/scst_debug.h>
|
||||
#else
|
||||
#include "scst_debug.h"
|
||||
#endif
|
||||
|
||||
#define PR_REGISTER 0x00
|
||||
#define PR_RESERVE 0x01
|
||||
|
||||
Reference in New Issue
Block a user