vserver 1.9.5.x5

[linux-2.6.git] / fs / xfs / linux-2.6 / xfs_linux.h

diff --git a/fs/xfs/linux-2.6/xfs_linux.h b/fs/xfs/linux-2.6/xfs_linux.h
index bbf4ef4..42e2c26 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_linux.h
+++ b/fs/xfs/linux-2.6/xfs_linux.h
@@ -142,8 +142,12 @@ static inline void set_buffer_unwritten_io(struct buffer_head *bh)
 #define xfs_buf_timer_centisecs        xfs_params.xfs_buf_timer.val
 #define xfs_buf_age_centisecs  xfs_params.xfs_buf_age.val
 #define xfs_inherit_nosymlinks xfs_params.inherit_nosym.val
+#define xfs_rotorstep          xfs_params.rotorstep.val
 
-#define current_cpu()          smp_processor_id()
+#ifndef __smp_processor_id
+#define __smp_processor_id()   smp_processor_id()
+#endif
+#define current_cpu()          __smp_processor_id()
 #define current_pid()          (current->pid)
 #define current_fsuid(cred)    (current->fsuid)
 #define current_fsgid(cred)    (current->fsgid)