Commits

Uelsk8s committed 1caecf7

update kernel-3.8 to 3.8.7

Comments (0)

Files changed (2)

var/vabs/kernel-3.8/src/kernel-3.8.SlackBuild

 #!/bin/bash
 
 # ----------------------
-VER=3.8.6
+VER=3.8.7
 KERNEL=linux-$VER
 SQUASHFS_LATEST_KERNEL_PATCH=linux-2.6.24
 SQUASHFS=squashfs4.2
 cp $CURDIR/patches/405-world_regd_fixup.patch .
 patch -p1 <405-world_regd_fixup.patch || exit 1
 eecho "Patch8"
+cp $CURDIR/patches/fbconrev.patch .
+patch -p1 < fbconrev.patch || exit 1
+eecho "Patch9"
 cp $CURDIR/patches/bootsplash-3.4.diff .
 patch -p1 < bootsplash-3.4.diff || exit 1
 #cp $CURDIR/patches/4200_fbcondecor-0.9.6.patch .

var/vabs/kernel-3.8/src/patches/fbconrev.patch

+diff -Naur linux-3.4.38/drivers/tty/vt/vt.c linux-3.4.38.patched/drivers/tty/vt/vt.c
+--- linux-3.4.38/drivers/tty/vt/vt.c	2013-03-28 13:12:41.000000000 -0600
++++ linux-3.4.38.patched/drivers/tty/vt/vt.c	2013-04-05 13:52:54.000000000 -0600
+@@ -3017,7 +3017,7 @@
+ 
+ static struct class *vtconsole_class;
+ 
+-static int do_bind_con_driver(const struct consw *csw, int first, int last,
++static int bind_con_driver(const struct consw *csw, int first, int last,
+ 			   int deflt)
+ {
+ 	struct module *owner = csw->owner;
+@@ -3028,7 +3028,7 @@
+ 	if (!try_module_get(owner))
+ 		return -ENODEV;
+ 
+-	WARN_CONSOLE_UNLOCKED();
++	console_lock();
+ 
+ 	/* check if driver is registered */
+ 	for (i = 0; i < MAX_NR_CON_DRIVER; i++) {
+@@ -3113,22 +3113,11 @@
+ 
+ 	retval = 0;
+ err:
++	console_unlock();
+ 	module_put(owner);
+ 	return retval;
+ };
+ 
+-
+-static int bind_con_driver(const struct consw *csw, int first, int last,
+-			   int deflt)
+-{
+-	int ret;
+-
+-	console_lock();
+-	ret = do_bind_con_driver(csw, first, last, deflt);
+-	console_unlock();
+-	return ret;
+-}
+-
+ #ifdef CONFIG_VT_HW_CONSOLE_BINDING
+ static int con_is_graphics(const struct consw *csw, int first, int last)
+ {
+@@ -3246,8 +3235,9 @@
+ 	if (!con_is_bound(csw))
+ 		con_driver->flag &= ~CON_DRIVER_FLAG_INIT;
+ 
+-	/* ignore return value, binding should not fail */
+-	do_bind_con_driver(defcsw, first, last, deflt);
++	console_unlock();
++ 	/* ignore return value, binding should not fail */
++	bind_con_driver(defcsw, first, last, deflt);
+ err:
+ 	module_put(owner);
+ 	return retval;
+@@ -3538,18 +3528,28 @@
+ }
+ EXPORT_SYMBOL_GPL(con_debug_leave);
+ 
+-static int do_register_con_driver(const struct consw *csw, int first, int last)
++/**
++ * register_con_driver - register console driver to console layer
++ * @csw: console driver
++ * @first: the first console to take over, minimum value is 0
++ * @last: the last console to take over, maximum value is MAX_NR_CONSOLES -1
++ *
++ * DESCRIPTION: This function registers a console driver which can later
++ * bind to a range of consoles specified by @first and @last. It will
++ * also initialize the console driver by calling con_startup().
++ */
++int register_con_driver(const struct consw *csw, int first, int last)
+ {
+ 	struct module *owner = csw->owner;
+ 	struct con_driver *con_driver;
+ 	const char *desc;
+ 	int i, retval = 0;
+ 
+-	WARN_CONSOLE_UNLOCKED();
+-
+ 	if (!try_module_get(owner))
+ 		return -ENODEV;
+ 
++	console_lock();
++
+ 	for (i = 0; i < MAX_NR_CON_DRIVER; i++) {
+ 		con_driver = &registered_con_driver[i];
+ 
+@@ -3602,27 +3602,8 @@
+ 	}
+ 
+ err:
+-	module_put(owner);
+-	return retval;
+-}
+-
+-/**
+- * register_con_driver - register console driver to console layer
+- * @csw: console driver
+- * @first: the first console to take over, minimum value is 0
+- * @last: the last console to take over, maximum value is MAX_NR_CONSOLES -1
+- *
+- * DESCRIPTION: This function registers a console driver which can later
+- * bind to a range of consoles specified by @first and @last. It will
+- * also initialize the console driver by calling con_startup().
+- */
+-int register_con_driver(const struct consw *csw, int first, int last)
+-{
+-	int retval;
+-
+-	console_lock();
+-	retval = do_register_con_driver(csw, first, last);
+ 	console_unlock();
++	module_put(owner);
+ 	return retval;
+ }
+ EXPORT_SYMBOL(register_con_driver);
+@@ -3686,44 +3667,17 @@
+  *	when a driver wants to take over some existing consoles
+  *	and become default driver for newly opened ones.
+  *
+- *	take_over_console is basically a register followed by unbind
+- */
+-int do_take_over_console(const struct consw *csw, int first, int last, int deflt)
+-{
+-	int err;
+-
+-	err = do_register_con_driver(csw, first, last);
+-	/*
+-	 * If we get an busy error we still want to bind the console driver
+-	 * and return success, as we may have unbound the console driver
+-	 * but not unregistered it.
+-	 */
+-	if (err == -EBUSY)
+-		err = 0;
+-	if (!err)
+-		do_bind_con_driver(csw, first, last, deflt);
+-
+-	return err;
+-}
+-EXPORT_SYMBOL_GPL(do_take_over_console);
+-
+-/*
+- *	If we support more console drivers, this function is used
+- *	when a driver wants to take over some existing consoles
+- *	and become default driver for newly opened ones.
+- *
+- *	take_over_console is basically a register followed by unbind
++ *      take_over_console is basically a register followed by unbind
+  */
+ int take_over_console(const struct consw *csw, int first, int last, int deflt)
+ {
+ 	int err;
+ 
+ 	err = register_con_driver(csw, first, last);
+-	/*
+-	 * If we get an busy error we still want to bind the console driver
++	/* if we get an busy error we still want to bind the console driver
+ 	 * and return success, as we may have unbound the console driver
+ 	 * but not unregistered it.
+-	 */
++	*/
+ 	if (err == -EBUSY)
+ 		err = 0;
+ 	if (!err)
+diff -Naur linux-3.4.38/drivers/video/console/fbcon.c linux-3.4.38.patched/drivers/video/console/fbcon.c
+--- linux-3.4.38/drivers/video/console/fbcon.c	2013-03-28 13:12:41.000000000 -0600
++++ linux-3.4.38.patched/drivers/video/console/fbcon.c	2013-04-05 13:01:18.000000000 -0600
+@@ -529,33 +529,6 @@
+ 	return retval;
+ }
+ 
+-static int do_fbcon_takeover(int show_logo)
+-{
+-	int err, i;
+-
+-	if (!num_registered_fb)
+-		return -ENODEV;
+-
+-	if (!show_logo)
+-		logo_shown = FBCON_LOGO_DONTSHOW;
+-
+-	for (i = first_fb_vc; i <= last_fb_vc; i++)
+-		con2fb_map[i] = info_idx;
+-
+-	err = do_take_over_console(&fb_con, first_fb_vc, last_fb_vc,
+-				fbcon_is_default);
+-
+-	if (err) {
+-		for (i = first_fb_vc; i <= last_fb_vc; i++)
+-			con2fb_map[i] = -1;
+-		info_idx = -1;
+-	} else {
+-		fbcon_has_console_bind = 1;
+-	}
+-
+-	return err;
+-}
+-
+ static int fbcon_takeover(int show_logo)
+ {
+ 	int err, i;
+@@ -3148,7 +3121,7 @@
+ 		}
+ 
+ 		if (info_idx != -1)
+-			ret = do_fbcon_takeover(1);
++			ret = fbcon_takeover(1);
+ 	} else {
+ 		for (i = first_fb_vc; i <= last_fb_vc; i++) {
+ 			if (con2fb_map_boot[i] == idx)
+diff -Naur linux-3.4.38/drivers/video/fbmem.c linux-3.4.38.patched/drivers/video/fbmem.c
+--- linux-3.4.38/drivers/video/fbmem.c	2013-03-28 13:12:41.000000000 -0600
++++ linux-3.4.38.patched/drivers/video/fbmem.c	2013-04-05 13:01:23.000000000 -0600
+@@ -1642,9 +1642,7 @@
+ 	event.info = fb_info;
+ 	if (!lock_fb_info(fb_info))
+ 		return -ENODEV;
+-	console_lock();
+ 	fb_notifier_call_chain(FB_EVENT_FB_REGISTERED, &event);
+-	console_unlock();
+ 	unlock_fb_info(fb_info);
+ 	return 0;
+ }
+@@ -1851,8 +1849,11 @@
+ 	err = 1;
+ 
+ 	if (!list_empty(&info->modelist)) {
++		if (!lock_fb_info(info))
++			return -ENODEV;
+ 		event.info = info;
+ 		err = fb_notifier_call_chain(FB_EVENT_NEW_MODELIST, &event);
++		unlock_fb_info(info);
+ 	}
+ 
+ 	return err;
+diff -Naur linux-3.4.38/drivers/video/fbsysfs.c linux-3.4.38.patched/drivers/video/fbsysfs.c
+--- linux-3.4.38/drivers/video/fbsysfs.c	2013-03-28 13:12:41.000000000 -0600
++++ linux-3.4.38.patched/drivers/video/fbsysfs.c	2013-04-05 13:01:25.000000000 -0600
+@@ -175,8 +175,6 @@
+ 	if (i * sizeof(struct fb_videomode) != count)
+ 		return -EINVAL;
+ 
+-	if (!lock_fb_info(fb_info))
+-		return -ENODEV;
+ 	console_lock();
+ 	list_splice(&fb_info->modelist, &old_list);
+ 	fb_videomode_to_modelist((const struct fb_videomode *)buf, i,
+@@ -188,7 +186,6 @@
+ 		fb_destroy_modelist(&old_list);
+ 
+ 	console_unlock();
+-	unlock_fb_info(fb_info);
+ 
+ 	return 0;
+ }
+diff -Naur linux-3.4.38/include/linux/console.h linux-3.4.38.patched/include/linux/console.h
+--- linux-3.4.38/include/linux/console.h	2013-03-28 13:12:41.000000000 -0600
++++ linux-3.4.38.patched/include/linux/console.h	2013-04-05 13:01:28.000000000 -0600
+@@ -79,7 +79,6 @@
+ int unregister_con_driver(const struct consw *csw);
+ int do_unregister_con_driver(const struct consw *csw);
+ int take_over_console(const struct consw *sw, int first, int last, int deflt);
+-int do_take_over_console(const struct consw *sw, int first, int last, int deflt);
+ void give_up_console(const struct consw *sw);
+ #ifdef CONFIG_HW_CONSOLE
+ int con_debug_enter(struct vc_data *vc);
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.