Commit e13a7aa5 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] misc fixes

- mpparse printk should be in hex (john stultz <johnstul@us.ibm.com>)

- fiddle with RCU copyright messages (Dipankar Sarma <dipankar@in.ibm.com>)

- use print_dev_t() for sysfs dev file in videodev.c (Gerd Knorr
  <kraxel@bytesex.org>)

- comx-hw-munich.c 64-bit warning fix (Vinay K Nallamothu
  <vinay.nallamothu@gsecone.com>)

- random.c return val fix
parent 9230fbc5
...@@ -169,7 +169,7 @@ void __init MP_processor_info (struct mpc_config_processor *m) ...@@ -169,7 +169,7 @@ void __init MP_processor_info (struct mpc_config_processor *m)
if (num_processors >= NR_CPUS) { if (num_processors >= NR_CPUS) {
printk(KERN_WARNING "NR_CPUS limit of %i reached. Cannot " printk(KERN_WARNING "NR_CPUS limit of %i reached. Cannot "
"boot CPU(apicid 0x%d).\n", NR_CPUS, m->mpc_apicid); "boot CPU(apicid 0x%x).\n", NR_CPUS, m->mpc_apicid);
return; return;
} }
num_processors++; num_processors++;
......
...@@ -1735,7 +1735,7 @@ random_ioctl(struct inode * inode, struct file * file, ...@@ -1735,7 +1735,7 @@ random_ioctl(struct inode * inode, struct file * file,
tmp = kmalloc(size * sizeof(__u32), GFP_KERNEL); tmp = kmalloc(size * sizeof(__u32), GFP_KERNEL);
if (!tmp) if (!tmp)
return -EFAULT; return -ENOMEM;
spin_lock_irqsave(&random_state->lock, flags); spin_lock_irqsave(&random_state->lock, flags);
ent_count = random_state->entropy_count; ent_count = random_state->entropy_count;
......
...@@ -52,7 +52,7 @@ static ssize_t show_dev(struct class_device *cd, char *buf) ...@@ -52,7 +52,7 @@ static ssize_t show_dev(struct class_device *cd, char *buf)
{ {
struct video_device *vfd = container_of(cd, struct video_device, class_dev); struct video_device *vfd = container_of(cd, struct video_device, class_dev);
dev_t dev = MKDEV(VIDEO_MAJOR, vfd->minor); dev_t dev = MKDEV(VIDEO_MAJOR, vfd->minor);
return sprintf(buf,"%04x\n",old_encode_dev(dev)); return print_dev_t(buf,dev);
} }
static CLASS_DEVICE_ATTR(name, S_IRUGO, show_name, NULL); static CLASS_DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
......
...@@ -1849,7 +1849,7 @@ static int MUNICH_open(struct net_device *dev) ...@@ -1849,7 +1849,7 @@ static int MUNICH_open(struct net_device *dev)
if (board->isx21) if (board->isx21)
{ {
init_timer(&board->modemline_timer); init_timer(&board->modemline_timer);
board->modemline_timer.data = (unsigned int)board; board->modemline_timer.data = (unsigned long)board;
board->modemline_timer.function = pcicom_modemline; board->modemline_timer.function = pcicom_modemline;
board->modemline_timer.expires = jiffies + HZ; board->modemline_timer.expires = jiffies + HZ;
add_timer((struct timer_list *)&board->modemline_timer); add_timer((struct timer_list *)&board->modemline_timer);
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* Copyright (c) IBM Corporation, 2001 * Copyright (C) IBM Corporation, 2001
* *
* Author: Dipankar Sarma <dipankar@in.ibm.com> * Author: Dipankar Sarma <dipankar@in.ibm.com>
* *
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* Copyright (c) IBM Corporation, 2001 * Copyright (C) IBM Corporation, 2001
* *
* Author: Dipankar Sarma <dipankar@in.ibm.com> * Author: Dipankar Sarma <dipankar@in.ibm.com>
* *
......
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