aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/cpuid.c
diff options
context:
space:
mode:
authorJosef "Jeff" Sipek <jsipek@cs.sunysb.edu>2006-12-08 05:36:42 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:28:42 -0500
commitaab4c5a51cd6defc374ba1961c996781656d5283 (patch)
tree468a43a566158ebf2293df40da92415accced65a /arch/i386/kernel/cpuid.c
parent20d29372d3facfd078b4c7703637b951914d6759 (diff)
[PATCH] i386: change uses of f_{dentry, vfsmnt} to use f_path
Change all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt} in the i386 arch code. Signed-off-by: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/kernel/cpuid.c')
-rw-r--r--arch/i386/kernel/cpuid.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/cpuid.c b/arch/i386/kernel/cpuid.c
index db6dd20c358..51130b39cd2 100644
--- a/arch/i386/kernel/cpuid.c
+++ b/arch/i386/kernel/cpuid.c
@@ -116,7 +116,7 @@ static ssize_t cpuid_read(struct file *file, char __user *buf,
116 char __user *tmp = buf; 116 char __user *tmp = buf;
117 u32 data[4]; 117 u32 data[4];
118 u32 reg = *ppos; 118 u32 reg = *ppos;
119 int cpu = iminor(file->f_dentry->d_inode); 119 int cpu = iminor(file->f_path.dentry->d_inode);
120 120
121 if (count % 16) 121 if (count % 16)
122 return -EINVAL; /* Invalid chunk size */ 122 return -EINVAL; /* Invalid chunk size */
@@ -134,7 +134,7 @@ static ssize_t cpuid_read(struct file *file, char __user *buf,
134 134
135static int cpuid_open(struct inode *inode, struct file *file) 135static int cpuid_open(struct inode *inode, struct file *file)
136{ 136{
137 unsigned int cpu = iminor(file->f_dentry->d_inode); 137 unsigned int cpu = iminor(file->f_path.dentry->d_inode);
138 struct cpuinfo_x86 *c = &(cpu_data)[cpu]; 138 struct cpuinfo_x86 *c = &(cpu_data)[cpu];
139 139
140 if (cpu >= NR_CPUS || !cpu_online(cpu)) 140 if (cpu >= NR_CPUS || !cpu_online(cpu))