diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/i386/kernel/cpuid.c | 4 | ||||
-rw-r--r-- | arch/i386/kernel/msr.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/i386/kernel/cpuid.c b/arch/i386/kernel/cpuid.c index db6dd20c3589..51130b39cd2e 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 | ||
135 | static int cpuid_open(struct inode *inode, struct file *file) | 135 | static 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)) |
diff --git a/arch/i386/kernel/msr.c b/arch/i386/kernel/msr.c index 1d1a56cae340..4a472a17d1c6 100644 --- a/arch/i386/kernel/msr.c +++ b/arch/i386/kernel/msr.c | |||
@@ -172,7 +172,7 @@ static ssize_t msr_read(struct file *file, char __user * buf, | |||
172 | u32 __user *tmp = (u32 __user *) buf; | 172 | u32 __user *tmp = (u32 __user *) buf; |
173 | u32 data[2]; | 173 | u32 data[2]; |
174 | u32 reg = *ppos; | 174 | u32 reg = *ppos; |
175 | int cpu = iminor(file->f_dentry->d_inode); | 175 | int cpu = iminor(file->f_path.dentry->d_inode); |
176 | int err; | 176 | int err; |
177 | 177 | ||
178 | if (count % 8) | 178 | if (count % 8) |
@@ -196,7 +196,7 @@ static ssize_t msr_write(struct file *file, const char __user *buf, | |||
196 | const u32 __user *tmp = (const u32 __user *)buf; | 196 | const u32 __user *tmp = (const u32 __user *)buf; |
197 | u32 data[2]; | 197 | u32 data[2]; |
198 | u32 reg = *ppos; | 198 | u32 reg = *ppos; |
199 | int cpu = iminor(file->f_dentry->d_inode); | 199 | int cpu = iminor(file->f_path.dentry->d_inode); |
200 | int err; | 200 | int err; |
201 | 201 | ||
202 | if (count % 8) | 202 | if (count % 8) |
@@ -216,7 +216,7 @@ static ssize_t msr_write(struct file *file, const char __user *buf, | |||
216 | 216 | ||
217 | static int msr_open(struct inode *inode, struct file *file) | 217 | static int msr_open(struct inode *inode, struct file *file) |
218 | { | 218 | { |
219 | unsigned int cpu = iminor(file->f_dentry->d_inode); | 219 | unsigned int cpu = iminor(file->f_path.dentry->d_inode); |
220 | struct cpuinfo_x86 *c = &(cpu_data)[cpu]; | 220 | struct cpuinfo_x86 *c = &(cpu_data)[cpu]; |
221 | 221 | ||
222 | if (cpu >= NR_CPUS || !cpu_online(cpu)) | 222 | if (cpu >= NR_CPUS || !cpu_online(cpu)) |