aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2006-06-28 09:46:30 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-06-28 09:46:30 -0700
commit53d9687f8faa903da0fd5d5a665ca99a76e68dfa (patch)
tree0b3446fef31c6dce186a8072728e05e6db9bb92b
parentb9d0f05d7111d750b0affa9209c1d3f713b829e5 (diff)
downloadpatches-53d9687f8faa903da0fd5d5a665ca99a76e68dfa.tar.gz
2.6.17-git13 refresh
Diffstat
-rw-r--r--devfs/devfs-remove-devfs_mk_cdev.patch10
-rw-r--r--devfs/devfs-remove-devfs_mk_dir.patch2
-rw-r--r--devfs/devfs-remove-devfs_remove.patch6
-rw-r--r--devfs/devfs-remove-tty-devfs_name.patch4
-rw-r--r--devfs/devfs-tty_driver_no_devfs.patch6
-rw-r--r--pci/64bit-resource-change-resource-core-to-use-resource_size_t.patch19
-rw-r--r--pci/64bit-resource-finally-enable-64bit-resource-sizes.patch2
-rw-r--r--pci/64bit-resource-fix-up-printks-for-resources-in-arch-and-core-code.patch2
-rw-r--r--pci/64bit-resource-fix-up-printks-for-resources-in-misc-drivers.patch2
-rw-r--r--pci/64bit-resource-fix-up-printks-for-resources-in-networks-drivers.patch2
-rw-r--r--version2
11 files changed, 29 insertions, 28 deletions
diff --git a/devfs/devfs-remove-devfs_mk_cdev.patch b/devfs/devfs-remove-devfs_mk_cdev.patch
index 89164eb308d9f1..e7fdbf8841cf25 100644
--- a/devfs/devfs-remove-devfs_mk_cdev.patch
+++ b/devfs/devfs-remove-devfs_mk_cdev.patch
@@ -341,7 +341,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
error:
--- gregkh-2.6.orig/drivers/char/stallion.c
+++ gregkh-2.6/drivers/char/stallion.c
-@@ -3071,14 +3071,10 @@ static int __init stl_init(void)
+@@ -3043,14 +3043,10 @@ static int __init stl_init(void)
printk("STALLION: failed to register serial board device\n");
stallion_class = class_create(THIS_MODULE, "staliomem");
@@ -386,7 +386,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
--- gregkh-2.6.orig/drivers/char/tty_io.c
+++ gregkh-2.6/drivers/char/tty_io.c
-@@ -2979,9 +2979,6 @@ struct class_device *tty_register_device
+@@ -2978,9 +2978,6 @@ struct class_device *tty_register_device
return ERR_PTR(-EINVAL);
}
@@ -396,7 +396,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
if (driver->type == TTY_DRIVER_TYPE_PTY)
pty_line_name(driver, index, name);
else
-@@ -3241,14 +3238,12 @@ static int __init tty_init(void)
+@@ -3240,14 +3237,12 @@ static int __init tty_init(void)
if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) ||
register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0)
panic("Couldn't register /dev/tty driver\n");
@@ -411,7 +411,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
class_device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 1), NULL, "console");
#ifdef CONFIG_UNIX98_PTYS
-@@ -3256,7 +3251,6 @@ static int __init tty_init(void)
+@@ -3255,7 +3250,6 @@ static int __init tty_init(void)
if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
panic("Couldn't register /dev/ptmx driver\n");
@@ -419,7 +419,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
class_device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 2), NULL, "ptmx");
#endif
-@@ -3265,7 +3259,6 @@ static int __init tty_init(void)
+@@ -3264,7 +3258,6 @@ static int __init tty_init(void)
if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) ||
register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0)
panic("Couldn't register /dev/tty0 driver\n");
diff --git a/devfs/devfs-remove-devfs_mk_dir.patch b/devfs/devfs-remove-devfs_mk_dir.patch
index 17f4570fd59540..6959a79e76b8c8 100644
--- a/devfs/devfs-remove-devfs_mk_dir.patch
+++ b/devfs/devfs-remove-devfs_mk_dir.patch
@@ -231,7 +231,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
panic("Couldn't allocate Unix98 ptm driver");
--- gregkh-2.6.orig/drivers/char/stallion.c
+++ gregkh-2.6/drivers/char/stallion.c
-@@ -3069,7 +3069,6 @@ static int __init stl_init(void)
+@@ -3041,7 +3041,6 @@ static int __init stl_init(void)
*/
if (register_chrdev(STL_SIOMEMMAJOR, "staliomem", &stl_fsiomem))
printk("STALLION: failed to register serial board device\n");
diff --git a/devfs/devfs-remove-devfs_remove.patch b/devfs/devfs-remove-devfs_remove.patch
index a9c2a0cec6f214..f5238ae6c03317 100644
--- a/devfs/devfs-remove-devfs_remove.patch
+++ b/devfs/devfs-remove-devfs_remove.patch
@@ -463,8 +463,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
cdev_del(&raw_cdev);
--- gregkh-2.6.orig/drivers/char/stallion.c
+++ gregkh-2.6/drivers/char/stallion.c
-@@ -773,11 +773,8 @@ static void __exit stallion_module_exit(
- restore_flags(flags);
+@@ -757,11 +757,8 @@ static void __exit stallion_module_exit(
+ "errno=%d\n", -i);
return;
}
- for (i = 0; i < 4; i++) {
@@ -499,7 +499,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
--- gregkh-2.6.orig/drivers/char/tty_io.c
+++ gregkh-2.6/drivers/char/tty_io.c
-@@ -2997,7 +2997,6 @@ struct class_device *tty_register_device
+@@ -2996,7 +2996,6 @@ struct class_device *tty_register_device
*/
void tty_unregister_device(struct tty_driver *driver, unsigned index)
{
diff --git a/devfs/devfs-remove-tty-devfs_name.patch b/devfs/devfs-remove-tty-devfs_name.patch
index 44c940facc28be..e8058c0a00207e 100644
--- a/devfs/devfs-remove-tty-devfs_name.patch
+++ b/devfs/devfs-remove-tty-devfs_name.patch
@@ -85,7 +85,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drv->major = HVC_MAJOR;
--- gregkh-2.6.orig/drivers/char/hvcs.c
+++ gregkh-2.6/drivers/char/hvcs.c
-@@ -1364,7 +1364,6 @@ static int __init hvcs_module_init(void)
+@@ -1363,7 +1363,6 @@ static int __init hvcs_module_init(void)
hvcs_tty_driver->driver_name = hvcs_driver_name;
hvcs_tty_driver->name = hvcs_device_node;
@@ -183,7 +183,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
cy_serial_driver->minor_start = 64;
--- gregkh-2.6.orig/drivers/char/stallion.c
+++ gregkh-2.6/drivers/char/stallion.c
-@@ -3075,7 +3075,6 @@ static int __init stl_init(void)
+@@ -3047,7 +3047,6 @@ static int __init stl_init(void)
stl_serial->owner = THIS_MODULE;
stl_serial->driver_name = stl_drvname;
stl_serial->name = "ttyE";
diff --git a/devfs/devfs-tty_driver_no_devfs.patch b/devfs/devfs-tty_driver_no_devfs.patch
index eed642c85d856f..9ddbe1c47ade51 100644
--- a/devfs/devfs-tty_driver_no_devfs.patch
+++ b/devfs/devfs-tty_driver_no_devfs.patch
@@ -119,7 +119,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- gregkh-2.6.orig/drivers/char/tty_io.c
+++ gregkh-2.6/drivers/char/tty_io.c
-@@ -2963,8 +2963,8 @@ static struct class *tty_class;
+@@ -2962,8 +2962,8 @@ static struct class *tty_class;
* Returns a pointer to the class device (or ERR_PTR(-EFOO) on error).
*
* This call is required to be made to register an individual tty device if
@@ -130,7 +130,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
*/
struct class_device *tty_register_device(struct tty_driver *driver,
unsigned index, struct device *device)
-@@ -3117,7 +3117,7 @@ int tty_register_driver(struct tty_drive
+@@ -3116,7 +3116,7 @@ int tty_register_driver(struct tty_drive
list_add(&driver->tty_drivers, &tty_drivers);
@@ -139,7 +139,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
for(i = 0; i < driver->num; i++)
tty_register_device(driver, i, NULL);
}
-@@ -3160,7 +3160,7 @@ int tty_unregister_driver(struct tty_dri
+@@ -3159,7 +3159,7 @@ int tty_unregister_driver(struct tty_dri
driver->termios_locked[i] = NULL;
kfree(tp);
}
diff --git a/pci/64bit-resource-change-resource-core-to-use-resource_size_t.patch b/pci/64bit-resource-change-resource-core-to-use-resource_size_t.patch
index 255b0f48148d8d..ed2c51848e6fc5 100644
--- a/pci/64bit-resource-change-resource-core-to-use-resource_size_t.patch
+++ b/pci/64bit-resource-change-resource-core-to-use-resource_size_t.patch
@@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
release_resource(res);
--- gregkh-2.6.orig/include/linux/ioport.h
+++ gregkh-2.6/include/linux/ioport.h
-@@ -98,31 +98,34 @@ extern struct resource * ____request_res
+@@ -98,14 +98,13 @@ extern struct resource * ____request_res
extern int release_resource(struct resource *new);
extern __deprecated_for_modules int insert_resource(struct resource *parent, struct resource *new);
extern int allocate_resource(struct resource *root, struct resource *new,
@@ -55,8 +55,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+int adjust_resource(struct resource *res, resource_size_t start,
+ resource_size_t size);
- /* Convenience shorthand with allocation */
- #define request_region(start,n,name) __request_region(&ioport_resource, (start), (n), (name))
+ /* get registered SYSTEM_RAM resources in specified area */
+ extern int find_next_system_ram(struct resource *res);
+@@ -115,17 +114,21 @@ extern int find_next_system_ram(struct r
#define request_mem_region(start,n,name) __request_region(&iomem_resource, (start), (n), (name))
#define rename_region(region, newname) do { (region)->name = (newname); } while (0)
@@ -95,7 +96,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
struct resource *tmp, **p;
if (end < start)
-@@ -236,11 +236,10 @@ EXPORT_SYMBOL(release_resource);
+@@ -274,11 +274,10 @@ int find_next_system_ram(struct resource
* Find empty slot in the resource tree given range and alignment.
*/
static int find_resource(struct resource *root, struct resource *new,
@@ -110,7 +111,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
void *alignf_data)
{
struct resource *this = root->child;
-@@ -282,11 +281,10 @@ static int find_resource(struct resource
+@@ -320,11 +319,10 @@ static int find_resource(struct resource
* Allocate empty slot in the resource tree given range and alignment.
*/
int allocate_resource(struct resource *root, struct resource *new,
@@ -125,7 +126,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
void *alignf_data)
{
int err;
-@@ -378,10 +376,10 @@ EXPORT_SYMBOL(insert_resource);
+@@ -416,10 +414,10 @@ EXPORT_SYMBOL(insert_resource);
* arguments. Returns -EBUSY if it can't fit. Existing children of
* the resource are assumed to be immutable.
*/
@@ -138,7 +139,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
int result = -EBUSY;
write_lock(&resource_lock);
-@@ -428,7 +426,9 @@ EXPORT_SYMBOL(adjust_resource);
+@@ -466,7 +464,9 @@ EXPORT_SYMBOL(adjust_resource);
*
* Release-region releases a matching busy region.
*/
@@ -149,7 +150,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
{
struct resource *res = kzalloc(sizeof(*res), GFP_KERNEL);
-@@ -464,7 +464,8 @@ struct resource * __request_region(struc
+@@ -502,7 +502,8 @@ struct resource * __request_region(struc
EXPORT_SYMBOL(__request_region);
@@ -159,7 +160,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
{
struct resource * res;
-@@ -479,10 +480,11 @@ int __check_region(struct resource *pare
+@@ -517,10 +518,11 @@ int __check_region(struct resource *pare
EXPORT_SYMBOL(__check_region);
diff --git a/pci/64bit-resource-finally-enable-64bit-resource-sizes.patch b/pci/64bit-resource-finally-enable-64bit-resource-sizes.patch
index 7f8f8cc033c06d..8433d9aeb8c578 100644
--- a/pci/64bit-resource-finally-enable-64bit-resource-sizes.patch
+++ b/pci/64bit-resource-finally-enable-64bit-resource-sizes.patch
@@ -75,7 +75,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static DEFINE_RWLOCK(resource_lock);
--- gregkh-2.6.orig/mm/Kconfig
+++ gregkh-2.6/mm/Kconfig
-@@ -145,3 +145,9 @@ config MIGRATION
+@@ -146,3 +146,9 @@ config MIGRATION
while the virtual addresses are not changed. This is useful for
example on NUMA systems to put pages nearer to the processors accessing
the page.
diff --git a/pci/64bit-resource-fix-up-printks-for-resources-in-arch-and-core-code.patch b/pci/64bit-resource-fix-up-printks-for-resources-in-arch-and-core-code.patch
index 5d71c6a71fd0a1..c9760699e88baf 100644
--- a/pci/64bit-resource-fix-up-printks-for-resources-in-arch-and-core-code.patch
+++ b/pci/64bit-resource-fix-up-printks-for-resources-in-arch-and-core-code.patch
@@ -387,7 +387,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
r->name ? r->name : "<BAD>");
return 0;
}
-@@ -511,7 +511,9 @@ void __release_region(struct resource *p
+@@ -549,7 +549,9 @@ void __release_region(struct resource *p
write_unlock(&resource_lock);
diff --git a/pci/64bit-resource-fix-up-printks-for-resources-in-misc-drivers.patch b/pci/64bit-resource-fix-up-printks-for-resources-in-misc-drivers.patch
index f65d752264fb00..0a6ea5da78153a 100644
--- a/pci/64bit-resource-fix-up-printks-for-resources-in-misc-drivers.patch
+++ b/pci/64bit-resource-fix-up-printks-for-resources-in-misc-drivers.patch
@@ -56,7 +56,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
// check IO region
--- gregkh-2.6.orig/drivers/atm/firestream.c
+++ gregkh-2.6/drivers/atm/firestream.c
-@@ -1657,9 +1657,10 @@ static int __devinit fs_init (struct fs_
+@@ -1658,9 +1658,10 @@ static int __devinit fs_init (struct fs_
func_enter ();
pci_dev = dev->pci_dev;
diff --git a/pci/64bit-resource-fix-up-printks-for-resources-in-networks-drivers.patch b/pci/64bit-resource-fix-up-printks-for-resources-in-networks-drivers.patch
index a9e5897b0305eb..67f1891b4a3946 100644
--- a/pci/64bit-resource-fix-up-printks-for-resources-in-networks-drivers.patch
+++ b/pci/64bit-resource-fix-up-printks-for-resources-in-networks-drivers.patch
@@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- gregkh-2.6.orig/drivers/net/3c59x.c
+++ gregkh-2.6/drivers/net/3c59x.c
-@@ -1408,8 +1408,10 @@ static int __devinit vortex_probe1(struc
+@@ -1407,8 +1407,10 @@ static int __devinit vortex_probe1(struc
}
if (print_info) {
diff --git a/version b/version
index 6977bc9385ff41..c0ba7acd8bde28 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.17-git12
+2.6.17-git13
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 21:11:10 +0000