Commit 0610d50c authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] Lindent arch/i386/kernel/cpuid.c

From: Hanna Linder <hannal@us.ibm.com>

Per Greg's request this is a patch of having run Lindent on cpuid.c.  The
tabs were not the right number of spaces before.  I have verified it still
compiles and boots with this "change".
parent b5c64411
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
* *
* ----------------------------------------------------------------------- */ * ----------------------------------------------------------------------- */
/* /*
* cpuid.c * cpuid.c
* *
...@@ -53,18 +52,19 @@ struct cpuid_command { ...@@ -53,18 +52,19 @@ struct cpuid_command {
static void cpuid_smp_cpuid(void *cmd_block) static void cpuid_smp_cpuid(void *cmd_block)
{ {
struct cpuid_command *cmd = (struct cpuid_command *) cmd_block; struct cpuid_command *cmd = (struct cpuid_command *)cmd_block;
if ( cmd->cpu == smp_processor_id() ) if (cmd->cpu == smp_processor_id())
cpuid(cmd->reg, &cmd->data[0], &cmd->data[1], &cmd->data[2], &cmd->data[3]); cpuid(cmd->reg, &cmd->data[0], &cmd->data[1], &cmd->data[2],
&cmd->data[3]);
} }
static inline void do_cpuid(int cpu, u32 reg, u32 *data) static inline void do_cpuid(int cpu, u32 reg, u32 * data)
{ {
struct cpuid_command cmd; struct cpuid_command cmd;
preempt_disable(); preempt_disable();
if ( cpu == smp_processor_id() ) { if (cpu == smp_processor_id()) {
cpuid(reg, &data[0], &data[1], &data[2], &data[3]); cpuid(reg, &data[0], &data[1], &data[2], &data[3]);
} else { } else {
cmd.cpu = cpu; cmd.cpu = cpu;
...@@ -77,7 +77,7 @@ static inline void do_cpuid(int cpu, u32 reg, u32 *data) ...@@ -77,7 +77,7 @@ static inline void do_cpuid(int cpu, u32 reg, u32 *data)
} }
#else /* ! CONFIG_SMP */ #else /* ! CONFIG_SMP */
static inline void do_cpuid(int cpu, u32 reg, u32 *data) static inline void do_cpuid(int cpu, u32 reg, u32 * data)
{ {
cpuid(reg, &data[0], &data[1], &data[2], &data[3]); cpuid(reg, &data[0], &data[1], &data[2], &data[3]);
} }
...@@ -107,21 +107,21 @@ static loff_t cpuid_seek(struct file *file, loff_t offset, int orig) ...@@ -107,21 +107,21 @@ static loff_t cpuid_seek(struct file *file, loff_t offset, int orig)
return ret; return ret;
} }
static ssize_t cpuid_read(struct file * file, char * buf, static ssize_t cpuid_read(struct file *file, char *buf,
size_t count, loff_t *ppos) size_t count, loff_t * ppos)
{ {
u32 *tmp = (u32 *)buf; u32 *tmp = (u32 *) buf;
u32 data[4]; u32 data[4];
size_t rv; size_t rv;
u32 reg = *ppos; u32 reg = *ppos;
int cpu = iminor(file->f_dentry->d_inode); int cpu = iminor(file->f_dentry->d_inode);
if ( count % 16 ) if (count % 16)
return -EINVAL; /* Invalid chunk size */ return -EINVAL; /* Invalid chunk size */
for ( rv = 0 ; count ; count -= 16 ) { for (rv = 0; count; count -= 16) {
do_cpuid(cpu, reg, data); do_cpuid(cpu, reg, data);
if ( copy_to_user(tmp,&data,16) ) if (copy_to_user(tmp, &data, 16))
return -EFAULT; return -EFAULT;
tmp += 4; tmp += 4;
*ppos = reg++; *ppos = reg++;
...@@ -137,7 +137,7 @@ static int cpuid_open(struct inode *inode, struct file *file) ...@@ -137,7 +137,7 @@ static int cpuid_open(struct inode *inode, struct file *file)
if (!cpu_online(cpu)) if (!cpu_online(cpu))
return -ENXIO; /* No such CPU */ return -ENXIO; /* No such CPU */
if ( c->cpuid_level < 0 ) if (c->cpuid_level < 0)
return -EIO; /* CPUID not supported */ return -EIO; /* CPUID not supported */
return 0; return 0;
...@@ -170,7 +170,7 @@ void __exit cpuid_exit(void) ...@@ -170,7 +170,7 @@ void __exit cpuid_exit(void)
} }
module_init(cpuid_init); module_init(cpuid_init);
module_exit(cpuid_exit) module_exit(cpuid_exit);
MODULE_AUTHOR("H. Peter Anvin <hpa@zytor.com>"); MODULE_AUTHOR("H. Peter Anvin <hpa@zytor.com>");
MODULE_DESCRIPTION("x86 generic CPUID driver"); MODULE_DESCRIPTION("x86 generic CPUID driver");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment