|
@@ -39,10 +39,10 @@
|
|
|
#include <linux/device.h>
|
|
|
#include <linux/cpu.h>
|
|
|
#include <linux/notifier.h>
|
|
|
+#include <linux/uaccess.h>
|
|
|
|
|
|
#include <asm/processor.h>
|
|
|
#include <asm/msr.h>
|
|
|
-#include <asm/uaccess.h>
|
|
|
#include <asm/system.h>
|
|
|
|
|
|
static struct class *cpuid_class;
|
|
@@ -82,7 +82,7 @@ static loff_t cpuid_seek(struct file *file, loff_t offset, int orig)
|
|
|
}
|
|
|
|
|
|
static ssize_t cpuid_read(struct file *file, char __user *buf,
|
|
|
- size_t count, loff_t * ppos)
|
|
|
+ size_t count, loff_t *ppos)
|
|
|
{
|
|
|
char __user *tmp = buf;
|
|
|
struct cpuid_regs cmd;
|
|
@@ -117,7 +117,7 @@ static int cpuid_open(struct inode *inode, struct file *file)
|
|
|
unsigned int cpu;
|
|
|
struct cpuinfo_x86 *c;
|
|
|
int ret = 0;
|
|
|
-
|
|
|
+
|
|
|
lock_kernel();
|
|
|
|
|
|
cpu = iminor(file->f_path.dentry->d_inode);
|