bk://kernel.bkbits.net/gregkh/linux/driver-2.6
lxiep@ltcfwd.linux.ibm.com|ChangeSet|20040331232020|20180 lxiep
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/03/31 15:20:20-08:00 lxiep@ltcfwd.linux.ibm.com
# [PATCH] kobject_set_name() doesn't allocate enough space
#
# lib/kobject.c
# 2003/12/16 09:10:16-08:00 lxiep@ltcfwd.linux.ibm.com +3 -3
# kobject_set_name() doesn't allocate enough space
#
# ChangeSet
# 2004/03/31 12:15:48-08:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-driver-core
#
# drivers/char/vt.c
# 2004/03/31 12:15:46-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/03/26 14:24:35-08:00 romain@lievin.net
# [PATCH] tipar char driver (divide by zero)
#
# A patch about the tipar.c char driver has been sent on lkml by Sebastien
# Bourdeau. It fixes a divide-by-zero error when we try to read/write data
# after setting the timeout to 0.
#
# drivers/char/tipar.c
# 2004/03/21 13:11:11-08:00 romain@lievin.net +11 -5
# tipar char driver (divide by zero)
#
# ChangeSet
# 2004/03/26 12:12:33-08:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-driver-core
#
# drivers/video/fbmem.c
# 2004/03/26 12:12:31-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/char/vt.c
# 2004/03/26 12:12:31-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/03/25 10:44:05-08:00 hannal@us.ibm.com
# [PATCH] added class support to istallion.c
#
# Here is a patch to add class support to the Stallion Intelligent multiport
# serial driver.
#
# drivers/char/istallion.c
# 2004/03/23 16:49:29-08:00 hannal@us.ibm.com +10 -1
# added class support to istallion.c
#
# ChangeSet
# 2004/03/25 10:43:11-08:00 hannal@us.ibm.com
# [PATCH] added class support to stallion.c
#
# Here is a patch to add class support to the Stallion multiport
# serial driver.
#
# drivers/char/stallion.c
# 2004/03/19 17:28:08-08:00 hannal@us.ibm.com +9 -1
# added class support to stallion.c
#
# ChangeSet
# 2004/03/24 02:37:20-08:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-driver-core
#
# drivers/video/fbmem.c
# 2004/03/24 02:37:18-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/03/22 11:47:06-08:00 kronos@kronoz.cjb.net
# [PATCH] Sysfs for framebuffer
#
# the following patch (against 2.6.5-rc2) teaches fb to use class_simple.
# With this patch udev will automagically create device nodes for each
# framebuffer registered. Once all drivers are converted to
# framebuffer_{alloc,release} we can switch to our own class.
#
# This is what sysfs dir looks like:
#
# notebook:~# tree /sys/class/graphics/
# /sys/class/graphics/
# `-- fb0
# `-- dev
#
# drivers/video/fbmem.c
# 2004/03/20 07:17:26-08:00 kronos@kronoz.cjb.net +19 -0
# Sysfs for framebuffer
#
# ChangeSet
# 2004/03/20 13:16:54-08:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-driver-core
#
# drivers/char/vt.c
# 2004/03/20 13:16:51-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/03/19 16:39:37-08:00 hannal@us.ibm.com
# [PATCH] add class support to floppy tape driver zftape-init.c
#
# Here is a patch to add class support to zftape-init.c:
#
# MODULE_DESCRIPTION(ZFTAPE_VERSION " - "
# "VFS interface for the Linux floppy tape driver. "
# "Support for QIC-113 compatible volume table "
# "and builtin compression (lzrw3 algorithm)");
#
# I have verified it compiles but do not have the hardware to test it.
#
# drivers/char/ftape/zftape/zftape-init.c
# 2004/03/18 16:37:56-08:00 hannal@us.ibm.com +17 -0
# add class support to floppy tape driver zftape-init.c
#
# ChangeSet
# 2004/03/19 16:39:16-08:00 hannal@us.ibm.com
# [PATCH] QIC-02 tape drive hookup to classes in sysfs
#
# Here is a patch to hook up the qic02 tape device to have class
# support in sysfs. I have verified it compiles. I do not have access to
# the hardware to test. Could someone who does please verify?
#
# From the file:
# * This is a driver for the Wangtek 5150 tape drive with
# * a QIC-02 controller for ISA-PC type computers.
# * Hopefully it will work with other QIC-02 tape drives as well.
#
# drivers/char/tpqic02.c
# 2004/03/17 16:19:44-08:00 hannal@us.ibm.com +22 -0
# QIC-02 tape drive hookup to classes in sysfs
#
# ChangeSet
# 2004/03/19 14:15:17-08:00 greg@kroah.com
# Driver class: remove possible oops
#
# This happens when the device associated with a class device goes away before
# the class does.
#
# drivers/base/class.c
# 2004/03/19 06:14:46-08:00 greg@kroah.com +2 -4
# Driver class: remove possible oops
#
# This happens when the device associated with a class device goes away before
# the class does.
#
# ChangeSet
# 2004/03/19 13:12:46-08:00 greg@kroah.com
# VC: fix bug in vty_init() where vcs_init() was not called early enough.
#
# It was being used before initialized, not nice :(
#
# drivers/char/vt.c
# 2004/03/19 13:12:09-08:00 greg@kroah.com +2 -1
# VC: fix bug in vty_init() where vcs_init() was not called early enough.
#
# It was being used before initialized, not nice :(
#
# ChangeSet
# 2004/03/19 13:10:22-08:00 greg@kroah.com
# add sysfs support for vc devices.
#
# drivers/char/vc_screen.c
# 2004/03/19 13:10:12-08:00 greg@kroah.com +10 -0
# add sysfs support for vc devices.
#
# ChangeSet
# 2004/03/19 13:05:08-08:00 greg@kroah.com
# Driver Core: fix spaces instead of tabs problem in the Kconfig file.
#
# drivers/base/Kconfig
# 2004/03/19 13:05:01-08:00 greg@kroah.com +8 -8
# Driver Core: fix spaces instead of tabs problem in the Kconfig file.
#
diff -Nru a/drivers/base/Kconfig b/drivers/base/Kconfig
--- a/drivers/base/Kconfig Fri Apr 2 11:25:07 2004
+++ b/drivers/base/Kconfig Fri Apr 2 11:25:07 2004
@@ -9,14 +9,14 @@
the kernel tree does.
config DEBUG_DRIVER
- bool "Driver Core verbose debug messages"
- depends on DEBUG_KERNEL
- help
- Say Y here if you want the Driver core to produce a bunch of
- debug messages to the system log. Select this if you are having a
- problem with the driver core and want to see more of what is
- going on.
+ bool "Driver Core verbose debug messages"
+ depends on DEBUG_KERNEL
+ help
+ Say Y here if you want the Driver core to produce a bunch of
+ debug messages to the system log. Select this if you are having a
+ problem with the driver core and want to see more of what is
+ going on.
- If you are unsure about this, say N here.
+ If you are unsure about this, say N here.
endmenu
diff -Nru a/drivers/base/class.c b/drivers/base/class.c
--- a/drivers/base/class.c Fri Apr 2 11:25:07 2004
+++ b/drivers/base/class.c Fri Apr 2 11:25:07 2004
@@ -155,8 +155,7 @@
static void class_device_dev_unlink(struct class_device * class_dev)
{
- if (class_dev->dev)
- sysfs_remove_link(&class_dev->kobj, "device");
+ sysfs_remove_link(&class_dev->kobj, "device");
}
static int class_device_driver_link(struct class_device * class_dev)
@@ -169,8 +168,7 @@
static void class_device_driver_unlink(struct class_device * class_dev)
{
- if ((class_dev->dev) && (class_dev->dev->driver))
- sysfs_remove_link(&class_dev->kobj, "driver");
+ sysfs_remove_link(&class_dev->kobj, "driver");
}
diff -Nru a/drivers/char/ftape/zftape/zftape-init.c b/drivers/char/ftape/zftape/zftape-init.c
--- a/drivers/char/ftape/zftape/zftape-init.c Fri Apr 2 11:25:07 2004
+++ b/drivers/char/ftape/zftape/zftape-init.c Fri Apr 2 11:25:07 2004
@@ -38,6 +38,7 @@
#include <linux/zftape.h>
#include <linux/init.h>
+#include <linux/device.h>
#include "../zftape/zftape-init.h"
#include "../zftape/zftape-read.h"
@@ -103,6 +104,8 @@
.release = zft_close,
};
+static struct class_simple *zft_class;
+
/* Open floppy tape device
*/
static int zft_open(struct inode *ino, struct file *filep)
@@ -341,22 +344,29 @@
"installing zftape VFS interface for ftape driver ...");
TRACE_CATCH(register_chrdev(QIC117_TAPE_MAJOR, "zft", &zft_cdev),);
+ zft_class = class_simple_create(THIS_MODULE, "zft");
for (i = 0; i < 4; i++) {
+ class_simple_device_add(zft_class, MKDEV(QIC117_TAPE_MAJOR, i), NULL, "qft%i", i);
devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i),
S_IFCHR | S_IRUSR | S_IWUSR,
"qft%i", i);
+ class_simple_device_add(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 4), NULL, "nqft%i", i);
devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 4),
S_IFCHR | S_IRUSR | S_IWUSR,
"nqft%i", i);
+ class_simple_device_add(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 16), NULL, "zqft%i", i);
devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 16),
S_IFCHR | S_IRUSR | S_IWUSR,
"zqft%i", i);
+ class_simple_device_add(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 20), NULL, "nzqft%i", i);
devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 20),
S_IFCHR | S_IRUSR | S_IWUSR,
"nzqft%i", i);
+ class_simple_device_add(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 32), NULL, "rawqft%i", i);
devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 32),
S_IFCHR | S_IRUSR | S_IWUSR,
"rawqft%i", i);
+ class_simple_device_add(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 36), NULL, "nrawrawqft%i", i);
devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 36),
S_IFCHR | S_IRUSR | S_IWUSR,
"nrawqft%i", i);
@@ -386,12 +396,19 @@
}
for (i = 0; i < 4; i++) {
devfs_remove("qft%i", i);
+ class_simple_device_remove(MKDEV(QIC117_TAPE_MAJOR, i));
devfs_remove("nqft%i", i);
+ class_simple_device_remove(MKDEV(QIC117_TAPE_MAJOR, i + 4));
devfs_remove("zqft%i", i);
+ class_simple_device_remove(MKDEV(QIC117_TAPE_MAJOR, i + 16));
devfs_remove("nzqft%i", i);
+ class_simple_device_remove(MKDEV(QIC117_TAPE_MAJOR, i + 20));
devfs_remove("rawqft%i", i);
+ class_simple_device_remove(MKDEV(QIC117_TAPE_MAJOR, i + 32));
devfs_remove("nrawqft%i", i);
+ class_simple_device_remove(MKDEV(QIC117_TAPE_MAJOR, i + 36));
}
+ class_simple_destroy(zft_class);
zft_uninit_mem(); /* release remaining memory, if any */
printk(KERN_INFO "zftape successfully unloaded.\n");
TRACE_EXIT;
diff -Nru a/drivers/char/istallion.c b/drivers/char/istallion.c
--- a/drivers/char/istallion.c Fri Apr 2 11:25:07 2004
+++ b/drivers/char/istallion.c Fri Apr 2 11:25:07 2004
@@ -40,6 +40,7 @@
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/devfs_fs_kernel.h>
+#include <linux/device.h>
#include <asm/io.h>
#include <asm/uaccess.h>
@@ -795,6 +796,8 @@
/*****************************************************************************/
+static struct class_simple *istallion_class;
+
#ifdef MODULE
/*
@@ -853,9 +856,12 @@
return;
}
put_tty_driver(stli_serial);
- for (i = 0; i < 4; i++)
+ for (i = 0; i < 4; i++) {
devfs_remove("staliomem/%d", i);
+ class_simple_device_remove(MKDEV(STL_SIOMEMMAJOR, i));
+ }
devfs_remove("staliomem");
+ class_simple_destroy(istallion_class);
if ((i = unregister_chrdev(STL_SIOMEMMAJOR, "staliomem")))
printk("STALLION: failed to un-register serial memory device, "
"errno=%d\n", -i);
@@ -5311,10 +5317,13 @@
"device\n");
devfs_mk_dir("staliomem");
+ istallion_class = class_simple_create(THIS_MODULE, "staliomem");
for (i = 0; i < 4; i++) {
devfs_mk_cdev(MKDEV(STL_SIOMEMMAJOR, i),
S_IFCHR | S_IRUSR | S_IWUSR,
"staliomem/%d", i);
+ class_simple_device_add(istallion_class, MKDEV(STL_SIOMEMMAJOR, i),
+ NULL, "staliomem/%d", i);
}
/*
diff -Nru a/drivers/char/stallion.c b/drivers/char/stallion.c
--- a/drivers/char/stallion.c Fri Apr 2 11:25:07 2004
+++ b/drivers/char/stallion.c Fri Apr 2 11:25:07 2004
@@ -41,6 +41,7 @@
#include <linux/init.h>
#include <linux/smp_lock.h>
#include <linux/devfs_fs_kernel.h>
+#include <linux/device.h>
#include <asm/io.h>
#include <asm/uaccess.h>
@@ -732,6 +733,8 @@
/*****************************************************************************/
+static struct class_simple *stallion_class;
+
#ifdef MODULE
/*
@@ -788,12 +791,15 @@
restore_flags(flags);
return;
}
- for (i = 0; i < 4; i++)
+ for (i = 0; i < 4; i++) {
devfs_remove("staliomem/%d", i);
+ class_simple_device_remove(MKDEV(STL_SIOMEMMAJOR, i));
+ }
devfs_remove("staliomem");
if ((i = unregister_chrdev(STL_SIOMEMMAJOR, "staliomem")))
printk("STALLION: failed to un-register serial memory device, "
"errno=%d\n", -i);
+ class_simple_destroy(stallion_class);
if (stl_tmpwritebuf != (char *) NULL)
kfree(stl_tmpwritebuf);
@@ -3181,10 +3187,12 @@
printk("STALLION: failed to register serial board device\n");
devfs_mk_dir("staliomem");
+ stallion_class = class_simple_create(THIS_MODULE, "staliomem");
for (i = 0; i < 4; i++) {
devfs_mk_cdev(MKDEV(STL_SIOMEMMAJOR, i),
S_IFCHR|S_IRUSR|S_IWUSR,
"staliomem/%d", i);
+ class_simple_device_add(stallion_class, MKDEV(STL_SIOMEMMAJOR, i), NULL, "staliomem/%d", i);
}
stl_serial->owner = THIS_MODULE;
diff -Nru a/drivers/char/tipar.c b/drivers/char/tipar.c
--- a/drivers/char/tipar.c Fri Apr 2 11:25:07 2004
+++ b/drivers/char/tipar.c Fri Apr 2 11:25:07 2004
@@ -67,7 +67,7 @@
/*
* Version Information
*/
-#define DRIVER_VERSION "1.17"
+#define DRIVER_VERSION "1.19"
#define DRIVER_AUTHOR "Romain Lievin <roms@lpg.ticalc.org>"
#define DRIVER_DESC "Device driver for TI/PC parallel link cables"
#define DRIVER_LICENSE "GPL"
@@ -361,10 +361,13 @@
switch (cmd) {
case IOCTL_TIPAR_DELAY:
- delay = (int)arg; //get_user(delay, &arg);
- break;
+ delay = (int)arg; //get_user(delay, &arg);
+ break;
case IOCTL_TIPAR_TIMEOUT:
- timeout = (int)arg; //get_user(timeout, &arg);
+ if (arg != 0)
+ timeout = (int)arg;
+ else
+ retval = -EINVAL;
break;
default:
retval = -ENOTTY;
@@ -399,7 +402,10 @@
str = get_options(str, ARRAY_SIZE(ints), ints);
if (ints[0] > 0) {
- timeout = ints[1];
+ if (ints[1] != 0)
+ timeout = ints[1];
+ else
+ printk("tipar: wrong timeout value (0), using default value instead.");
if (ints[0] > 1) {
delay = ints[2];
}
diff -Nru a/drivers/char/tpqic02.c b/drivers/char/tpqic02.c
--- a/drivers/char/tpqic02.c Fri Apr 2 11:25:07 2004
+++ b/drivers/char/tpqic02.c Fri Apr 2 11:25:07 2004
@@ -94,6 +94,7 @@
#include <linux/init.h>
#include <linux/smp_lock.h>
#include <linux/devfs_fs_kernel.h>
+#include <linux/device.h>
#include <asm/dma.h>
#include <asm/system.h>
@@ -229,6 +230,8 @@
"600" /* untested. */
};
+static struct class_simple *tpqic02_class;
+
/* `exception_list' is needed for exception status reporting.
* Exceptions 1..14 are defined by QIC-02 rev F.
@@ -2696,23 +2699,32 @@
return -ENODEV;
}
+ tpqic02_class = class_simple_create(THIS_MODULE, TPQIC02_NAME);
+ class_simple_device_add(tpqic02_class, MKDEV(QIC02_TAPE_MAJOR, 2), NULL, "ntpqic11");
devfs_mk_cdev(MKDEV(QIC02_TAPE_MAJOR, 2),
S_IFCHR|S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP, "ntpqic11");
+ class_simple_device_add(tpqic02_class, MKDEV(QIC02_TAPE_MAJOR, 3), NULL, "tpqic11");
devfs_mk_cdev(MKDEV(QIC02_TAPE_MAJOR, 3),
S_IFCHR|S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP, "tpqic11");
+ class_simple_device_add(tpqic02_class, MKDEV(QIC02_TAPE_MAJOR, 4), NULL, "ntpqic24");
devfs_mk_cdev(MKDEV(QIC02_TAPE_MAJOR, 4),
S_IFCHR|S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP, "ntpqic24");
+ class_simple_device_add(tpqic02_class, MKDEV(QIC02_TAPE_MAJOR, 5), NULL, "tpqic24");
devfs_mk_cdev(MKDEV(QIC02_TAPE_MAJOR, 5),
S_IFCHR|S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP, "tpqic24");
+ class_simple_device_add(tpqic02_class, MKDEV(QIC02_TAPE_MAJOR, 6), NULL, "ntpqic20");
devfs_mk_cdev(MKDEV(QIC02_TAPE_MAJOR, 6),
S_IFCHR|S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP, "ntpqic120");
+ class_simple_device_add(tpqic02_class, MKDEV(QIC02_TAPE_MAJOR, 7), NULL, "tpqic20");
devfs_mk_cdev(MKDEV(QIC02_TAPE_MAJOR, 7),
S_IFCHR|S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP, "tpqic120");
+ class_simple_device_add(tpqic02_class, MKDEV(QIC02_TAPE_MAJOR, 8), NULL, "ntpqic50");
devfs_mk_cdev(MKDEV(QIC02_TAPE_MAJOR, 8),
S_IFCHR|S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP, "ntpqic150");
+ class_simple_device_add(tpqic02_class, MKDEV(QIC02_TAPE_MAJOR, 9), NULL, "tpqic50");
devfs_mk_cdev(MKDEV(QIC02_TAPE_MAJOR, 9),
S_IFCHR|S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP, "tpqic150");
@@ -2757,13 +2769,23 @@
qic02_release_resources();
devfs_remove("ntpqic11");
+ class_simple_device_remove(MKDEV(QIC02_TAPE_MAJOR, 2));
devfs_remove("tpqic11");
+ class_simple_device_remove(MKDEV(QIC02_TAPE_MAJOR, 3));
devfs_remove("ntpqic24");
+ class_simple_device_remove(MKDEV(QIC02_TAPE_MAJOR, 4));
devfs_remove("tpqic24");
+ class_simple_device_remove(MKDEV(QIC02_TAPE_MAJOR, 5));
devfs_remove("ntpqic120");
+ class_simple_device_remove(MKDEV(QIC02_TAPE_MAJOR, 6));
devfs_remove("tpqic120");
+ class_simple_device_remove(MKDEV(QIC02_TAPE_MAJOR, 7));
devfs_remove("ntpqic150");
+ class_simple_device_remove(MKDEV(QIC02_TAPE_MAJOR, 8));
devfs_remove("tpqic150");
+ class_simple_device_remove(MKDEV(QIC02_TAPE_MAJOR, 9));
+
+ class_simple_destroy(tpqic02_class);
}
static int qic02_module_init(void)
diff -Nru a/drivers/char/vc_screen.c b/drivers/char/vc_screen.c
--- a/drivers/char/vc_screen.c Fri Apr 2 11:25:07 2004
+++ b/drivers/char/vc_screen.c Fri Apr 2 11:25:07 2004
@@ -36,6 +36,7 @@
#include <linux/kbd_kern.h>
#include <linux/console.h>
#include <linux/smp_lock.h>
+#include <linux/device.h>
#include <asm/uaccess.h>
#include <asm/byteorder.h>
#include <asm/unaligned.h>
@@ -469,6 +470,8 @@
.open = vcs_open,
};
+static struct class_simple *vc_class;
+
void vcs_make_devfs(struct tty_struct *tty)
{
devfs_mk_cdev(MKDEV(VCS_MAJOR, tty->index + 1),
@@ -477,19 +480,26 @@
devfs_mk_cdev(MKDEV(VCS_MAJOR, tty->index + 129),
S_IFCHR|S_IRUSR|S_IWUSR,
"vcc/a%u", tty->index + 1);
+ class_simple_device_add(vc_class, MKDEV(VCS_MAJOR, tty->index + 1), NULL, "vcs%u", tty->index + 1);
+ class_simple_device_add(vc_class, MKDEV(VCS_MAJOR, tty->index + 129), NULL, "vcsa%u", tty->index + 1);
}
void vcs_remove_devfs(struct tty_struct *tty)
{
devfs_remove("vcc/%u", tty->index + 1);
devfs_remove("vcc/a%u", tty->index + 1);
+ class_simple_device_remove(MKDEV(VCS_MAJOR, tty->index + 1));
+ class_simple_device_remove(MKDEV(VCS_MAJOR, tty->index + 129));
}
int __init vcs_init(void)
{
if (register_chrdev(VCS_MAJOR, "vcs", &vcs_fops))
panic("unable to get major %d for vcs device", VCS_MAJOR);
+ vc_class = class_simple_create(THIS_MODULE, "vc");
devfs_mk_cdev(MKDEV(VCS_MAJOR, 0), S_IFCHR|S_IRUSR|S_IWUSR, "vcc/0");
devfs_mk_cdev(MKDEV(VCS_MAJOR, 128), S_IFCHR|S_IRUSR|S_IWUSR, "vcc/a0");
+ class_simple_device_add(vc_class, MKDEV(VCS_MAJOR, 0), NULL, "vcs");
+ class_simple_device_add(vc_class, MKDEV(VCS_MAJOR, 128), NULL, "vcsa");
return 0;
}
diff -Nru a/drivers/char/vt.c b/drivers/char/vt.c
--- a/drivers/char/vt.c Fri Apr 2 11:25:07 2004
+++ b/drivers/char/vt.c Fri Apr 2 11:25:07 2004
@@ -2603,6 +2603,8 @@
int __init vty_init(void)
{
+ vcs_init();
+
console_driver = alloc_tty_driver(MAX_NR_CONSOLES);
if (!console_driver)
panic("Couldn't allocate console driver\n");
@@ -2630,7 +2632,6 @@
#ifdef CONFIG_FRAMEBUFFER_CONSOLE
fb_console_init();
#endif
- vcs_init();
return 0;
}
diff -Nru a/drivers/video/fbmem.c b/drivers/video/fbmem.c
--- a/drivers/video/fbmem.c Fri Apr 2 11:25:07 2004
+++ b/drivers/video/fbmem.c Fri Apr 2 11:25:07 2004
@@ -32,6 +32,9 @@
#include <linux/kmod.h>
#endif
#include <linux/devfs_fs_kernel.h>
+#include <linux/err.h>
+#include <linux/kernel.h>
+#include <linux/device.h>
#if defined(__mc68000__) || defined(CONFIG_APUS)
#include <asm/setup.h>
@@ -1245,6 +1248,8 @@
#endif
};
+static struct class_simple *fb_class;
+
/**
* register_framebuffer - registers a frame buffer device
* @fb_info: frame buffer info structure
@@ -1259,6 +1264,7 @@
register_framebuffer(struct fb_info *fb_info)
{
int i;
+ struct class_device *c;
if (num_registered_fb == FB_MAX)
return -ENXIO;
@@ -1267,6 +1273,12 @@
if (!registered_fb[i])
break;
fb_info->node = i;
+
+ c = class_simple_device_add(fb_class, MKDEV(FB_MAJOR, i), NULL, "fb%d", i);
+ if (IS_ERR(c)) {
+ /* Not fatal */
+ printk(KERN_WARNING "Unable to create class_device for framebuffer %d; errno = %ld\n", i, PTR_ERR(c));
+ }
if (fb_info->pixmap.addr == NULL) {
fb_info->pixmap.addr = kmalloc(FBPIXMAPSIZE, GFP_KERNEL);
@@ -1332,6 +1344,7 @@
kfree(fb_info->sprite.addr);
registered_fb[i]=NULL;
num_registered_fb--;
+ class_simple_device_remove(MKDEV(FB_MAJOR, i));
return 0;
}
@@ -1392,6 +1405,12 @@
devfs_mk_dir("fb");
if (register_chrdev(FB_MAJOR,"fb",&fb_fops))
printk("unable to get major %d for fb devs\n", FB_MAJOR);
+
+ fb_class = class_simple_create(THIS_MODULE, "graphics");
+ if (IS_ERR(fb_class)) {
+ printk(KERN_WARNING "Unable to create fb class; errno = %ld\n", PTR_ERR(fb_class));
+ fb_class = NULL;
+ }
#ifdef CONFIG_FB_OF
if (ofonly) {
diff -Nru a/lib/kobject.c b/lib/kobject.c
--- a/lib/kobject.c Fri Apr 2 11:25:07 2004
+++ b/lib/kobject.c Fri Apr 2 11:25:07 2004
@@ -349,16 +349,16 @@
/*
* Need more space? Allocate it and try again
*/
- name = kmalloc(need,GFP_KERNEL);
+ limit = need + 1;
+ name = kmalloc(limit,GFP_KERNEL);
if (!name) {
error = -ENOMEM;
goto Done;
}
- limit = need;
need = vsnprintf(name,limit,fmt,args);
/* Still? Give up. */
- if (need > limit) {
+ if (need >= limit) {
kfree(name);
error = -EFAULT;
goto Done;