Commit 5909af06 authored by Linus Torvalds's avatar Linus Torvalds

Get rid of silly printk's in recent mtrr driver changes.

parent 2ce208e5
...@@ -27,21 +27,15 @@ mtrr_file_add(unsigned long base, unsigned long size, ...@@ -27,21 +27,15 @@ mtrr_file_add(unsigned long base, unsigned long size,
max = num_var_ranges; max = num_var_ranges;
if (fcount == NULL) { if (fcount == NULL) {
if ((fcount = fcount = kmalloc(max * sizeof *fcount, GFP_KERNEL);
kmalloc(max * sizeof *fcount, GFP_KERNEL)) == NULL) { if (!fcount)
printk("mtrr: could not allocate\n");
return -ENOMEM; return -ENOMEM;
}
memset(fcount, 0, max * sizeof *fcount); memset(fcount, 0, max * sizeof *fcount);
FILE_FCOUNT(file) = fcount; FILE_FCOUNT(file) = fcount;
} }
if (!page) { if (!page) {
if ((base & (PAGE_SIZE - 1)) || (size & (PAGE_SIZE - 1))) { if ((base & (PAGE_SIZE - 1)) || (size & (PAGE_SIZE - 1)))
printk
("mtrr: size and base must be multiples of 4 kiB\n");
printk("mtrr: size: 0x%lx base: 0x%lx\n", size, base);
return -EINVAL; return -EINVAL;
}
base >>= PAGE_SHIFT; base >>= PAGE_SHIFT;
size >>= PAGE_SHIFT; size >>= PAGE_SHIFT;
} }
...@@ -59,12 +53,8 @@ mtrr_file_del(unsigned long base, unsigned long size, ...@@ -59,12 +53,8 @@ mtrr_file_del(unsigned long base, unsigned long size,
unsigned int *fcount = file->private_data; unsigned int *fcount = file->private_data;
if (!page) { if (!page) {
if ((base & (PAGE_SIZE - 1)) || (size & (PAGE_SIZE - 1))) { if ((base & (PAGE_SIZE - 1)) || (size & (PAGE_SIZE - 1)))
printk
("mtrr: size and base must be multiples of 4 kiB\n");
printk("mtrr: size: 0x%lx base: 0x%lx\n", size, base);
return -EINVAL; return -EINVAL;
}
base >>= PAGE_SHIFT; base >>= PAGE_SHIFT;
size >>= PAGE_SHIFT; size >>= PAGE_SHIFT;
} }
...@@ -161,8 +151,6 @@ mtrr_ioctl(struct inode *inode, struct file *file, ...@@ -161,8 +151,6 @@ mtrr_ioctl(struct inode *inode, struct file *file,
struct mtrr_sentry sentry; struct mtrr_sentry sentry;
struct mtrr_gentry gentry; struct mtrr_gentry gentry;
printk("mtrr_ioctl %d\n", cmd);
switch (cmd) { switch (cmd) {
default: default:
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
......
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