kernel26:Bumped to 2.6.39.3 w/ ck2 and fbdecon.

author: Cecil <knoppmyth@gmail.com> 2011-07-17 20:40:13 (GMT)
committer: Cecil <knoppmyth@gmail.com> 2011-07-17 20:40:13 (GMT)
commit: 99940cf1f228736b21713df64f993015ae0d586d (patch)
tree: 66681918a7fdaddfeced8d977c46c63cc6c4ba8b /abs/core/kernel26
parent: de0161dec5775de3e8929570ae2fd19d2359df11 (diff)
download: linhes_pkgbuild-99940cf1f228736b21713df64f993015ae0d586d.zip
linhes_pkgbuild-99940cf1f228736b21713df64f993015ae0d586d.tar.gz
linhes_pkgbuild-99940cf1f228736b21713df64f993015ae0d586d.tar.bz2
11 files changed, 1757 insertions, 11621 deletions
diff --git a/abs/core/kernel26/2.6.37.1-fix-no-more-unsigned.patch b/abs/core/kernel26/2.6.37.1-fix-no-more-unsigned.patch
deleted file mode 100644
index f132379..0000000
--- a/abs/core/kernel26/2.6.37.1-fix-no-more-unsigned.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- linux-2.6.37.orig/kernel/sched_bfs.c	2011-02-18 23:09:39.000000000 +0200
-+++ linux-2.6.37/kernel/sched_bfs.c	2011-02-18 23:13:17.368000023 +0200
-@@ -3352,7 +3352,7 @@
-  * This waits for either a completion of a specific task to be signaled or for a
-  * specified timeout to expire. It is interruptible. The timeout is in jiffies.
-  */
--unsigned long __sched
-+long __sched
- wait_for_completion_interruptible_timeout(struct completion *x,
- 					  unsigned long timeout)
- {
-@@ -3385,7 +3385,7 @@
-  * signaled or for a specified timeout to expire. It can be
-  * interrupted by a kill signal. The timeout is in jiffies.
-  */
--unsigned long __sched
-+long __sched
- wait_for_completion_killable_timeout(struct completion *x,
- 				     unsigned long timeout)
- {
diff --git a/abs/core/kernel26/4200_fbcondecor-0.9.6.patch b/abs/core/kernel26/4200_fbcondecor-0.9.6.patch
deleted file mode 100644
index e3dab84..0000000
--- a/abs/core/kernel26/4200_fbcondecor-0.9.6.patch
+++ /dev/null
@@ -1,2134 +0,0 @@
-diff --git a/Documentation/fb/00-INDEX b/Documentation/fb/00-INDEX
-index a618fd9..6eb4dc4 100644
---- a/Documentation/fb/00-INDEX
-+++ b/Documentation/fb/00-INDEX
-@@ -15,6 +15,8 @@ deferred_io.txt
- 	- an introduction to deferred IO.
- fbcon.txt
- 	- intro to and usage guide for the framebuffer console (fbcon).
-+fbcondecor.txt
-+	- info on the Framebuffer Console Decoration
- framebuffer.txt
- 	- introduction to frame buffer devices.
- imacfb.txt
-diff --git a/Documentation/fb/fbcondecor.txt b/Documentation/fb/fbcondecor.txt
-new file mode 100644
-index 0000000..15889f3
---- /dev/null
-+++ b/Documentation/fb/fbcondecor.txt
-@@ -0,0 +1,207 @@
-+What is it?
-+-----------
-+
-+The framebuffer decorations are a kernel feature which allows displaying a 
-+background picture on selected consoles.
-+
-+What do I need to get it to work?
-+---------------------------------
-+
-+To get fbcondecor up-and-running you will have to:
-+ 1) get a copy of splashutils [1] or a similar program
-+ 2) get some fbcondecor themes
-+ 3) build the kernel helper program
-+ 4) build your kernel with the FB_CON_DECOR option enabled.
-+
-+To get fbcondecor operational right after fbcon initialization is finished, you
-+will have to include a theme and the kernel helper into your initramfs image.
-+Please refer to splashutils documentation for instructions on how to do that.
-+
-+[1] The splashutils package can be downloaded from:
-+    http://dev.gentoo.org/~spock/projects/splashutils/
-+
-+The userspace helper
-+--------------------
-+
-+The userspace fbcondecor helper (by default: /sbin/fbcondecor_helper) is called by the
-+kernel whenever an important event occurs and the kernel needs some kind of
-+job to be carried out. Important events include console switches and video
-+mode switches (the kernel requests background images and configuration
-+parameters for the current console). The fbcondecor helper must be accessible at
-+all times. If it's not, fbcondecor will be switched off automatically.
-+
-+It's possible to set path to the fbcondecor helper by writing it to
-+/proc/sys/kernel/fbcondecor.
-+
-+*****************************************************************************
-+
-+The information below is mostly technical stuff. There's probably no need to
-+read it unless you plan to develop a userspace helper.
-+
-+The fbcondecor protocol
-+-----------------------
-+
-+The fbcondecor protocol defines a communication interface between the kernel and
-+the userspace fbcondecor helper.
-+
-+The kernel side is responsible for:
-+
-+ * rendering console text, using an image as a background (instead of a
-+   standard solid color fbcon uses),
-+ * accepting commands from the user via ioctls on the fbcondecor device,
-+ * calling the userspace helper to set things up as soon as the fb subsystem 
-+   is initialized.
-+
-+The userspace helper is responsible for everything else, including parsing
-+configuration files, decompressing the image files whenever the kernel needs
-+it, and communicating with the kernel if necessary.
-+
-+The fbcondecor protocol specifies how communication is done in both ways:
-+kernel->userspace and userspace->helper.
-+  
-+Kernel -> Userspace
-+-------------------
-+
-+The kernel communicates with the userspace helper by calling it and specifying
-+the task to be done in a series of arguments.
-+
-+The arguments follow the pattern:
-+<fbcondecor protocol version> <command> <parameters>
-+
-+All commands defined in fbcondecor protocol v2 have the following parameters:
-+ virtual console
-+ framebuffer number
-+ theme
-+
-+Fbcondecor protocol v1 specified an additional 'fbcondecor mode' after the
-+framebuffer number. Fbcondecor protocol v1 is deprecated and should not be used.
-+
-+Fbcondecor protocol v2 specifies the following commands:
-+
-+getpic
-+------
-+ The kernel issues this command to request image data. It's up to the 
-+ userspace  helper to find a background image appropriate for the specified 
-+ theme and the current resolution. The userspace helper should respond by 
-+ issuing the FBIOCONDECOR_SETPIC ioctl.
-+
-+init
-+----
-+ The kernel issues this command after the fbcondecor device is created and
-+ the fbcondecor interface is initialized. Upon receiving 'init', the userspace
-+ helper should parse the kernel command line (/proc/cmdline) or otherwise
-+ decide whether fbcondecor is to be activated.
-+
-+ To activate fbcondecor on the first console the helper should issue the
-+ FBIOCONDECOR_SETCFG, FBIOCONDECOR_SETPIC and FBIOCONDECOR_SETSTATE commands,
-+ in the above-mentioned order.
-+
-+ When the userspace helper is called in an early phase of the boot process
-+ (right after the initialization of fbcon), no filesystems will be mounted.
-+ The helper program should mount sysfs and then create the appropriate
-+ framebuffer, fbcondecor and tty0 devices (if they don't already exist) to get
-+ current display settings and to be able to communicate with the kernel side.
-+ It should probably also mount the procfs to be able to parse the kernel
-+ command line parameters.
-+
-+ Note that the console sem is not held when the kernel calls fbcondecor_helper
-+ with the 'init' command. The fbcondecor helper should perform all ioctls with
-+ origin set to FBCON_DECOR_IO_ORIG_USER.
-+
-+modechange
-+----------
-+ The kernel issues this command on a mode change. The helper's response should
-+ be similar to the response to the 'init' command. Note that this time the
-+ console sem is held and all ioctls must be performed with origin set to
-+ FBCON_DECOR_IO_ORIG_KERNEL.
-+
-+
-+Userspace -> Kernel
-+-------------------
-+
-+Userspace programs can communicate with fbcondecor via ioctls on the
-+fbcondecor device. These ioctls are to be used by both the userspace helper
-+(called only by the kernel) and userspace configuration tools (run by the users).
-+
-+The fbcondecor helper should set the origin field to FBCON_DECOR_IO_ORIG_KERNEL
-+when doing the appropriate ioctls. All userspace configuration tools should
-+use FBCON_DECOR_IO_ORIG_USER. Failure to set the appropriate value in the origin
-+field when performing ioctls from the kernel helper will most likely result
-+in a console deadlock.
-+
-+FBCON_DECOR_IO_ORIG_KERNEL instructs fbcondecor not to try to acquire the console
-+semaphore. Not surprisingly, FBCON_DECOR_IO_ORIG_USER instructs it to acquire
-+the console sem.
-+
-+The framebuffer console decoration provides the following ioctls (all defined in 
-+linux/fb.h):
-+
-+FBIOCONDECOR_SETPIC
-+description: loads a background picture for a virtual console
-+argument: struct fbcon_decor_iowrapper*; data: struct fb_image*
-+notes: 
-+If called for consoles other than the current foreground one, the picture data
-+will be ignored.
-+
-+If the current virtual console is running in a 8-bpp mode, the cmap substruct
-+of fb_image has to be filled appropriately: start should be set to 16 (first
-+16 colors are reserved for fbcon), len to a value <= 240 and red, green and
-+blue should point to valid cmap data. The transp field is ingored. The fields
-+dx, dy, bg_color, fg_color in fb_image are ignored as well.
-+
-+FBIOCONDECOR_SETCFG
-+description: sets the fbcondecor config for a virtual console
-+argument: struct fbcon_decor_iowrapper*; data: struct vc_decor*
-+notes: The structure has to be filled with valid data.
-+
-+FBIOCONDECOR_GETCFG
-+description: gets the fbcondecor config for a virtual console
-+argument: struct fbcon_decor_iowrapper*; data: struct vc_decor*
-+
-+FBIOCONDECOR_SETSTATE
-+description: sets the fbcondecor state for a virtual console
-+argument: struct fbcon_decor_iowrapper*; data: unsigned int*
-+          values: 0 = disabled, 1 = enabled.
-+
-+FBIOCONDECOR_GETSTATE
-+description: gets the fbcondecor state for a virtual console
-+argument: struct fbcon_decor_iowrapper*; data: unsigned int*
-+          values: as in FBIOCONDECOR_SETSTATE
-+
-+Info on used structures:
-+
-+Definition of struct vc_decor can be found in linux/console_decor.h. It's
-+heavily commented. Note that the 'theme' field should point to a string
-+no longer than FBCON_DECOR_THEME_LEN. When FBIOCONDECOR_GETCFG call is
-+performed, the theme field should point to a char buffer of length
-+FBCON_DECOR_THEME_LEN.
-+
-+Definition of struct fbcon_decor_iowrapper can be found in linux/fb.h.
-+The fields in this struct have the following meaning:
-+
-+vc: 
-+Virtual console number.
-+
-+origin: 
-+Specifies if the ioctl is performed as a response to a kernel request. The
-+fbcondecor helper should set this field to FBCON_DECOR_IO_ORIG_KERNEL, userspace
-+programs should set it to FBCON_DECOR_IO_ORIG_USER. This field is necessary to
-+avoid console semaphore deadlocks.
-+
-+data: 
-+Pointer to a data structure appropriate for the performed ioctl. Type of
-+the data struct is specified in the ioctls description.
-+
-+*****************************************************************************
-+
-+Credit
-+------
-+
-+Original 'bootsplash' project & implementation by:
-+  Volker Poplawski <volker@poplawski.de>, Stefan Reinauer <stepan@suse.de>,
-+  Steffen Winterfeldt <snwint@suse.de>, Michael Schroeder <mls@suse.de>,
-+  Ken Wimer <wimer@suse.de>.
-+
-+Fbcondecor, fbcondecor protocol design, current implementation & docs by:
-+  Michal Januszewski <spock@gentoo.org>
-+
---- a/drivers/Makefile	2010-12-28 15:55:31.000000000 -0500
-+++ b/drivers/Makefile	2010-12-28 16:04:22.000000000 -0500
-@@ -9,6 +9,9 @@ obj-y				+= gpio/
- obj-$(CONFIG_PCI)		+= pci/
- obj-$(CONFIG_PARISC)		+= parisc/
- obj-$(CONFIG_RAPIDIO)		+= rapidio/
-+# char/ comes before serial/ etc so that the VT console is the boot-time
-+# default.
-+obj-y              += char/
- obj-y				+= video/
- obj-y				+= idle/
- obj-$(CONFIG_ACPI)		+= acpi/
-@@ -24,10 +27,7 @@ obj-$(CONFIG_XEN)		+= xen/
- # regulators early, since some subsystems rely on them to initialize
- obj-$(CONFIG_REGULATOR)		+= regulator/
- 
--# char/ comes before serial/ etc so that the VT console is the boot-time
--# default.
- obj-y				+= tty/
--obj-y				+= char/
- 
- # gpu/ comes after char for AGP vs DRM startup
- obj-y				+= gpu/
-diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
-index 3d94a14..54e113d 100644
---- a/drivers/video/Kconfig
-+++ b/drivers/video/Kconfig
-@@ -1195,7 +1195,6 @@ config FB_MATROX
- 	select FB_CFB_FILLRECT
- 	select FB_CFB_COPYAREA
- 	select FB_CFB_IMAGEBLIT
--	select FB_TILEBLITTING
- 	select FB_MACMODES if PPC_PMAC
- 	---help---
- 	  Say Y here if you have a Matrox Millennium, Matrox Millennium II,
-diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
-index 8e8f18d..86875c3 100644
---- a/drivers/video/console/Kconfig
-+++ b/drivers/video/console/Kconfig
-@@ -122,6 +122,19 @@ config FRAMEBUFFER_CONSOLE_ROTATION
-          such that other users of the framebuffer will remain normally
-          oriented.
- 
-+config FB_CON_DECOR
-+	bool "Support for the Framebuffer Console Decorations"
-+	depends on FRAMEBUFFER_CONSOLE=y && !FB_TILEBLITTING
-+	default n
-+	---help---
-+	  This option enables support for framebuffer console decorations which
-+	  makes it possible to display images in the background of the system
-+	  consoles.  Note that userspace utilities are necessary in order to take 
-+	  advantage of these features. Refer to Documentation/fb/fbcondecor.txt 
-+	  for more information.
-+
-+	  If unsure, say N.
-+
- config STI_CONSOLE
-         bool "STI text console"
-         depends on PARISC
-diff --git a/drivers/video/console/Makefile b/drivers/video/console/Makefile
-index a862e91..86bfcff 100644
---- a/drivers/video/console/Makefile
-+++ b/drivers/video/console/Makefile
-@@ -34,6 +34,7 @@ obj-$(CONFIG_FRAMEBUFFER_CONSOLE)     += fbcon_rotate.o fbcon_cw.o fbcon_ud.o \
-                                          fbcon_ccw.o
- endif
- 
-+obj-$(CONFIG_FB_CON_DECOR)     	  += fbcondecor.o cfbcondecor.o
- obj-$(CONFIG_FB_STI)              += sticore.o font.o
- 
- ifeq ($(CONFIG_USB_SISUSBVGA_CON),y)
-diff --git a/drivers/video/console/bitblit.c b/drivers/video/console/bitblit.c
-index af88651..4cd893d 100644
---- a/drivers/video/console/bitblit.c
-+++ b/drivers/video/console/bitblit.c
-@@ -18,6 +18,7 @@
- #include <linux/console.h>
- #include <asm/types.h>
- #include "fbcon.h"
-+#include "fbcondecor.h"
- 
- /*
-  * Accelerated handlers.
-@@ -55,6 +56,13 @@ static void bit_bmove(struct vc_data *vc, struct fb_info *info, int sy,
- 	area.height = height * vc->vc_font.height;
- 	area.width = width * vc->vc_font.width;
- 
-+	if (fbcon_decor_active(info, vc)) {
-+ 		area.sx += vc->vc_decor.tx;
-+ 		area.sy += vc->vc_decor.ty;
-+ 		area.dx += vc->vc_decor.tx;
-+ 		area.dy += vc->vc_decor.ty;
-+ 	}
-+
- 	info->fbops->fb_copyarea(info, &area);
- }
- 
-@@ -380,11 +388,15 @@ static void bit_cursor(struct vc_data *vc, struct fb_info *info, int mode,
- 	cursor.image.depth = 1;
- 	cursor.rop = ROP_XOR;
- 
--	if (info->fbops->fb_cursor)
--		err = info->fbops->fb_cursor(info, &cursor);
-+	if (fbcon_decor_active(info, vc)) {
-+		fbcon_decor_cursor(info, &cursor);
-+	} else {
-+		if (info->fbops->fb_cursor)
-+			err = info->fbops->fb_cursor(info, &cursor);
- 
--	if (err)
--		soft_cursor(info, &cursor);
-+		if (err)
-+			soft_cursor(info, &cursor);
-+	}
- 
- 	ops->cursor_reset = 0;
- }
-diff --git a/drivers/video/console/cfbcondecor.c b/drivers/video/console/cfbcondecor.c
-new file mode 100644
-index 0000000..18a5452
---- /dev/null
-+++ b/drivers/video/console/cfbcondecor.c
-@@ -0,0 +1,472 @@
-+/*
-+ *  linux/drivers/video/cfbcon_decor.c -- Framebuffer decor render functions
-+ *
-+ *  Copyright (C) 2004 Michal Januszewski <spock@gentoo.org>
-+ *
-+ *  Code based upon "Bootdecor" (C) 2001-2003
-+ *       Volker Poplawski <volker@poplawski.de>,
-+ *       Stefan Reinauer <stepan@suse.de>,
-+ *       Steffen Winterfeldt <snwint@suse.de>,
-+ *       Michael Schroeder <mls@suse.de>,
-+ *       Ken Wimer <wimer@suse.de>.
-+ *
-+ *  This file is subject to the terms and conditions of the GNU General Public
-+ *  License.  See the file COPYING in the main directory of this archive for
-+ *  more details.
-+ */
-+#include <linux/module.h>
-+#include <linux/types.h>
-+#include <linux/fb.h>
-+#include <linux/selection.h>
-+#include <linux/slab.h>
-+#include <linux/vt_kern.h>
-+#include <asm/irq.h>
-+#include <asm/system.h>
-+
-+#include "fbcon.h"
-+#include "fbcondecor.h"
-+
-+#define parse_pixel(shift,bpp,type)						\
-+	do {									\
-+		if (d & (0x80 >> (shift)))					\
-+			dd2[(shift)] = fgx;					\
-+		else								\
-+			dd2[(shift)] = transparent ? *(type *)decor_src : bgx;	\
-+		decor_src += (bpp);						\
-+	} while (0)								\
-+
-+extern int get_color(struct vc_data *vc, struct fb_info *info,
-+		     u16 c, int is_fg);
-+
-+void fbcon_decor_fix_pseudo_pal(struct fb_info *info, struct vc_data *vc)
-+{
-+	int i, j, k;
-+	int minlen = min(min(info->var.red.length, info->var.green.length),
-+			     info->var.blue.length);
-+	u32 col;
-+
-+	for (j = i = 0; i < 16; i++) {
-+		k = color_table[i];
-+
-+		col = ((vc->vc_palette[j++]  >> (8-minlen))
-+			<< info->var.red.offset);
-+		col |= ((vc->vc_palette[j++] >> (8-minlen))
-+			<< info->var.green.offset);
-+		col |= ((vc->vc_palette[j++] >> (8-minlen))
-+			<< info->var.blue.offset);
-+			((u32 *)info->pseudo_palette)[k] = col;
-+	}
-+}
-+
-+void fbcon_decor_renderc(struct fb_info *info, int ypos, int xpos, int height,
-+		      int width, u8* src, u32 fgx, u32 bgx, u8 transparent)
-+{
-+	unsigned int x, y;
-+	u32 dd;
-+	int bytespp = ((info->var.bits_per_pixel + 7) >> 3);
-+	unsigned int d = ypos * info->fix.line_length + xpos * bytespp;
-+	unsigned int ds = (ypos * info->var.xres + xpos) * bytespp;
-+	u16 dd2[4];
-+
-+	u8* decor_src = (u8 *)(info->bgdecor.data + ds);
-+	u8* dst = (u8 *)(info->screen_base + d);
-+
-+	if ((ypos + height) > info->var.yres || (xpos + width) > info->var.xres)
-+		return;
-+
-+	for (y = 0; y < height; y++) {
-+		switch (info->var.bits_per_pixel) {
-+
-+		case 32:
-+			for (x = 0; x < width; x++) {
-+
-+				if ((x & 7) == 0)
-+					d = *src++;
-+				if (d & 0x80)
-+					dd = fgx;
-+				else
-+					dd = transparent ?
-+					     *(u32 *)decor_src : bgx;
-+
-+				d <<= 1;
-+				decor_src += 4;
-+				fb_writel(dd, dst);
-+				dst += 4;
-+			}
-+			break;
-+		case 24:
-+			for (x = 0; x < width; x++) {
-+
-+				if ((x & 7) == 0)
-+					d = *src++;
-+				if (d & 0x80)
-+					dd = fgx;
-+				else
-+					dd = transparent ?
-+					     (*(u32 *)decor_src & 0xffffff) : bgx;
-+
-+				d <<= 1;
-+				decor_src += 3;
-+#ifdef __LITTLE_ENDIAN
-+				fb_writew(dd & 0xffff, dst);
-+				dst += 2;
-+				fb_writeb((dd >> 16), dst);
-+#else
-+				fb_writew(dd >> 8, dst);
-+				dst += 2;
-+				fb_writeb(dd & 0xff, dst);
-+#endif
-+				dst++;
-+			}
-+			break;
-+		case 16:
-+			for (x = 0; x < width; x += 2) {
-+				if ((x & 7) == 0)
-+					d = *src++;
-+
-+				parse_pixel(0, 2, u16);
-+				parse_pixel(1, 2, u16);
-+#ifdef __LITTLE_ENDIAN
-+				dd = dd2[0] | (dd2[1] << 16);
-+#else
-+				dd = dd2[1] | (dd2[0] << 16);
-+#endif
-+				d <<= 2;
-+				fb_writel(dd, dst);
-+				dst += 4;
-+			}
-+			break;
-+
-+		case 8:
-+			for (x = 0; x < width; x += 4) {
-+				if ((x & 7) == 0)
-+					d = *src++;
-+
-+				parse_pixel(0, 1, u8);
-+				parse_pixel(1, 1, u8);
-+				parse_pixel(2, 1, u8);
-+				parse_pixel(3, 1, u8);
-+
-+#ifdef __LITTLE_ENDIAN
-+				dd = dd2[0] | (dd2[1] << 8) | (dd2[2] << 16) | (dd2[3] << 24);
-+#else
-+				dd = dd2[3] | (dd2[2] << 8) | (dd2[1] << 16) | (dd2[0] << 24);
-+#endif
-+				d <<= 4;
-+				fb_writel(dd, dst);
-+				dst += 4;
-+			}
-+		}
-+
-+		dst += info->fix.line_length - width * bytespp;
-+		decor_src += (info->var.xres - width) * bytespp;
-+	}
-+}
-+
-+#define cc2cx(a) 						\
-+	((info->fix.visual == FB_VISUAL_TRUECOLOR || 		\
-+	  info->fix.visual == FB_VISUAL_DIRECTCOLOR) ? 		\
-+	 ((u32*)info->pseudo_palette)[a] : a)
-+
-+void fbcon_decor_putcs(struct vc_data *vc, struct fb_info *info,
-+		   const unsigned short *s, int count, int yy, int xx)
-+{
-+	unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
-+	struct fbcon_ops *ops = info->fbcon_par;
-+	int fg_color, bg_color, transparent;
-+	u8 *src;
-+	u32 bgx, fgx;
-+	u16 c = scr_readw(s);
-+
-+	fg_color = get_color(vc, info, c, 1);
-+        bg_color = get_color(vc, info, c, 0);
-+
-+	/* Don't paint the background image if console is blanked */
-+	transparent = ops->blank_state ? 0 :
-+		(vc->vc_decor.bg_color == bg_color);
-+
-+	xx = xx * vc->vc_font.width + vc->vc_decor.tx;
-+	yy = yy * vc->vc_font.height + vc->vc_decor.ty;
-+
-+	fgx = cc2cx(fg_color);
-+	bgx = cc2cx(bg_color);
-+
-+	while (count--) {
-+		c = scr_readw(s++);
-+		src = vc->vc_font.data + (c & charmask) * vc->vc_font.height *
-+		      ((vc->vc_font.width + 7) >> 3);
-+
-+		fbcon_decor_renderc(info, yy, xx, vc->vc_font.height,
-+			       vc->vc_font.width, src, fgx, bgx, transparent);
-+		xx += vc->vc_font.width;
-+	}
-+}
-+
-+void fbcon_decor_cursor(struct fb_info *info, struct fb_cursor *cursor)
-+{
-+	int i;
-+	unsigned int dsize, s_pitch;
-+	struct fbcon_ops *ops = info->fbcon_par;
-+	struct vc_data* vc;
-+	u8 *src;
-+
-+	/* we really don't need any cursors while the console is blanked */
-+	if (info->state != FBINFO_STATE_RUNNING || ops->blank_state)
-+		return;
-+
-+	vc = vc_cons[ops->currcon].d;
-+
-+	src = kmalloc(64 + sizeof(struct fb_image), GFP_ATOMIC);
-+	if (!src)
-+		return;
-+
-+	s_pitch = (cursor->image.width + 7) >> 3;
-+	dsize = s_pitch * cursor->image.height;
-+	if (cursor->enable) {
-+		switch (cursor->rop) {
-+		case ROP_XOR:
-+			for (i = 0; i < dsize; i++)
-+				src[i] = cursor->image.data[i] ^ cursor->mask[i];
-+                        break;
-+		case ROP_COPY:
-+		default:
-+			for (i = 0; i < dsize; i++)
-+				src[i] = cursor->image.data[i] & cursor->mask[i];
-+			break;
-+		}
-+	} else
-+		memcpy(src, cursor->image.data, dsize);
-+
-+	fbcon_decor_renderc(info,
-+			cursor->image.dy + vc->vc_decor.ty,
-+			cursor->image.dx + vc->vc_decor.tx,
-+			cursor->image.height,
-+			cursor->image.width,
-+			(u8*)src,
-+			cc2cx(cursor->image.fg_color),
-+			cc2cx(cursor->image.bg_color),
-+			cursor->image.bg_color == vc->vc_decor.bg_color);
-+
-+	kfree(src);
-+}
-+
-+static void decorset(u8 *dst, int height, int width, int dstbytes,
-+		        u32 bgx, int bpp)
-+{
-+	int i;
-+
-+	if (bpp == 8)
-+		bgx |= bgx << 8;
-+	if (bpp == 16 || bpp == 8)
-+		bgx |= bgx << 16;
-+
-+	while (height-- > 0) {
-+		u8 *p = dst;
-+
-+		switch (bpp) {
-+
-+		case 32:
-+			for (i=0; i < width; i++) {
-+				fb_writel(bgx, p); p += 4;
-+			}
-+			break;
-+		case 24:
-+			for (i=0; i < width; i++) {
-+#ifdef __LITTLE_ENDIAN
-+				fb_writew((bgx & 0xffff),(u16*)p); p += 2;
-+				fb_writeb((bgx >> 16),p++);
-+#else
-+				fb_writew((bgx >> 8),(u16*)p); p += 2;
-+				fb_writeb((bgx & 0xff),p++);
-+#endif
-+			}
-+		case 16:
-+			for (i=0; i < width/4; i++) {
-+				fb_writel(bgx,p); p += 4;
-+				fb_writel(bgx,p); p += 4;
-+			}
-+			if (width & 2) {
-+				fb_writel(bgx,p); p += 4;
-+			}
-+			if (width & 1)
-+				fb_writew(bgx,(u16*)p);
-+			break;
-+		case 8:
-+			for (i=0; i < width/4; i++) {
-+				fb_writel(bgx,p); p += 4;
-+			}
-+
-+			if (width & 2) {
-+				fb_writew(bgx,p); p += 2;
-+			}
-+			if (width & 1)
-+				fb_writeb(bgx,(u8*)p);
-+			break;
-+
-+		}
-+		dst += dstbytes;
-+	}
-+}
-+
-+void fbcon_decor_copy(u8 *dst, u8 *src, int height, int width, int linebytes,
-+		   int srclinebytes, int bpp)
-+{
-+	int i;
-+
-+	while (height-- > 0) {
-+		u32 *p = (u32 *)dst;
-+		u32 *q = (u32 *)src;
-+
-+		switch (bpp) {
-+
-+		case 32:
-+			for (i=0; i < width; i++)
-+				fb_writel(*q++, p++);
-+			break;
-+		case 24:
-+			for (i=0; i < (width*3/4); i++)
-+				fb_writel(*q++, p++);
-+			if ((width*3) % 4) {
-+				if (width & 2) {
-+					fb_writeb(*(u8*)q, (u8*)p);
-+				} else if (width & 1) {
-+					fb_writew(*(u16*)q, (u16*)p);
-+					fb_writeb(*(u8*)((u16*)q+1),(u8*)((u16*)p+2));
-+				}
-+			}
-+			break;
-+		case 16:
-+			for (i=0; i < width/4; i++) {
-+				fb_writel(*q++, p++);
-+				fb_writel(*q++, p++);
-+			}
-+			if (width & 2)
-+				fb_writel(*q++, p++);
-+			if (width & 1)
-+				fb_writew(*(u16*)q, (u16*)p);
-+			break;
-+		case 8:
-+			for (i=0; i < width/4; i++)
-+				fb_writel(*q++, p++);
-+
-+			if (width & 2) {
-+				fb_writew(*(u16*)q, (u16*)p);
-+				q = (u32*) ((u16*)q + 1);
-+				p = (u32*) ((u16*)p + 1);
-+			}
-+			if (width & 1)
-+				fb_writeb(*(u8*)q, (u8*)p);
-+			break;
-+		}
-+
-+		dst += linebytes;
-+		src += srclinebytes;
-+	}
-+}
-+
-+static void decorfill(struct fb_info *info, int sy, int sx, int height,
-+		       int width)
-+{
-+	int bytespp = ((info->var.bits_per_pixel + 7) >> 3);
-+	int d  = sy * info->fix.line_length + sx * bytespp;
-+	int ds = (sy * info->var.xres + sx) * bytespp;
-+
-+	fbcon_decor_copy((u8 *)(info->screen_base + d), (u8 *)(info->bgdecor.data + ds),
-+		    height, width, info->fix.line_length, info->var.xres * bytespp,
-+		    info->var.bits_per_pixel);
-+}
-+
-+void fbcon_decor_clear(struct vc_data *vc, struct fb_info *info, int sy, int sx,
-+		    int height, int width)
-+{
-+	int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
-+	struct fbcon_ops *ops = info->fbcon_par;
-+	u8 *dst;
-+	int transparent, bg_color = attr_bgcol_ec(bgshift, vc, info);
-+
-+	transparent = (vc->vc_decor.bg_color == bg_color);
-+	sy = sy * vc->vc_font.height + vc->vc_decor.ty;
-+	sx = sx * vc->vc_font.width + vc->vc_decor.tx;
-+	height *= vc->vc_font.height;
-+	width *= vc->vc_font.width;
-+
-+	/* Don't paint the background image if console is blanked */
-+	if (transparent && !ops->blank_state) {
-+		decorfill(info, sy, sx, height, width);
-+	} else {
-+		dst = (u8 *)(info->screen_base + sy * info->fix.line_length +
-+			     sx * ((info->var.bits_per_pixel + 7) >> 3));
-+		decorset(dst, height, width, info->fix.line_length, cc2cx(bg_color),
-+			  info->var.bits_per_pixel);
-+	}
-+}
-+
-+void fbcon_decor_clear_margins(struct vc_data *vc, struct fb_info *info,
-+			    int bottom_only)
-+{
-+	unsigned int tw = vc->vc_cols*vc->vc_font.width;
-+	unsigned int th = vc->vc_rows*vc->vc_font.height;
-+
-+	if (!bottom_only) {
-+		/* top margin */
-+		decorfill(info, 0, 0, vc->vc_decor.ty, info->var.xres);
-+		/* left margin */
-+		decorfill(info, vc->vc_decor.ty, 0, th, vc->vc_decor.tx);
-+		/* right margin */
-+		decorfill(info, vc->vc_decor.ty, vc->vc_decor.tx + tw, th, 
-+			   info->var.xres - vc->vc_decor.tx - tw);
-+	}
-+	decorfill(info, vc->vc_decor.ty + th, 0, 
-+		   info->var.yres - vc->vc_decor.ty - th, info->var.xres);
-+}
-+
-+void fbcon_decor_bmove_redraw(struct vc_data *vc, struct fb_info *info, int y, 
-+			   int sx, int dx, int width)
-+{
-+	u16 *d = (u16 *) (vc->vc_origin + vc->vc_size_row * y + dx * 2);
-+	u16 *s = d + (dx - sx);
-+	u16 *start = d;
-+	u16 *ls = d;
-+	u16 *le = d + width;
-+	u16 c;
-+	int x = dx;
-+	u16 attr = 1;
-+
-+	do {
-+		c = scr_readw(d);
-+		if (attr != (c & 0xff00)) {
-+			attr = c & 0xff00;
-+			if (d > start) {
-+				fbcon_decor_putcs(vc, info, start, d - start, y, x);
-+				x += d - start;
-+				start = d;
-+			}
-+		}
-+		if (s >= ls && s < le && c == scr_readw(s)) {
-+			if (d > start) {
-+				fbcon_decor_putcs(vc, info, start, d - start, y, x);
-+				x += d - start + 1;
-+				start = d + 1;
-+			} else {
-+				x++;
-+				start++;
-+			}
-+		}
-+		s++;
-+		d++;
-+	} while (d < le);
-+	if (d > start)
-+		fbcon_decor_putcs(vc, info, start, d - start, y, x);
-+}
-+
-+void fbcon_decor_blank(struct vc_data *vc, struct fb_info *info, int blank)
-+{
-+	if (blank) {
-+		decorset((u8 *)info->screen_base, info->var.yres, info->var.xres,
-+			  info->fix.line_length, 0, info->var.bits_per_pixel);
-+	} else {
-+		update_screen(vc);
-+		fbcon_decor_clear_margins(vc, info, 0);
-+	}
-+}
-+
-diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
-index b0a3fa0..7121e94 100644
---- a/drivers/video/console/fbcon.c
-+++ b/drivers/video/console/fbcon.c
-@@ -80,6 +80,7 @@
- #include <asm/system.h>
- 
- #include "fbcon.h"
-+#include "fbcondecor.h"
- 
- #ifdef FBCONDEBUG
- #  define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)
-@@ -95,7 +96,7 @@ enum {
- 
- static struct display fb_display[MAX_NR_CONSOLES];
- 
--static signed char con2fb_map[MAX_NR_CONSOLES];
-+signed char con2fb_map[MAX_NR_CONSOLES];
- static signed char con2fb_map_boot[MAX_NR_CONSOLES];
- 
- static int logo_lines;
-@@ -286,7 +287,7 @@ static inline int fbcon_is_inactive(struct vc_data *vc, struct fb_info *info)
- 		vc->vc_mode != KD_TEXT || ops->graphics);
- }
- 
--static int get_color(struct vc_data *vc, struct fb_info *info,
-+inline int get_color(struct vc_data *vc, struct fb_info *info,
- 	      u16 c, int is_fg)
- {
- 	int depth = fb_get_color_depth(&info->var, &info->fix);
-@@ -391,6 +392,7 @@ static void fb_flashcursor(struct work_struct *work)
- 		CM_ERASE : CM_DRAW;
- 	ops->cursor(vc, info, mode, softback_lines, get_color(vc, info, c, 1),
- 		    get_color(vc, info, c, 0));
-+	
- 	release_console_sem();
- }
- 
-@@ -527,6 +529,9 @@ static int search_for_mapped_con(void)
- static int fbcon_takeover(int show_logo)
- {
- 	int err, i;
-+#ifdef CONFIG_FB_CON_DECOR
-+	struct fb_info *info;
-+#endif
- 
- 	if (!num_registered_fb)
- 		return -ENODEV;
-@@ -547,6 +552,12 @@ static int fbcon_takeover(int show_logo)
- 		info_idx = -1;
- 	} else {
- 		fbcon_has_console_bind = 1;
-+#ifdef CONFIG_FB_CON_DECOR
-+		info = registered_fb[info_idx];
-+		unlock_fb_info(info);
-+		fbcon_decor_init();
-+		lock_fb_info(info);
-+#endif
- 	}
- 
- 	return err;
-@@ -1001,6 +1012,12 @@ static const char *fbcon_startup(void)
- 	rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
- 	cols /= vc->vc_font.width;
- 	rows /= vc->vc_font.height;
-+
-+	if (fbcon_decor_active(info, vc)) {
-+		cols = vc->vc_decor.twidth / vc->vc_font.width;
-+		rows = vc->vc_decor.theight / vc->vc_font.height;
-+	}
-+
- 	vc_resize(vc, cols, rows);
- 
- 	DPRINTK("mode:   %s\n", info->fix.id);
-@@ -1030,7 +1047,7 @@ static void fbcon_init(struct vc_data *vc, int init)
- 	cap = info->flags;
- 
- 	if (vc != svc || logo_shown == FBCON_LOGO_DONTSHOW ||
--	    (info->fix.type == FB_TYPE_TEXT))
-+	    (info->fix.type == FB_TYPE_TEXT) || fbcon_decor_active(info, vc))
- 		logo = 0;
- 
- 	if (var_to_display(p, &info->var, info))
-@@ -1239,6 +1256,11 @@ static void fbcon_clear(struct vc_data *vc, int sy, int sx, int height,
- 	if (sy < vc->vc_top && vc->vc_top == logo_lines)
- 		vc->vc_top = 0;
- 
-+ 	if (fbcon_decor_active(info, vc)) {
-+ 		fbcon_decor_clear(vc, info, sy, sx, height, width);
-+ 		return;
-+ 	}
-+ 	
- 	/* Split blits that cross physical y_wrap boundary */
- 
- 	y_break = p->vrows - p->yscroll;
-@@ -1258,10 +1280,15 @@ static void fbcon_putcs(struct vc_data *vc, const unsigned short *s,
- 	struct display *p = &fb_display[vc->vc_num];
- 	struct fbcon_ops *ops = info->fbcon_par;
- 
--	if (!fbcon_is_inactive(vc, info))
--		ops->putcs(vc, info, s, count, real_y(p, ypos), xpos,
--			   get_color(vc, info, scr_readw(s), 1),
--			   get_color(vc, info, scr_readw(s), 0));
-+	if (!fbcon_is_inactive(vc, info)) {
-+		
-+		if (fbcon_decor_active(info, vc))
-+			fbcon_decor_putcs(vc, info, s, count, ypos, xpos);
-+		else
-+			ops->putcs(vc, info, s, count, real_y(p, ypos), xpos,
-+				   get_color(vc, info, scr_readw(s), 1),
-+				   get_color(vc, info, scr_readw(s), 0));
-+	}
- }
- 
- static void fbcon_putc(struct vc_data *vc, int c, int ypos, int xpos)
-@@ -1277,8 +1304,13 @@ static void fbcon_clear_margins(struct vc_data *vc, int bottom_only)
- 	struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
- 	struct fbcon_ops *ops = info->fbcon_par;
- 
--	if (!fbcon_is_inactive(vc, info))
--		ops->clear_margins(vc, info, bottom_only);
-+	if (!fbcon_is_inactive(vc, info)) {
-+	 	if (fbcon_decor_active(info, vc)) {
-+	 		fbcon_decor_clear_margins(vc, info, bottom_only);
-+ 		} else {
-+			ops->clear_margins(vc, info, bottom_only);
-+		}
-+	}
- }
- 
- static void fbcon_cursor(struct vc_data *vc, int mode)
-@@ -1798,7 +1830,7 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
- 			count = vc->vc_rows;
- 		if (softback_top)
- 			fbcon_softback_note(vc, t, count);
--		if (logo_shown >= 0)
-+		if (logo_shown >= 0 || fbcon_decor_active(info, vc))
- 			goto redraw_up;
- 		switch (p->scrollmode) {
- 		case SCROLL_MOVE:
-@@ -1891,6 +1923,8 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
- 			count = vc->vc_rows;
- 		if (logo_shown >= 0)
- 			goto redraw_down;
-+		if (fbcon_decor_active(info, vc))
-+			goto redraw_down;
- 		switch (p->scrollmode) {
- 		case SCROLL_MOVE:
- 			fbcon_redraw_blit(vc, info, p, b - 1, b - t - count,
-@@ -2039,6 +2073,13 @@ static void fbcon_bmove_rec(struct vc_data *vc, struct display *p, int sy, int s
- 		}
- 		return;
- 	}
-+
-+	if (fbcon_decor_active(info, vc) && sy == dy && height == 1) {
-+ 		/* must use slower redraw bmove to keep background pic intact */
-+ 		fbcon_decor_bmove_redraw(vc, info, sy, sx, dx, width);
-+ 		return;
-+ 	}
-+	
- 	ops->bmove(vc, info, real_y(p, sy), sx, real_y(p, dy), dx,
- 		   height, width);
- }
-@@ -2109,8 +2150,8 @@ static int fbcon_resize(struct vc_data *vc, unsigned int width,
- 	var.yres = virt_h * virt_fh;
- 	x_diff = info->var.xres - var.xres;
- 	y_diff = info->var.yres - var.yres;
--	if (x_diff < 0 || x_diff > virt_fw ||
--	    y_diff < 0 || y_diff > virt_fh) {
-+	if ((x_diff < 0 || x_diff > virt_fw ||
-+		y_diff < 0 || y_diff > virt_fh) && !vc->vc_decor.state) {
- 		const struct fb_videomode *mode;
- 
- 		DPRINTK("attempting resize %ix%i\n", var.xres, var.yres);
-@@ -2146,6 +2187,21 @@ static int fbcon_switch(struct vc_data *vc)
- 
- 	info = registered_fb[con2fb_map[vc->vc_num]];
- 	ops = info->fbcon_par;
-+	prev_console = ops->currcon;
-+	if (prev_console != -1)
-+		old_info = registered_fb[con2fb_map[prev_console]];
-+
-+#ifdef CONFIG_FB_CON_DECOR
-+	if (!fbcon_decor_active_vc(vc) && info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
-+		struct vc_data *vc_curr = vc_cons[prev_console].d;
-+		if (vc_curr && fbcon_decor_active_vc(vc_curr)) {
-+			/* Clear the screen to avoid displaying funky colors during
-+			 * palette updates. */
-+			memset((u8*)info->screen_base + info->fix.line_length * info->var.yoffset,
-+			       0, info->var.yres * info->fix.line_length);
-+		}
-+	}
-+#endif
- 
- 	if (softback_top) {
- 		if (softback_lines)
-@@ -2164,9 +2220,6 @@ static int fbcon_switch(struct vc_data *vc)
- 		logo_shown = FBCON_LOGO_CANSHOW;
- 	}
- 
--	prev_console = ops->currcon;
--	if (prev_console != -1)
--		old_info = registered_fb[con2fb_map[prev_console]];
- 	/*
- 	 * FIXME: If we have multiple fbdev's loaded, we need to
- 	 * update all info->currcon.  Perhaps, we can place this
-@@ -2210,6 +2263,18 @@ static int fbcon_switch(struct vc_data *vc)
- 			fbcon_del_cursor_timer(old_info);
- 	}
- 
-+	if (fbcon_decor_active_vc(vc)) {
-+		struct vc_data *vc_curr = vc_cons[prev_console].d;
-+
-+		if (!vc_curr->vc_decor.theme ||
-+			strcmp(vc->vc_decor.theme, vc_curr->vc_decor.theme) ||
-+			(fbcon_decor_active_nores(info, vc_curr) &&
-+			 !fbcon_decor_active(info, vc_curr))) {
-+			if (fbcon_decor_call_helper("modechange", vc->vc_num))
-+				fbcon_decor_disable(vc, 0);
-+		}
-+	}
-+
- 	if (fbcon_is_inactive(vc, info) ||
- 	    ops->blank_state != FB_BLANK_UNBLANK)
- 		fbcon_del_cursor_timer(info);
-@@ -2318,15 +2383,20 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
- 		}
- 	}
- 
-- 	if (!fbcon_is_inactive(vc, info)) {
-+	if (!fbcon_is_inactive(vc, info)) {
- 		if (ops->blank_state != blank) {
- 			ops->blank_state = blank;
- 			fbcon_cursor(vc, blank ? CM_ERASE : CM_DRAW);
- 			ops->cursor_flash = (!blank);
- 
--			if (!(info->flags & FBINFO_MISC_USEREVENT))
--				if (fb_blank(info, blank))
--					fbcon_generic_blank(vc, info, blank);
-+			if (!(info->flags & FBINFO_MISC_USEREVENT)) {
-+				if (fb_blank(info, blank)) {
-+					if (fbcon_decor_active(info, vc))
-+						fbcon_decor_blank(vc, info, blank);
-+					else
-+						fbcon_generic_blank(vc, info, blank);
-+				}
-+			}
- 		}
- 
- 		if (!blank)
-@@ -2477,13 +2547,22 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
- 	}
- 
- 	if (resize) {
-+		/* reset wrap/pan */
- 		int cols, rows;
- 
- 		cols = FBCON_SWAP(ops->rotate, info->var.xres, info->var.yres);
- 		rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
-+
-+		if (fbcon_decor_active(info, vc)) {
-+			info->var.xoffset = info->var.yoffset = p->yscroll = 0;
-+			cols = vc->vc_decor.twidth;
-+			rows = vc->vc_decor.theight;
-+		}
- 		cols /= w;
- 		rows /= h;
-+
- 		vc_resize(vc, cols, rows);
-+
- 		if (CON_IS_VISIBLE(vc) && softback_buf)
- 			fbcon_update_softback(vc);
- 	} else if (CON_IS_VISIBLE(vc)
-@@ -2612,7 +2691,11 @@ static int fbcon_set_palette(struct vc_data *vc, unsigned char *table)
- 	int i, j, k, depth;
- 	u8 val;
- 
--	if (fbcon_is_inactive(vc, info))
-+	if (fbcon_is_inactive(vc, info)
-+#ifdef CONFIG_FB_CON_DECOR
-+			|| vc->vc_num != fg_console
-+#endif
-+		)
- 		return -EINVAL;
- 
- 	if (!CON_IS_VISIBLE(vc))
-@@ -2638,7 +2721,49 @@ static int fbcon_set_palette(struct vc_data *vc, unsigned char *table)
- 	} else
- 		fb_copy_cmap(fb_default_cmap(1 << depth), &palette_cmap);
- 
--	return fb_set_cmap(&palette_cmap, info);
-+	if (fbcon_decor_active(info, vc_cons[fg_console].d) &&
-+	    info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
-+
-+		u16 *red, *green, *blue;
-+		int minlen = min(min(info->var.red.length, info->var.green.length), 
-+				     info->var.blue.length);
-+		int h;
-+
-+		struct fb_cmap cmap = {
-+			.start = 0,
-+			.len = (1 << minlen),
-+			.red = NULL,
-+			.green = NULL,
-+			.blue = NULL,
-+			.transp = NULL
-+		};
-+
-+		red = kmalloc(256 * sizeof(u16) * 3, GFP_KERNEL);
-+	
-+		if (!red)
-+			goto out;		
-+	
-+		green = red + 256;
-+		blue = green + 256;
-+		cmap.red = red;
-+		cmap.green = green;
-+		cmap.blue = blue;
-+		
-+		for (i = 0; i < cmap.len; i++) {
-+			red[i] = green[i] = blue[i] = (0xffff * i)/(cmap.len-1);
-+		}
-+
-+		h = fb_set_cmap(&cmap, info);
-+		fbcon_decor_fix_pseudo_pal(info, vc_cons[fg_console].d);
-+		kfree(red);
-+		
-+		return h;
-+		
-+	} else if (fbcon_decor_active(info, vc_cons[fg_console].d) && 
-+		   info->var.bits_per_pixel == 8 && info->bgdecor.cmap.red != NULL) 
-+		fb_set_cmap(&info->bgdecor.cmap, info);
-+		
-+out:	return fb_set_cmap(&palette_cmap, info);
- }
- 
- static u16 *fbcon_screen_pos(struct vc_data *vc, int offset)
-@@ -2846,7 +2971,7 @@ static void fbcon_modechanged(struct fb_info *info)
- 	struct fbcon_ops *ops = info->fbcon_par;
- 	struct vc_data *vc;
- 	struct display *p;
--	int rows, cols;
-+	int rows, cols, res;
- 
- 	if (!ops || ops->currcon < 0)
- 		return;
-@@ -2864,7 +2989,18 @@ static void fbcon_modechanged(struct fb_info *info)
- 		rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
- 		cols /= vc->vc_font.width;
- 		rows /= vc->vc_font.height;
--		vc_resize(vc, cols, rows);
-+
-+		if (!fbcon_decor_active_nores(info, vc)) {
-+			vc_resize(vc, cols, rows);
-+		} else {
-+			/* HACK: Do this properly at some point.. */
-+			unlock_fb_info(info);
-+			res = fbcon_decor_call_helper("modechange", vc->vc_num);
-+			lock_fb_info(info);
-+			if (res)
-+				fbcon_decor_disable(vc, 0);
-+		}
-+
- 		updatescrollmode(p, info, vc);
- 		scrollback_max = 0;
- 		scrollback_current = 0;
-@@ -3516,6 +3652,7 @@ static void fbcon_exit(void)
- 		}
- 	}
- 
-+	fbcon_decor_exit();
- 	fbcon_has_exited = 1;
- }
- 
-diff --git a/drivers/video/console/fbcondecor.c b/drivers/video/console/fbcondecor.c
-new file mode 100644
-index 0000000..a0b4ae3
---- /dev/null
-+++ b/drivers/video/console/fbcondecor.c
-@@ -0,0 +1,561 @@
-+/*
-+ *  linux/drivers/video/console/fbcondecor.c -- Framebuffer console decorations
-+ *
-+ *  Copyright (C) 2004-2009 Michal Januszewski <spock@gentoo.org>
-+ *
-+ *  Code based upon "Bootsplash" (C) 2001-2003
-+ *       Volker Poplawski <volker@poplawski.de>,
-+ *       Stefan Reinauer <stepan@suse.de>,
-+ *       Steffen Winterfeldt <snwint@suse.de>,
-+ *       Michael Schroeder <mls@suse.de>,
-+ *       Ken Wimer <wimer@suse.de>.
-+ *
-+ *  Compat ioctl support by Thorsten Klein <TK@Thorsten-Klein.de>.
-+ *
-+ *  This file is subject to the terms and conditions of the GNU General Public
-+ *  License.  See the file COPYING in the main directory of this archive for
-+ *  more details.
-+ *
-+ */
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/string.h>
-+#include <linux/types.h>
-+#include <linux/fb.h>
-+#include <linux/vt_kern.h>
-+#include <linux/vmalloc.h>
-+#include <linux/unistd.h>
-+#include <linux/syscalls.h>
-+#include <linux/init.h>
-+#include <linux/proc_fs.h>
-+#include <linux/workqueue.h>
-+#include <linux/kmod.h>
-+#include <linux/miscdevice.h>
-+#include <linux/device.h>
-+#include <linux/fs.h>
-+#include <linux/compat.h>
-+
-+#include <asm/uaccess.h>
-+#include <asm/irq.h>
-+#include <asm/system.h>
-+
-+#include "fbcon.h"
-+#include "fbcondecor.h"
-+
-+extern signed char con2fb_map[];
-+static int fbcon_decor_enable(struct vc_data *vc);
-+char fbcon_decor_path[KMOD_PATH_LEN] = "/sbin/fbcondecor_helper";
-+static int initialized = 0;
-+
-+int fbcon_decor_call_helper(char* cmd, unsigned short vc)
-+{
-+	char *envp[] = {
-+		"HOME=/",
-+		"PATH=/sbin:/bin",
-+		NULL
-+	};
-+
-+	char tfb[5];
-+	char tcons[5];
-+	unsigned char fb = (int) con2fb_map[vc];
-+
-+	char *argv[] = {
-+		fbcon_decor_path,
-+		"2",
-+		cmd,
-+		tcons,
-+		tfb,
-+		vc_cons[vc].d->vc_decor.theme,
-+		NULL
-+	};
-+
-+	snprintf(tfb,5,"%d",fb);
-+	snprintf(tcons,5,"%d",vc);
-+
-+	return call_usermodehelper(fbcon_decor_path, argv, envp, 1);
-+}
-+
-+/* Disables fbcondecor on a virtual console; called with console sem held. */
-+int fbcon_decor_disable(struct vc_data *vc, unsigned char redraw)
-+{
-+	struct fb_info* info;
-+
-+	if (!vc->vc_decor.state)
-+		return -EINVAL;
-+
-+	info = registered_fb[(int) con2fb_map[vc->vc_num]];
-+
-+	if (info == NULL)
-+		return -EINVAL;
-+
-+	vc->vc_decor.state = 0;
-+	vc_resize(vc, info->var.xres / vc->vc_font.width,
-+		  info->var.yres / vc->vc_font.height);
-+
-+	if (fg_console == vc->vc_num && redraw) {
-+		redraw_screen(vc, 0);
-+		update_region(vc, vc->vc_origin +
-+			      vc->vc_size_row * vc->vc_top,
-+			      vc->vc_size_row * (vc->vc_bottom - vc->vc_top) / 2);
-+	}
-+
-+	printk(KERN_INFO "fbcondecor: switched decor state to 'off' on console %d\n",
-+			 vc->vc_num);
-+
-+	return 0;
-+}
-+
-+/* Enables fbcondecor on a virtual console; called with console sem held. */
-+static int fbcon_decor_enable(struct vc_data *vc)
-+{
-+	struct fb_info* info;
-+
-+	info = registered_fb[(int) con2fb_map[vc->vc_num]];
-+
-+	if (vc->vc_decor.twidth == 0 || vc->vc_decor.theight == 0 ||
-+	    info == NULL || vc->vc_decor.state || (!info->bgdecor.data &&
-+	    vc->vc_num == fg_console))
-+		return -EINVAL;
-+
-+	vc->vc_decor.state = 1;
-+	vc_resize(vc, vc->vc_decor.twidth / vc->vc_font.width,
-+		  vc->vc_decor.theight / vc->vc_font.height);
-+
-+	if (fg_console == vc->vc_num) {
-+		redraw_screen(vc, 0);
-+		update_region(vc, vc->vc_origin +
-+			      vc->vc_size_row * vc->vc_top,
-+			      vc->vc_size_row * (vc->vc_bottom - vc->vc_top) / 2);
-+		fbcon_decor_clear_margins(vc, info, 0);
-+	}
-+
-+	printk(KERN_INFO "fbcondecor: switched decor state to 'on' on console %d\n",
-+			 vc->vc_num);
-+
-+	return 0;
-+}
-+
-+static inline long fbcon_decor_ioctl_dosetstate(struct vc_data *vc, unsigned int state, unsigned char origin)
-+{
-+	int ret;
-+
-+	if (origin == FBCON_DECOR_IO_ORIG_USER)
-+		acquire_console_sem();
-+	if (!state)
-+		ret = fbcon_decor_disable(vc, 1);
-+	else
-+		ret = fbcon_decor_enable(vc);
-+	if (origin == FBCON_DECOR_IO_ORIG_USER)
-+		release_console_sem();
-+
-+	return ret;
-+}
-+
-+static inline void fbcon_decor_ioctl_dogetstate(struct vc_data *vc, unsigned int *state)
-+{
-+	*state = vc->vc_decor.state;
-+}
-+
-+static long fbcon_decor_ioctl_dosetcfg(struct vc_data *vc, struct vc_decor *cfg, unsigned char origin)
-+{
-+	struct fb_info *info;
-+	int len;
-+	char *tmp;
-+
-+	info = registered_fb[(int) con2fb_map[vc->vc_num]];
-+
-+	if (info == NULL || !cfg->twidth || !cfg->theight ||
-+	    cfg->tx + cfg->twidth  > info->var.xres ||
-+	    cfg->ty + cfg->theight > info->var.yres)
-+		return -EINVAL;
-+
-+	len = strlen_user(cfg->theme);
-+	if (!len || len > FBCON_DECOR_THEME_LEN)
-+		return -EINVAL;
-+	tmp = kmalloc(len, GFP_KERNEL);
-+	if (!tmp)
-+		return -ENOMEM;
-+	if (copy_from_user(tmp, (void __user *)cfg->theme, len))
-+		return -EFAULT;
-+	cfg->theme = tmp;
-+	cfg->state = 0;
-+
-+	/* If this ioctl is a response to a request from kernel, the console sem
-+	 * is already held; we also don't need to disable decor because either the
-+	 * new config and background picture will be successfully loaded, and the
-+	 * decor will stay on, or in case of a failure it'll be turned off in fbcon. */
-+	if (origin == FBCON_DECOR_IO_ORIG_USER) {
-+		acquire_console_sem();
-+		if (vc->vc_decor.state)
-+			fbcon_decor_disable(vc, 1);
-+	}
-+
-+	if (vc->vc_decor.theme)
-+		kfree(vc->vc_decor.theme);
-+
-+	vc->vc_decor = *cfg;
-+
-+	if (origin == FBCON_DECOR_IO_ORIG_USER)
-+		release_console_sem();
-+
-+	printk(KERN_INFO "fbcondecor: console %d using theme '%s'\n",
-+			 vc->vc_num, vc->vc_decor.theme);
-+	return 0;
-+}
-+
-+static long fbcon_decor_ioctl_dogetcfg(struct vc_data *vc, struct vc_decor *decor)
-+{
-+	char __user *tmp;
-+
-+	tmp = decor->theme;
-+	*decor = vc->vc_decor;
-+	decor->theme = tmp;
-+
-+	if (vc->vc_decor.theme) {
-+		if (copy_to_user(tmp, vc->vc_decor.theme, strlen(vc->vc_decor.theme) + 1))
-+			return -EFAULT;
-+	} else
-+		if (put_user(0, tmp))
-+			return -EFAULT;
-+
-+	return 0;
-+}
-+
-+static long fbcon_decor_ioctl_dosetpic(struct vc_data *vc, struct fb_image *img, unsigned char origin)
-+{
-+	struct fb_info *info;
-+	int len;
-+	u8 *tmp;
-+
-+	if (vc->vc_num != fg_console)
-+		return -EINVAL;
-+
-+	info = registered_fb[(int) con2fb_map[vc->vc_num]];
-+
-+	if (info == NULL)
-+		return -EINVAL;
-+
-+	if (img->width != info->var.xres || img->height != info->var.yres) {
-+		printk(KERN_ERR "fbcondecor: picture dimensions mismatch\n");
-+		printk(KERN_ERR "%dx%d vs %dx%d\n", img->width, img->height, info->var.xres, info->var.yres);
-+		return -EINVAL;
-+	}
-+
-+	if (img->depth != info->var.bits_per_pixel) {
-+		printk(KERN_ERR "fbcondecor: picture depth mismatch\n");
-+		return -EINVAL;
-+	}
-+
-+	if (img->depth == 8) {
-+		if (!img->cmap.len || !img->cmap.red || !img->cmap.green ||
-+		    !img->cmap.blue)
-+			return -EINVAL;
-+
-+		tmp = vmalloc(img->cmap.len * 3 * 2);
-+		if (!tmp)
-+			return -ENOMEM;
-+
-+		if (copy_from_user(tmp,
-+			    	   (void __user*)img->cmap.red, (img->cmap.len << 1)) ||
-+		    copy_from_user(tmp + (img->cmap.len << 1),
-+			    	   (void __user*)img->cmap.green, (img->cmap.len << 1)) ||
-+		    copy_from_user(tmp + (img->cmap.len << 2),
-+			    	   (void __user*)img->cmap.blue, (img->cmap.len << 1))) {
-+			vfree(tmp);
-+			return -EFAULT;
-+		}
-+
-+		img->cmap.transp = NULL;
-+		img->cmap.red = (u16*)tmp;
-+		img->cmap.green = img->cmap.red + img->cmap.len;
-+		img->cmap.blue = img->cmap.green + img->cmap.len;
-+	} else {
-+		img->cmap.red = NULL;
-+	}
-+
-+	len = ((img->depth + 7) >> 3) * img->width * img->height;
-+
-+	/*
-+	 * Allocate an additional byte so that we never go outside of the
-+	 * buffer boundaries in the rendering functions in a 24 bpp mode.
-+	 */
-+	tmp = vmalloc(len + 1);
-+
-+	if (!tmp)
-+		goto out;
-+
-+	if (copy_from_user(tmp, (void __user*)img->data, len))
-+		goto out;
-+
-+	img->data = tmp;
-+
-+	/* If this ioctl is a response to a request from kernel, the console sem
-+	 * is already held. */
-+	if (origin == FBCON_DECOR_IO_ORIG_USER)
-+		acquire_console_sem();
-+
-+	if (info->bgdecor.data)
-+		vfree((u8*)info->bgdecor.data);
-+	if (info->bgdecor.cmap.red)
-+		vfree(info->bgdecor.cmap.red);
-+
-+	info->bgdecor = *img;
-+
-+	if (fbcon_decor_active_vc(vc) && fg_console == vc->vc_num) {
-+		redraw_screen(vc, 0);
-+		update_region(vc, vc->vc_origin +
-+			      vc->vc_size_row * vc->vc_top,
-+			      vc->vc_size_row * (vc->vc_bottom - vc->vc_top) / 2);
-+		fbcon_decor_clear_margins(vc, info, 0);
-+	}
-+
-+	if (origin == FBCON_DECOR_IO_ORIG_USER)
-+		release_console_sem();
-+
-+	return 0;
-+
-+out:	if (img->cmap.red)
-+		vfree(img->cmap.red);
-+
-+	if (tmp)
-+		vfree(tmp);
-+	return -ENOMEM;
-+}
-+
-+static long fbcon_decor_ioctl(struct file *filp, u_int cmd,
-+			u_long arg)
-+{
-+	struct fbcon_decor_iowrapper __user *wrapper = (void __user*) arg;
-+	struct vc_data *vc = NULL;
-+	unsigned short vc_num = 0;
-+	unsigned char origin = 0;
-+	void __user *data = NULL;
-+
-+	if (!access_ok(VERIFY_READ, wrapper,
-+			sizeof(struct fbcon_decor_iowrapper)))
-+		return -EFAULT;
-+
-+	__get_user(vc_num, &wrapper->vc);
-+	__get_user(origin, &wrapper->origin);
-+	__get_user(data, &wrapper->data);
-+
-+	if (!vc_cons_allocated(vc_num))
-+		return -EINVAL;
-+
-+	vc = vc_cons[vc_num].d;
-+
-+	switch (cmd) {
-+	case FBIOCONDECOR_SETPIC:
-+	{
-+		struct fb_image img;
-+		if (copy_from_user(&img, (struct fb_image __user *)data, sizeof(struct fb_image)))
-+			return -EFAULT;
-+
-+		return fbcon_decor_ioctl_dosetpic(vc, &img, origin);
-+	}
-+	case FBIOCONDECOR_SETCFG:
-+	{
-+		struct vc_decor cfg;
-+		if (copy_from_user(&cfg, (struct vc_decor __user *)data, sizeof(struct vc_decor)))
-+			return -EFAULT;
-+
-+		return fbcon_decor_ioctl_dosetcfg(vc, &cfg, origin);
-+	}
-+	case FBIOCONDECOR_GETCFG:
-+	{
-+		int rval;
-+		struct vc_decor cfg;
-+
-+		if (copy_from_user(&cfg, (struct vc_decor __user *)data, sizeof(struct vc_decor)))
-+			return -EFAULT;
-+
-+		rval = fbcon_decor_ioctl_dogetcfg(vc, &cfg);
-+
-+		if (copy_to_user(data, &cfg, sizeof(struct vc_decor)))
-+			return -EFAULT;
-+		return rval;
-+	}
-+	case FBIOCONDECOR_SETSTATE:
-+	{
-+		unsigned int state = 0;
-+		if (get_user(state, (unsigned int __user *)data))
-+			return -EFAULT;
-+		return fbcon_decor_ioctl_dosetstate(vc, state, origin);
-+	}
-+	case FBIOCONDECOR_GETSTATE:
-+	{
-+		unsigned int state = 0;
-+		fbcon_decor_ioctl_dogetstate(vc, &state);
-+		return put_user(state, (unsigned int __user *)data);
-+	}
-+
-+	default:
-+		return -ENOIOCTLCMD;
-+	}
-+}
-+
-+#ifdef CONFIG_COMPAT
-+
-+static long fbcon_decor_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) {
-+
-+	struct fbcon_decor_iowrapper32 __user *wrapper = (void __user *)arg;
-+	struct vc_data *vc = NULL;
-+	unsigned short vc_num = 0;
-+	unsigned char origin = 0;
-+	compat_uptr_t data_compat = 0;
-+	void __user *data = NULL;
-+
-+	if (!access_ok(VERIFY_READ, wrapper,
-+                       sizeof(struct fbcon_decor_iowrapper32)))
-+		return -EFAULT;
-+
-+	__get_user(vc_num, &wrapper->vc);
-+	__get_user(origin, &wrapper->origin);
-+	__get_user(data_compat, &wrapper->data);
-+	data = compat_ptr(data_compat);
-+
-+	if (!vc_cons_allocated(vc_num))
-+		return -EINVAL;
-+
-+	vc = vc_cons[vc_num].d;
-+
-+	switch (cmd) {
-+	case FBIOCONDECOR_SETPIC32:
-+	{
-+		struct fb_image32 img_compat;
-+		struct fb_image img;
-+
-+		if (copy_from_user(&img_compat, (struct fb_image32 __user *)data, sizeof(struct fb_image32)))
-+			return -EFAULT;
-+
-+		fb_image_from_compat(img, img_compat);
-+
-+		return fbcon_decor_ioctl_dosetpic(vc, &img, origin);
-+	}
-+
-+	case FBIOCONDECOR_SETCFG32:
-+	{
-+		struct vc_decor32 cfg_compat;
-+		struct vc_decor cfg;
-+
-+		if (copy_from_user(&cfg_compat, (struct vc_decor32 __user *)data, sizeof(struct vc_decor32)))
-+			return -EFAULT;
-+
-+		vc_decor_from_compat(cfg, cfg_compat);
-+
-+		return fbcon_decor_ioctl_dosetcfg(vc, &cfg, origin);
-+	}
-+
-+	case FBIOCONDECOR_GETCFG32:
-+	{
-+		int rval;
-+		struct vc_decor32 cfg_compat;
-+		struct vc_decor cfg;
-+
-+		if (copy_from_user(&cfg_compat, (struct vc_decor32 __user *)data, sizeof(struct vc_decor32)))
-+			return -EFAULT;
-+		cfg.theme = compat_ptr(cfg_compat.theme);
-+
-+		rval = fbcon_decor_ioctl_dogetcfg(vc, &cfg);
-+
-+		vc_decor_to_compat(cfg_compat, cfg);
-+
-+		if (copy_to_user((struct vc_decor32 __user *)data, &cfg_compat, sizeof(struct vc_decor32)))
-+			return -EFAULT;
-+		return rval;
-+	}
-+
-+	case FBIOCONDECOR_SETSTATE32:
-+	{
-+		compat_uint_t state_compat = 0;
-+		unsigned int state = 0;
-+
-+		if (get_user(state_compat, (compat_uint_t __user *)data))
-+			return -EFAULT;
-+
-+		state = (unsigned int)state_compat;
-+
-+		return fbcon_decor_ioctl_dosetstate(vc, state, origin);
-+	}
-+
-+	case FBIOCONDECOR_GETSTATE32:
-+	{
-+		compat_uint_t state_compat = 0;
-+		unsigned int state = 0;
-+
-+		fbcon_decor_ioctl_dogetstate(vc, &state);
-+		state_compat = (compat_uint_t)state;
-+
-+		return put_user(state_compat, (compat_uint_t __user *)data);
-+	}
-+
-+	default:
-+		return -ENOIOCTLCMD;
-+	}
-+}
-+#else
-+  #define fbcon_decor_compat_ioctl NULL
-+#endif
-+
-+static struct file_operations fbcon_decor_ops = {
-+	.owner = THIS_MODULE,
-+	.unlocked_ioctl = fbcon_decor_ioctl,
-+	.compat_ioctl = fbcon_decor_compat_ioctl
-+};
-+
-+static struct miscdevice fbcon_decor_dev = {
-+	.minor = MISC_DYNAMIC_MINOR,
-+	.name = "fbcondecor",
-+	.fops = &fbcon_decor_ops
-+};
-+
-+void fbcon_decor_reset(void)
-+{
-+	struct fb_info *info;
-+	struct vc_data *vc;
-+	int i;
-+
-+	vc = vc_cons[0].d;
-+	info = registered_fb[0];
-+
-+	for (i = 0; i < num_registered_fb; i++) {
-+		registered_fb[i]->bgdecor.data = NULL;
-+		registered_fb[i]->bgdecor.cmap.red = NULL;
-+	}
-+
-+	for (i = 0; i < MAX_NR_CONSOLES && vc_cons[i].d; i++) {
-+		vc_cons[i].d->vc_decor.state = vc_cons[i].d->vc_decor.twidth =
-+						vc_cons[i].d->vc_decor.theight = 0;
-+		vc_cons[i].d->vc_decor.theme = NULL;
-+	}
-+
-+	return;
-+}
-+
-+int fbcon_decor_init(void)
-+{
-+	int i;
-+
-+	fbcon_decor_reset();
-+
-+	if (initialized)
-+		return 0;
-+
-+	i = misc_register(&fbcon_decor_dev);
-+	if (i) {
-+		printk(KERN_ERR "fbcondecor: failed to register device\n");
-+		return i;
-+	}
-+
-+	fbcon_decor_call_helper("init", 0);
-+	initialized = 1;
-+	return 0;
-+}
-+
-+int fbcon_decor_exit(void)
-+{
-+	fbcon_decor_reset();
-+	return 0;
-+}
-+
-+EXPORT_SYMBOL(fbcon_decor_path);
-diff --git a/drivers/video/console/fbcondecor.h b/drivers/video/console/fbcondecor.h
-new file mode 100644
-index 0000000..1d852dd
---- /dev/null
-+++ b/drivers/video/console/fbcondecor.h
-@@ -0,0 +1,78 @@
-+/* 
-+ *  linux/drivers/video/console/fbcondecor.h -- Framebuffer Console Decoration headers
-+ *
-+ *  Copyright (C) 2004 Michal Januszewski <spock@gentoo.org>
-+ *
-+ */
-+
-+#ifndef __FBCON_DECOR_H
-+#define __FBCON_DECOR_H
-+
-+#ifndef _LINUX_FB_H
-+#include <linux/fb.h>
-+#endif
-+
-+/* This is needed for vc_cons in fbcmap.c */
-+#include <linux/vt_kern.h>
-+
-+struct fb_cursor;
-+struct fb_info;
-+struct vc_data;
-+
-+#ifdef CONFIG_FB_CON_DECOR
-+/* fbcondecor.c */
-+int fbcon_decor_init(void);
-+int fbcon_decor_exit(void);
-+int fbcon_decor_call_helper(char* cmd, unsigned short cons);
-+int fbcon_decor_disable(struct vc_data *vc, unsigned char redraw);
-+
-+/* cfbcondecor.c */
-+void fbcon_decor_putcs(struct vc_data *vc, struct fb_info *info, const unsigned short *s, int count, int yy, int xx);
-+void fbcon_decor_cursor(struct fb_info *info, struct fb_cursor *cursor);
-+void fbcon_decor_clear(struct vc_data *vc, struct fb_info *info, int sy, int sx, int height, int width);
-+void fbcon_decor_clear_margins(struct vc_data *vc, struct fb_info *info, int bottom_only);
-+void fbcon_decor_blank(struct vc_data *vc, struct fb_info *info, int blank);
-+void fbcon_decor_bmove_redraw(struct vc_data *vc, struct fb_info *info, int y, int sx, int dx, int width);
-+void fbcon_decor_copy(u8 *dst, u8 *src, int height, int width, int linebytes, int srclinesbytes, int bpp);
-+void fbcon_decor_fix_pseudo_pal(struct fb_info *info, struct vc_data *vc);
-+
-+/* vt.c */
-+void acquire_console_sem(void);
-+void release_console_sem(void);
-+void do_unblank_screen(int entering_gfx);
-+
-+/* struct vc_data *y */
-+#define fbcon_decor_active_vc(y) (y->vc_decor.state && y->vc_decor.theme) 
-+
-+/* struct fb_info *x, struct vc_data *y */
-+#define fbcon_decor_active_nores(x,y) (x->bgdecor.data && fbcon_decor_active_vc(y))
-+
-+/* struct fb_info *x, struct vc_data *y */
-+#define fbcon_decor_active(x,y) (fbcon_decor_active_nores(x,y) &&		\
-+			      x->bgdecor.width == x->var.xres && 	\
-+			      x->bgdecor.height == x->var.yres &&	\
-+			      x->bgdecor.depth == x->var.bits_per_pixel)
-+
-+
-+#else /* CONFIG_FB_CON_DECOR */
-+
-+static inline void fbcon_decor_putcs(struct vc_data *vc, struct fb_info *info, const unsigned short *s, int count, int yy, int xx) {}
-+static inline void fbcon_decor_putc(struct vc_data *vc, struct fb_info *info, int c, int ypos, int xpos) {}
-+static inline void fbcon_decor_cursor(struct fb_info *info, struct fb_cursor *cursor) {}
-+static inline void fbcon_decor_clear(struct vc_data *vc, struct fb_info *info, int sy, int sx, int height, int width) {}
-+static inline void fbcon_decor_clear_margins(struct vc_data *vc, struct fb_info *info, int bottom_only) {}
-+static inline void fbcon_decor_blank(struct vc_data *vc, struct fb_info *info, int blank) {}
-+static inline void fbcon_decor_bmove_redraw(struct vc_data *vc, struct fb_info *info, int y, int sx, int dx, int width) {}
-+static inline void fbcon_decor_fix_pseudo_pal(struct fb_info *info, struct vc_data *vc) {}
-+static inline int fbcon_decor_call_helper(char* cmd, unsigned short cons) { return 0; }
-+static inline int fbcon_decor_init(void) { return 0; }
-+static inline int fbcon_decor_exit(void) { return 0; }
-+static inline int fbcon_decor_disable(struct vc_data *vc, unsigned char redraw) { return 0; }
-+
-+#define fbcon_decor_active_vc(y) (0)
-+#define fbcon_decor_active_nores(x,y) (0)
-+#define fbcon_decor_active(x,y) (0)
-+
-+#endif /* CONFIG_FB_CON_DECOR */
-+
-+#endif /* __FBCON_DECOR_H */
-diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
-index f53b9f1..467f921 100644
---- a/drivers/video/fbcmap.c
-+++ b/drivers/video/fbcmap.c
-@@ -17,6 +17,8 @@
- #include <linux/slab.h>
- #include <linux/uaccess.h>
- 
-+#include "console/fbcondecor.h"
-+
- static u16 red2[] __read_mostly = {
-     0x0000, 0xaaaa
- };
-@@ -234,14 +236,17 @@ int fb_set_cmap(struct fb_cmap *cmap, struct fb_info *info)
- 			if (transp)
- 				htransp = *transp++;
- 			if (info->fbops->fb_setcolreg(start++,
--						      hred, hgreen, hblue,
-+						      hred, hgreen, hblue, 
- 						      htransp, info))
- 				break;
- 		}
- 	}
--	if (rc == 0)
-+	if (rc == 0) {
- 		fb_copy_cmap(cmap, &info->cmap);
--
-+		if (fbcon_decor_active(info, vc_cons[fg_console].d) &&
-+		    info->fix.visual == FB_VISUAL_DIRECTCOLOR)
-+			fbcon_decor_fix_pseudo_pal(info, vc_cons[fg_console].d);
-+	}
- 	return rc;
- }
- 
-diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
-index 731fce6..f0ecef4 100644
---- a/drivers/video/fbmem.c
-+++ b/drivers/video/fbmem.c
-@@ -1184,15 +1184,6 @@ struct fb_fix_screeninfo32 {
- 	u16			reserved[3];
- };
- 
--struct fb_cmap32 {
--	u32			start;
--	u32			len;
--	compat_caddr_t	red;
--	compat_caddr_t	green;
--	compat_caddr_t	blue;
--	compat_caddr_t	transp;
--};
--
- static int fb_getput_cmap(struct fb_info *info, unsigned int cmd,
- 			  unsigned long arg)
- {
-diff --git a/include/linux/console_decor.h b/include/linux/console_decor.h
-new file mode 100644
-index 0000000..04b8d80
---- /dev/null
-+++ b/include/linux/console_decor.h
-@@ -0,0 +1,46 @@
-+#ifndef _LINUX_CONSOLE_DECOR_H_
-+#define _LINUX_CONSOLE_DECOR_H_ 1
-+
-+/* A structure used by the framebuffer console decorations (drivers/video/console/fbcondecor.c) */
-+struct vc_decor {
-+	__u8 bg_color;				/* The color that is to be treated as transparent */
-+	__u8 state;				/* Current decor state: 0 = off, 1 = on */
-+	__u16 tx, ty;				/* Top left corner coordinates of the text field */
-+	__u16 twidth, theight;			/* Width and height of the text field */
-+	char* theme;
-+};
-+
-+#ifdef __KERNEL__
-+#ifdef CONFIG_COMPAT
-+#include <linux/compat.h>
-+
-+struct vc_decor32 {
-+	__u8 bg_color;				/* The color that is to be treated as transparent */
-+	__u8 state;				/* Current decor state: 0 = off, 1 = on */
-+	__u16 tx, ty;				/* Top left corner coordinates of the text field */
-+	__u16 twidth, theight;			/* Width and height of the text field */
-+	compat_uptr_t theme;
-+};
-+
-+#define vc_decor_from_compat(to, from) \
-+	(to).bg_color = (from).bg_color; \
-+	(to).state    = (from).state; \
-+	(to).tx       = (from).tx; \
-+	(to).ty       = (from).ty; \
-+	(to).twidth   = (from).twidth; \
-+	(to).theight  = (from).theight; \
-+	(to).theme    = compat_ptr((from).theme)
-+
-+#define vc_decor_to_compat(to, from) \
-+	(to).bg_color = (from).bg_color; \
-+	(to).state    = (from).state; \
-+	(to).tx       = (from).tx; \
-+	(to).ty       = (from).ty; \
-+	(to).twidth   = (from).twidth; \
-+	(to).theight  = (from).theight; \
-+	(to).theme    = ptr_to_compat((from).theme)
-+
-+#endif /* CONFIG_COMPAT */
-+#endif /* __KERNEL__ */
-+
-+#endif
-diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h
-index 38fe59d..8e4058b 100644
---- a/include/linux/console_struct.h
-+++ b/include/linux/console_struct.h
-@@ -19,6 +19,7 @@
- struct vt_struct;
- 
- #define NPAR 16
-+#include <linux/console_decor.h>
- 
- struct vc_data {
- 	unsigned short	vc_num;			/* Console number */
-@@ -107,6 +108,8 @@ struct vc_data {
- 	unsigned long   vc_uni_pagedir;
- 	unsigned long   *vc_uni_pagedir_loc;  /* [!] Location of uni_pagedir variable for this console */
- 	bool vc_panic_force_write; /* when oops/panic this VC can accept forced output/blanking */
-+
-+	struct vc_decor vc_decor;
- 	/* additional information is in vt_kern.h */
- };
- 
-diff --git a/include/linux/fb.h b/include/linux/fb.h
-index 8e5a9df..7883651 100644
---- a/include/linux/fb.h
-+++ b/include/linux/fb.h
-@@ -8,6 +8,25 @@
- 
- #define FB_MAX			32	/* sufficient for now */
- 
-+struct fbcon_decor_iowrapper
-+{
-+	unsigned short vc;		/* Virtual console */
-+	unsigned char origin;		/* Point of origin of the request */
-+	void *data;
-+};
-+
-+#ifdef __KERNEL__
-+#ifdef CONFIG_COMPAT
-+#include <linux/compat.h>
-+struct fbcon_decor_iowrapper32
-+{
-+	unsigned short vc;		/* Virtual console */
-+	unsigned char origin;		/* Point of origin of the request */
-+	compat_uptr_t data;
-+};
-+#endif /* CONFIG_COMPAT */
-+#endif /* __KERNEL__ */
-+
- /* ioctls
-    0x46 is 'F'								*/
- #define FBIOGET_VSCREENINFO	0x4600
-@@ -36,6 +55,24 @@
- #define FBIOPUT_MODEINFO        0x4617
- #define FBIOGET_DISPINFO        0x4618
- #define FBIO_WAITFORVSYNC	_IOW('F', 0x20, __u32)
-+#define FBIOCONDECOR_SETCFG	_IOWR('F', 0x19, struct fbcon_decor_iowrapper)
-+#define FBIOCONDECOR_GETCFG	_IOR('F', 0x1A, struct fbcon_decor_iowrapper)
-+#define FBIOCONDECOR_SETSTATE	_IOWR('F', 0x1B, struct fbcon_decor_iowrapper)
-+#define FBIOCONDECOR_GETSTATE	_IOR('F', 0x1C, struct fbcon_decor_iowrapper)
-+#define FBIOCONDECOR_SETPIC 	_IOWR('F', 0x1D, struct fbcon_decor_iowrapper)
-+#ifdef __KERNEL__
-+#ifdef CONFIG_COMPAT
-+#define FBIOCONDECOR_SETCFG32	_IOWR('F', 0x19, struct fbcon_decor_iowrapper32)
-+#define FBIOCONDECOR_GETCFG32	_IOR('F', 0x1A, struct fbcon_decor_iowrapper32)
-+#define FBIOCONDECOR_SETSTATE32	_IOWR('F', 0x1B, struct fbcon_decor_iowrapper32)
-+#define FBIOCONDECOR_GETSTATE32	_IOR('F', 0x1C, struct fbcon_decor_iowrapper32)
-+#define FBIOCONDECOR_SETPIC32	_IOWR('F', 0x1D, struct fbcon_decor_iowrapper32)
-+#endif /* CONFIG_COMPAT */
-+#endif /* __KERNEL__ */
-+
-+#define FBCON_DECOR_THEME_LEN		128	/* Maximum lenght of a theme name */
-+#define FBCON_DECOR_IO_ORIG_KERNEL	0	/* Kernel ioctl origin */
-+#define FBCON_DECOR_IO_ORIG_USER	1	/* User ioctl origin */
- 
- #define FB_TYPE_PACKED_PIXELS		0	/* Packed Pixels	*/
- #define FB_TYPE_PLANES			1	/* Non interleaved planes */
-@@ -280,6 +317,28 @@ struct fb_cmap {
- 	__u16 *transp;			/* transparency, can be NULL */
- };
- 
-+#ifdef __KERNEL__
-+#ifdef CONFIG_COMPAT
-+struct fb_cmap32 {
-+	__u32 start;
-+	__u32 len;			/* Number of entries */
-+	compat_uptr_t red;		/* Red values	*/
-+	compat_uptr_t green;
-+	compat_uptr_t blue;
-+	compat_uptr_t transp;		/* transparency, can be NULL */
-+};
-+
-+#define fb_cmap_from_compat(to, from) \
-+	(to).start  = (from).start; \
-+	(to).len    = (from).len; \
-+	(to).red    = compat_ptr((from).red); \
-+	(to).green  = compat_ptr((from).green); \
-+	(to).blue   = compat_ptr((from).blue); \
-+	(to).transp = compat_ptr((from).transp)
-+
-+#endif /* CONFIG_COMPAT */
-+#endif /* __KERNEL__ */
-+
- struct fb_con2fbmap {
- 	__u32 console;
- 	__u32 framebuffer;
-@@ -361,6 +420,34 @@ struct fb_image {
- 	struct fb_cmap cmap;	/* color map info */
- };
- 
-+#ifdef __KERNEL__
-+#ifdef CONFIG_COMPAT
-+struct fb_image32 {
-+	__u32 dx;			/* Where to place image */
-+	__u32 dy;
-+	__u32 width;			/* Size of image */
-+	__u32 height;
-+	__u32 fg_color;			/* Only used when a mono bitmap */
-+	__u32 bg_color;
-+	__u8  depth;			/* Depth of the image */
-+	const compat_uptr_t data;	/* Pointer to image data */
-+	struct fb_cmap32 cmap;		/* color map info */
-+};
-+
-+#define fb_image_from_compat(to, from) \
-+	(to).dx       = (from).dx; \
-+	(to).dy       = (from).dy; \
-+	(to).width    = (from).width; \
-+	(to).height   = (from).height; \
-+	(to).fg_color = (from).fg_color; \
-+	(to).bg_color = (from).bg_color; \
-+	(to).depth    = (from).depth; \
-+	(to).data     = compat_ptr((from).data); \
-+	fb_cmap_from_compat((to).cmap, (from).cmap)
-+
-+#endif /* CONFIG_COMPAT */
-+#endif /* __KERNEL__ */
-+
- /*
-  * hardware cursor control
-  */
-@@ -856,6 +943,9 @@ struct fb_info {
- #define FBINFO_STATE_SUSPENDED	1
- 	u32 state;			/* Hardware state i.e suspend */
- 	void *fbcon_par;                /* fbcon use-only private area */
-+
-+	struct fb_image bgdecor;
-+
- 	/* From here on everything is device dependent */
- 	void *par;
- 	/* we need the PCI or similiar aperture base/size not
-diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index d24f761..a47ce49 100644
---- a/kernel/sysctl.c
-+++ b/kernel/sysctl.c
-@@ -132,6 +132,10 @@ static int min_percpu_pagelist_fract = 8;
- 
- static int ngroups_max = NGROUPS_MAX;
- 
-+#ifdef CONFIG_FB_CON_DECOR
-+extern char fbcon_decor_path[];
-+#endif
-+
- #ifdef CONFIG_INOTIFY_USER
- #include <linux/inotify.h>
- #endif
-@@ -247,6 +251,16 @@ static struct ctl_table root_table[] = {
- 		.mode		= 0555,
- 		.child		= dev_table,
- 	},
-+#ifdef CONFIG_FB_CON_DECOR
-+	{
-+		.procname	= "fbcondecor",
-+		.data		= &fbcon_decor_path,
-+		.maxlen		= KMOD_PATH_LEN,
-+		.mode		= 0644,
-+		.proc_handler	= &proc_dostring,
-+	},
-+#endif
-+
- /*
-  * NOTE: do not add new entries to this table unless you have read
-  * Documentation/sysctl/ctl_unnumbered.txt
diff --git a/abs/core/kernel26/PKGBUILD b/abs/core/kernel26/PKGBUILD
index 92fc907..fd7f05d 100644
--- a/abs/core/kernel26/PKGBUILD
+++ b/abs/core/kernel26/PKGBUILD
@@ -1,44 +1,61 @@
-# $Id: PKGBUILD 105315 2011-01-07 18:08:55Z tpowa $
+# $Id: PKGBUILD 130991 2011-07-09 12:23:51Z thomas $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
+# Maintainer: Cecil Watson <knoppmyth@gmail.com>
 pkgbase="kernel26"
 pkgname=('kernel26' 'kernel26-headers' 'kernel26-docs') # Build stock -ARCH kernel
 # pkgname=kernel26-custom       # Build kernel with a different name
 _kernelname=${pkgname#kernel26}
-_basekernel=2.6.37
-pkgver=${_basekernel}
-pkgrel=10
-_archver=6
-depends=('fbsplash')
+_basekernel=2.6.39
+pkgver=${_basekernel}.3
+pkgrel=3
+depends=('module-init-tools>=3.16')
 makedepends=('xmlto' 'docbook-xsl')
-_patchname="patch-${pkgver}.${_archver}-1-ARCH"
+_archpatch=1
+_patchname="patch-${pkgver}-${_archpatch}-ARCH"
+_fbpatchname="fbcondecor-0.9.6-3.0-rc2.patch"
+_ckpatchversion=2
+_ckpatchname="patch-${_basekernel}-ck${_ckpatchversion}"
+_bfqpatch1="0001-block-prepare-I-O-context-code-for-BFQ-v2-for-2.6.39.patch"
+_bfqpath="http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.39"
+_bfqpatch2="0002-block-cgroups-kconfig-build-bits-for-BFQ-v2-2.6.39.patch"
+_bfqpatch3="0003-block-introduce-the-BFQ-v2-I-O-sched-for-2.6.39.patch"
 #_patchname="patch-${pkgver}-1-ARCH"
-_fbpatchname="4200_fbcondecor-0.9.6.patch"
-_ckpatchname="patch-2.6.37-ck2"
-_lhpatchname="lh.patch"
 arch=(i686 x86_64)
 license=('GPL2')
 url="http://www.kernel.org"
+options=(!strip)
 source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2
         ftp://ftp.archlinux.org/other/kernel26/${_patchname}.bz2
-#	http://kernel.org/pub/linux/kernel/people/ck/patches/2.6/2.6.37/2.6.37-ck1/patch-2.6.37-ck1.bz2
-	http://ompldr.org/vN2d6cg/patch-2.6.37-ck2.bz2
-	ftp://ftp.knoppmyth.net/R6/sources/sk98lin_v10.88.3.3_K2.6.37.patch
-	4200_fbcondecor-0.9.6.patch
+		http://dev.gentoo.org/~spock/projects/fbcondecor/archive/${_fbpatchname}
+		http://www.kernel.org/pub/linux/kernel/people/ck/patches/2.6/${_basekernel}/${_basekernel}-ck${_ckpatchversion}/${_ckpatchname}.bz2
+		# Let's leave these out for now...
+		#${_bfqpath}/${_bfqpatch1}
+		#${_bfqpath}/${_bfqpatch2}
+		#${_bfqpath}/${_bfqpatch3}
+		fix_ck2.patch
+		logo_linux_clut224.ppm
+		lh.patch
         # the main kernel config files
-        config config.x86_64 lh.patch.bz2
+        config config.x86_64
         # standard config files for mkinitcpio ramdisk
-	kernel26.preset 2.6.37.1-fix-no-more-unsigned.patch)
+        kernel26.preset)
+
 build() {
+  patch -N -i ${srcdir}/fix_ck2.patch
   cd ${srcdir}/linux-$_basekernel
   # Add -ARCH patches
   # See http://projects.archlinux.org/linux-2.6-ARCH.git/
   patch -Np1 -i ${srcdir}/${_patchname}
+    # Add -LinHES patches
   patch -Np1 -i ${srcdir}/${_fbpatchname}
   patch -Np1 -i ${srcdir}/${_ckpatchname}
-  patch -Np1 -i ${srcdir}/${_lhpatchname}
-  patch -Np1 -i ${srcdir}/2.6.37.1-fix-no-more-unsigned.patch
-  patch -Np1 -i ${srcdir}/sk98lin_v10.88.3.3_K2.6.37.patch
+  patch -Np1 -i ${srcdir}/lh.patch
+  # Let's leave these out for now...
+  #patch -Np1 -i ${srcdir}/${_bfqpatch1}
+  #patch -Np1 -i ${srcdir}/${_bfqpatch2}
+  #patch -Np1 -i ${srcdir}/${_bfqpatch3}
+  install -m644 ${srcdir}/logo_linux_clut224.ppm drivers/video/logo/
 
   if [ "$CARCH" = "x86_64" ]; then
     cat ../config.x86_64 >./.config
@@ -72,7 +89,7 @@ package_kernel26() {
   pkgdesc="The Linux Kernel and modules"
   groups=('base')
   backup=(etc/mkinitcpio.d/${pkgname}.preset)
-  depends=('coreutils' 'linux-firmware' 'module-init-tools' 'mkinitcpio>=0.5.20')
+  depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.12-2' 'mkinitcpio>=0.6.8-2')
   # pwc, ieee80211 and hostap-driver26 modules are included in kernel26 now
   # nforce package support was abandoned by nvidia, kernel modules should cover everything now.
   # kernel24 support is dropped since glibc24
@@ -80,7 +97,7 @@ package_kernel26() {
             'alsa-driver' 'ieee80211' 'hostap-driver26'
             'pwc' 'nforce' 'squashfs' 'unionfs' 'ivtv'
             'zd1211' 'kvm-modules' 'iwlwifi' 'rt2x00-cvs'
-            'gspcav1' 'atl2' 'wlan-ng26' 'rt2500' 'nouveau-drm' 'lirc')
+            'gspcav1' 'atl2' 'wlan-ng26' 'rt2500' 'nouveau-drm')
   install=kernel26.install
   optdepends=('crda: to set the correct wireless channels of your country')
 
@@ -113,6 +130,8 @@ package_kernel26() {
   rm -f ${pkgdir}/lib/modules/${_kernver}/{source,build}
   # remove the firmware
   rm -rf ${pkgdir}/lib/firmware
+  # gzip -9 all modules to safe 100MB of space
+  find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
 }
 
 package_kernel26-headers() {
@@ -129,7 +148,8 @@ package_kernel26-headers() {
     ${pkgdir}/usr/src/linux-${_kernver}/.config
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include
 
-  for i in acpi asm-generic config generated linux math-emu media net pcmcia scsi sound trace video xen; do
+  for i in acpi asm-generic config crypto drm generated linux math-emu \
+    media net pcmcia scsi sound trace video xen; do
     cp -a include/$i ${pkgdir}/usr/src/linux-${_kernver}/include/
   done
 
@@ -155,7 +175,7 @@ package_kernel26-headers() {
   # add headers for lirc package
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video
   cp drivers/media/video/*.h  ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/
-  for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102 usbvideo; do
+  for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102; do
    mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/$i
    cp -a drivers/media/video/$i/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/$i
   done
@@ -200,18 +220,6 @@ package_kernel26-headers() {
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/mm
   cp fs/xfs/xfs_sb.h ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h
-  # add headers vor virtualbox
-  # in reference to:
-  # http://bugs.archlinux.org/task/14568
-  cp -a include/drm $pkgdir/usr/src/linux-${_kernver}/include/
-  # add headers for broadcom wl
-  # in reference to:
-  # http://bugs.archlinux.org/task/14568
-  cp -a include/trace $pkgdir/usr/src/linux-${_kernver}/include/
-  # add headers for crypto modules
-  # in reference to:
-  # http://bugs.archlinux.org/task/22081
-  cp -a include/crypto $pkgdir/usr/src/linux-${_kernver}/include/
   # copy in Kconfig files
   for i in `find . -name "Kconfig*"`; do 
     mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/`echo $i | sed 's|/Kconfig.*||'`
@@ -220,23 +228,21 @@ package_kernel26-headers() {
 
   chown -R root.root ${pkgdir}/usr/src/linux-${_kernver}
   find ${pkgdir}/usr/src/linux-${_kernver} -type d -exec chmod 755 {} \;
+  # strip scripts directory
+  find ${pkgdir}/usr/src/linux-${_kernver}/scripts  -type f -perm -u+w 2>/dev/null | while read binary ; do
+  case "$(file -bi "$binary")" in
+    *application/x-sharedlib*) # Libraries (.so)
+    /usr/bin/strip $STRIP_SHARED "$binary";;
+    *application/x-archive*) # Libraries (.a)
+    /usr/bin/strip $STRIP_STATIC "$binary";;
+    *application/x-executable*) # Binaries
+    /usr/bin/strip $STRIP_BINARIES "$binary";;
+    esac 
+  done 
   # remove unneeded architectures
   rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
 }
 
-#package_kernel26-manpages() {
-#pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the Linux kernel."
-
-#cd ${srcdir}/linux-$_basekernel
-#make mandocs || return 1
-
-#install -d ${pkgdir}/usr/share/man/man9/
-#install ${srcdir}/linux-${_basekernel}/Documentation/DocBook/man/*.9.gz \
-#${pkgdir}/usr/share/man/man9/
-
-#find ${pkgdir} -type f -exec chmod 644 {} \;
-#}
-
 package_kernel26-docs() {
 pkgdesc="Kernel hackers manual - HTML documentation that comes with the Linux kernel."
 
@@ -248,13 +254,13 @@ find $pkgdir -type d -exec chmod 755 {} \;
 # remove a file already in kernel26 package
 rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile
 }
-md5sums=('c8ee37b4fdccdb651e0603d35350b434'
-         '2a7c0e9a9cd6bea46aa9b62f246439e2'
-         '4961070c8deebee3506df40083e84d3a'
-         'ae26934abb7168d0f928fb91eca12d92'
-         'db9a807e03b7e8cfbc389089b006c7a7'
-         '8ef406c78b36e218d1152842e568f1f8'
-         '58990501d493d3e516a9ff58b3e0e0e7'
-         'c5793a80c59be4f0b54bc3b2a49e14c7'
-         '25584700a0a679542929c4bed31433b6'
-         'c99a13ccbba56e3516ca8907c211a27b')
+md5sums=('1aab7a741abe08d42e8eccf20de61e05'
+         'b23d7def30e57242cfe088f4d8ca8baa'
+         '865216ca79342c67dc3aa43c18245694'
+         'ffa0384d5a243d17ca47c9bd0e2217e7'
+         '0ab7720f0d80d142a280cfe35b9a8730'
+         '57d5f9aedb2e52ef76bab244cd2645cf'
+         '23f6df0ea11870513c7b6a02d9e6ed07'
+         '1f2b4ac021459a2ad87e3e30c22b7d22'
+         '8be1f60e54eb505b7e67d39fd2233103'
+         '25584700a0a679542929c4bed31433b6')
diff --git a/abs/core/kernel26/config b/abs/core/kernel26/config
index da5be5b..853a100 100644
--- a/abs/core/kernel26/config
+++ b/abs/core/kernel26/config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux/i386 2.6.37 Kernel Configuration
-# Sun Jul 10 00:03:16 2011
+# Linux/i386 2.6.39-ck2 Kernel Configuration
+# Fri Jul 15 06:22:28 2011
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -47,10 +47,8 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_HAVE_INTEL_TXT=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_X86_32_SMP=y
 CONFIG_X86_HT=y
-CONFIG_X86_TRAMPOLINE=y
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
 CONFIG_KTIME_SCALAR=y
 CONFIG_ARCH_CPU_PROBE_RELEASE=y
@@ -64,7 +62,6 @@ CONFIG_IRQ_WORK=y
 #
 CONFIG_SCHED_BFS=y
 CONFIG_EXPERIMENTAL=y
-CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION="-LinHES"
@@ -72,10 +69,12 @@ CONFIG_LOCALVERSION_AUTO=y
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
 # CONFIG_KERNEL_GZIP is not set
 # CONFIG_KERNEL_BZIP2 is not set
-CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZMA is not set
+CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
@@ -84,6 +83,7 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_FHANDLE is not set
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
@@ -98,14 +98,11 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y
 # IRQ subsystem
 #
 CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set
 CONFIG_HAVE_SPARSE_IRQ=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_PENDING_IRQ=y
-# CONFIG_AUTO_IRQ_AFFINITY is not set
-# CONFIG_IRQ_PER_CPU is not set
-# CONFIG_HARDIRQS_SW_RESEND is not set
+CONFIG_IRQ_FORCED_THREADING=y
 # CONFIG_SPARSE_IRQ is not set
 
 #
@@ -132,6 +129,7 @@ CONFIG_RESOURCE_COUNTERS=y
 CONFIG_CGROUP_MEM_RES_CTLR=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 # CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
+# CONFIG_CGROUP_PERF is not set
 CONFIG_BLK_CGROUP=y
 # CONFIG_DEBUG_BLK_CGROUP is not set
 CONFIG_NAMESPACES=y
@@ -148,11 +146,12 @@ CONFIG_INITRAMFS_SOURCE=""
 CONFIG_RD_GZIP=y
 CONFIG_RD_BZIP2=y
 CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
-# CONFIG_EMBEDDED is not set
+# CONFIG_EXPERT is not set
 CONFIG_UID16=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
@@ -171,6 +170,7 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
+# CONFIG_EMBEDDED is not set
 CONFIG_HAVE_PERF_EVENTS=y
 
 #
@@ -200,6 +200,7 @@ CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_OPTPROBES=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_HW_BREAKPOINT=y
@@ -227,7 +228,7 @@ CONFIG_BLOCK=y
 CONFIG_LBDAF=y
 CONFIG_BLK_DEV_BSG=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
-# CONFIG_BLK_DEV_THROTTLING is not set
+CONFIG_BLK_DEV_THROTTLING=y
 
 #
 # IO Schedulers
@@ -277,7 +278,7 @@ CONFIG_FREEZER=y
 # Processor type and features
 #
 CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
+# CONFIG_NO_HZ is not set
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_SMP=y
@@ -285,6 +286,7 @@ CONFIG_X86_MPPARSE=y
 # CONFIG_X86_BIGSMP is not set
 # CONFIG_X86_EXTENDED_PLATFORM is not set
 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_X86_32_IRIS=m
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_PARAVIRT_GUEST=y
 # CONFIG_XEN_PRIVILEGED_GUEST is not set
@@ -322,9 +324,9 @@ CONFIG_M686=y
 # CONFIG_MCORE2 is not set
 # CONFIG_MATOM is not set
 CONFIG_X86_GENERIC=y
-CONFIG_X86_CPU=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_CMPXCHG=y
+CONFIG_CMPXCHG_LOCAL=y
 CONFIG_X86_L1_CACHE_SHIFT=6
 CONFIG_X86_XADD=y
 # CONFIG_X86_PPRO_FENCE is not set
@@ -402,7 +404,8 @@ CONFIG_SPARSEMEM_STATIC=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_COMPACTION is not set
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
@@ -413,6 +416,9 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
 CONFIG_HWPOISON_INJECT=m
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
 # CONFIG_HIGHPTE is not set
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -429,8 +435,8 @@ CONFIG_SECCOMP=y
 CONFIG_CC_STACKPROTECTOR=y
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_250_NODEFAULT is not set
-# CONFIG_HZ_300 is not set
-CONFIG_HZ_1000=y
+CONFIG_HZ_300=y
+# CONFIG_HZ_1000 is not set
 # CONFIG_HZ_1500 is not set
 # CONFIG_HZ_2000 is not set
 # CONFIG_HZ_3000 is not set
@@ -438,7 +444,7 @@ CONFIG_HZ_1000=y
 # CONFIG_HZ_5000 is not set
 # CONFIG_HZ_7500 is not set
 # CONFIG_HZ_10000 is not set
-CONFIG_HZ=1000
+CONFIG_HZ=300
 CONFIG_SCHED_HRTICK=y
 CONFIG_KEXEC=y
 # CONFIG_CRASH_DUMP is not set
@@ -454,23 +460,21 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 #
 # Power management and ACPI options
 #
-CONFIG_PM=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_ADVANCED_DEBUG=y
-# CONFIG_PM_VERBOSE is not set
-CONFIG_CAN_PM_TRACE=y
-# CONFIG_PM_TRACE_RTC is not set
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_SLEEP=y
-# CONFIG_PM_SLEEP_ADVANCED_DEBUG is not set
-CONFIG_SUSPEND_NVS=y
 CONFIG_SUSPEND=y
-# CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_SUSPEND_FREEZER=y
+CONFIG_HIBERNATE_CALLBACKS=y
 CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION=""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_RUNTIME=y
-CONFIG_PM_OPS=y
+CONFIG_PM=y
+CONFIG_PM_DEBUG=y
+# CONFIG_PM_VERBOSE is not set
+CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_CAN_PM_TRACE=y
+# CONFIG_PM_TRACE_RTC is not set
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_PROCFS=y
@@ -485,6 +489,7 @@ CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_FAN=m
 CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_IPMI=m
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
 CONFIG_ACPI_THERMAL=m
@@ -498,6 +503,7 @@ CONFIG_ACPI_SBS=m
 CONFIG_ACPI_HED=m
 CONFIG_ACPI_APEI=y
 CONFIG_ACPI_APEI_GHES=m
+CONFIG_ACPI_APEI_PCIEAER=y
 CONFIG_ACPI_APEI_EINJ=m
 CONFIG_ACPI_APEI_ERST_DEBUG=m
 CONFIG_SFI=y
@@ -512,48 +518,13 @@ CONFIG_APM_DO_ENABLE=y
 #
 # CPU Frequency scaling
 #
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=m
-# CONFIG_CPU_FREQ_DEBUG is not set
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-
-#
-# CPUFreq processor drivers
-#
-CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_POWERNOW_K6=m
-CONFIG_X86_POWERNOW_K7=m
-CONFIG_X86_POWERNOW_K7_ACPI=y
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_GX_SUSPMOD=m
-# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
-CONFIG_X86_SPEEDSTEP_ICH=m
-CONFIG_X86_SPEEDSTEP_SMI=m
-CONFIG_X86_P4_CLOCKMOD=m
-CONFIG_X86_CPUFREQ_NFORCE2=m
-CONFIG_X86_LONGRUN=m
-CONFIG_X86_LONGHAUL=m
-CONFIG_X86_E_POWERSAVER=m
-
-#
-# shared options
-#
-CONFIG_X86_SPEEDSTEP_LIB=m
-CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
 CONFIG_INTEL_IDLE=y
 
 #
@@ -570,7 +541,7 @@ CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_OLPC=y
 CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_CNB20LE_QUIRK=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
 CONFIG_DMAR=y
 # CONFIG_DMAR_DEFAULT_ON is not set
 CONFIG_DMAR_FLOPPY_WA=y
@@ -589,6 +560,7 @@ CONFIG_PCI_STUB=m
 CONFIG_HT_IRQ=y
 CONFIG_PCI_IOV=y
 CONFIG_PCI_IOAPIC=y
+CONFIG_PCI_LABEL=y
 CONFIG_ISA_DMA_API=y
 CONFIG_ISA=y
 # CONFIG_EISA is not set
@@ -596,7 +568,6 @@ CONFIG_ISA=y
 # CONFIG_SCx200 is not set
 CONFIG_OLPC=y
 CONFIG_OLPC_XO1=m
-CONFIG_OLPC_OPENFIRMWARE=y
 CONFIG_AMD_NB=y
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m
@@ -629,6 +600,15 @@ CONFIG_HOTPLUG_PCI_CPCI=y
 CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
 CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
 CONFIG_HOTPLUG_PCI_SHPC=m
+CONFIG_RAPIDIO=y
+CONFIG_RAPIDIO_DISC_TIMEOUT=30
+# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
+CONFIG_RAPIDIO_TSI57X=y
+CONFIG_RAPIDIO_CPS_XX=y
+CONFIG_RAPIDIO_TSI568=y
+CONFIG_RAPIDIO_CPS_GEN2=y
+CONFIG_RAPIDIO_TSI500=y
+CONFIG_RAPIDIO_DEBUG=y
 
 #
 # Executable file formats / Emulations
@@ -658,12 +638,11 @@ CONFIG_NET_KEY=m
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-CONFIG_IP_FIB_HASH=y
+CONFIG_IP_FIB_TRIE_STATS=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_MULTIPATH=y
 CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
 # CONFIG_IP_PNP is not set
 CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE_DEMUX=m
@@ -744,6 +723,7 @@ CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_ZONES=y
 CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CT_PROTO_DCCP=m
 CONFIG_NF_CT_PROTO_GRE=m
 CONFIG_NF_CT_PROTO_SCTP=m
@@ -752,7 +732,9 @@ CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
 CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
 CONFIG_NF_CONNTRACK_PPTP=m
 CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
@@ -766,10 +748,12 @@ CONFIG_NETFILTER_XTABLES=m
 #
 CONFIG_NETFILTER_XT_MARK=m
 CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
 
 #
 # Xtables targets
 #
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
@@ -794,6 +778,7 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 #
 # Xtables matches
 #
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
@@ -802,6 +787,7 @@ CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_CPU=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
@@ -831,6 +817,18 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_LIST_SET=m
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_IPV6 is not set
 # CONFIG_IP_VS_DEBUG is not set
@@ -875,7 +873,6 @@ CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_TTL=m
@@ -1014,7 +1011,6 @@ CONFIG_IPDDP_DECAP=y
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
 CONFIG_PHONET=m
-# CONFIG_PHONET_PIPECTRLR is not set
 CONFIG_IEEE802154=m
 CONFIG_NET_SCHED=y
 
@@ -1028,6 +1024,7 @@ CONFIG_NET_SCH_ATM=m
 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_MULTIQ=m
 CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
 CONFIG_NET_SCH_SFQ=m
 CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SCH_TBF=m
@@ -1035,6 +1032,8 @@ CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCH_NETEM=m
 CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_CHOKE=m
 CONFIG_NET_SCH_INGRESS=m
 
 #
@@ -1044,7 +1043,6 @@ CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=m
 CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
 # CONFIG_CLS_U32_PERF is not set
@@ -1069,7 +1067,11 @@ CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_DCB is not set
 CONFIG_DNS_RESOLVER=y
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_DEBUG is not set
 CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
 
 #
 # Network testing
@@ -1136,8 +1138,8 @@ CONFIG_VLSI_FIR=m
 CONFIG_VIA_FIR=m
 CONFIG_MCS_FIR=m
 CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
@@ -1167,6 +1169,7 @@ CONFIG_BT_HCIVHCI=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
 CONFIG_AF_RXRPC=m
 # CONFIG_AF_RXRPC_DEBUG is not set
 CONFIG_RXKAD=m
@@ -1233,13 +1236,14 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
+CONFIG_ARCH_NO_SYSDEV_OPS=y
 CONFIG_CONNECTOR=m
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
 CONFIG_MTD_TESTS=m
-# CONFIG_MTD_CONCAT is not set
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_OF_PARTS=y
 # CONFIG_MTD_AR7_PARTS is not set
 
 #
@@ -1256,6 +1260,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 CONFIG_SM_FTL=m
 # CONFIG_MTD_OOPS is not set
+CONFIG_MTD_SWAP=m
 
 #
 # RAM/ROM/Flash chip drivers
@@ -1312,6 +1317,22 @@ CONFIG_MTD_NAND_ECC_SMC=y
 #
 # CONFIG_MTD_LPDDR is not set
 # CONFIG_MTD_UBI is not set
+CONFIG_OF=y
+
+#
+# Device Tree and Open Firmware support
+#
+CONFIG_PROC_DEVICETREE=y
+CONFIG_OF_PROMTREE=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_DEVICE=y
+CONFIG_OF_GPIO=y
+CONFIG_OF_I2C=m
+CONFIG_OF_NET=y
+CONFIG_OF_SPI=y
+CONFIG_OF_MDIO=m
+CONFIG_OF_PCI=y
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
@@ -1360,6 +1381,7 @@ CONFIG_ATA_OVER_ETH=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_RBD=m
+CONFIG_SENSORS_LIS3LV02D=m
 CONFIG_MISC_DEVICES=y
 CONFIG_AD525X_DPOT=m
 CONFIG_AD525X_DPOT_I2C=m
@@ -1410,6 +1432,7 @@ CONFIG_IWMC3200TOP=m
 # Texas Instruments shared transport line discipline
 #
 CONFIG_TI_ST=m
+CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_HAVE_IDE=y
 CONFIG_IDE=m
 
@@ -1534,7 +1557,6 @@ CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
-# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 CONFIG_SCSI_SRP_ATTRS=m
 CONFIG_SCSI_SRP_TGT_ATTRS=y
 CONFIG_SCSI_LOWLEVEL=y
@@ -1543,6 +1565,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m
 CONFIG_SCSI_CXGB3_ISCSI=m
 CONFIG_SCSI_CXGB4_ISCSI=m
 CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
 CONFIG_BE2ISCSI=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_HPSA=m
@@ -1668,6 +1691,7 @@ CONFIG_SATA_PMP=y
 CONFIG_SATA_AHCI=m
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
 CONFIG_SATA_SIL24=m
 CONFIG_ATA_SFF=y
 
@@ -1698,6 +1722,7 @@ CONFIG_SATA_VITESSE=m
 #
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
+CONFIG_PATA_ARASAN_CF=m
 CONFIG_PATA_ARTOP=m
 CONFIG_PATA_ATIIXP=m
 CONFIG_PATA_ATP867X=m
@@ -1770,6 +1795,7 @@ CONFIG_BLK_DEV_DM=m
 CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_MIRROR=m
+CONFIG_DM_RAID=m
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
@@ -1777,6 +1803,13 @@ CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
 CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_LOOPBACK_TARGET=m
+# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
@@ -1952,13 +1985,11 @@ CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
-# CONFIG_R8169_VLAN is not set
 CONFIG_SIS190=m
-CONFIG_SK98LIN=m
-# CONFIG_SK98LIN_NAPI is not set
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
-# CONFIG_SKY2 is not set
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
 CONFIG_VIA_VELOCITY=m
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
@@ -1976,11 +2007,8 @@ CONFIG_NETDEV_10000=y
 CONFIG_MDIO=m
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3_DEPENDS=y
 CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4_DEPENDS=y
 CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF_DEPENDS=y
 CONFIG_CHELSIO_T4VF=m
 CONFIG_ENIC=m
 CONFIG_IXGBE=m
@@ -2031,6 +2059,8 @@ CONFIG_ATH_COMMON=m
 # CONFIG_ATH_DEBUG is not set
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
 CONFIG_ATH9K_HW=m
 CONFIG_ATH9K_COMMON=m
 CONFIG_ATH9K=m
@@ -2049,6 +2079,7 @@ CONFIG_B43_PCICORE_AUTOSELECT=y
 CONFIG_B43_PCMCIA=y
 CONFIG_B43_SDIO=y
 CONFIG_B43_PIO=y
+CONFIG_B43_PHY_N=y
 CONFIG_B43_PHY_LP=y
 CONFIG_B43_LEDS=y
 CONFIG_B43_HWRNG=y
@@ -2081,16 +2112,22 @@ CONFIG_IPW2200_QOS=y
 # CONFIG_IPW2200_DEBUG is not set
 CONFIG_LIBIPW=m
 # CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
+CONFIG_IWLAGN=m
 
 #
 # Debugging Options
 #
 # CONFIG_IWLWIFI_DEBUG is not set
 CONFIG_IWLWIFI_DEVICE_TRACING=y
-CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
-CONFIG_IWL5000=y
+CONFIG_IWL_P2P=y
+CONFIG_IWLWIFI_LEGACY=m
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_LEGACY_DEBUG is not set
+# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set
+CONFIG_IWL4965=m
 CONFIG_IWL3945=m
 CONFIG_IWM=m
 # CONFIG_IWM_DEBUG is not set
@@ -2122,14 +2159,14 @@ CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
 CONFIG_RT2500PCI=m
 CONFIG_RT61PCI=m
-CONFIG_RT2800PCI_PCI=y
 CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT30XX=y
+CONFIG_RT2800PCI_RT33XX=y
 CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
 CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT30XX=y
+CONFIG_RT2800USB_RT33XX=y
 CONFIG_RT2800USB_RT35XX=y
 CONFIG_RT2800USB_UNKNOWN=y
 CONFIG_RT2800_LIB=m
@@ -2141,13 +2178,19 @@ CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTL8192C_COMMON=m
 CONFIG_WL1251=m
 CONFIG_WL1251_SPI=m
 CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX=m
-CONFIG_WL1271=m
-CONFIG_WL1271_SPI=m
-CONFIG_WL1271_SDIO=m
+CONFIG_WL12XX_HT=y
+CONFIG_WL12XX_SPI=m
+CONFIG_WL12XX_SDIO=m
+CONFIG_WL12XX_SDIO_TEST=m
 CONFIG_WL12XX_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
@@ -2172,6 +2215,7 @@ CONFIG_USB_USBNET=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_CDCETHER=m
 CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
 CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_SMSC75XX=m
 CONFIG_USB_NET_SMSC95XX=m
@@ -2194,6 +2238,7 @@ CONFIG_USB_NET_INT51X1=m
 CONFIG_USB_CDC_PHONET=m
 CONFIG_USB_IPHETH=m
 CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
 CONFIG_NET_PCMCIA=y
 CONFIG_PCMCIA_3C589=m
 CONFIG_PCMCIA_3C574=m
@@ -2243,6 +2288,9 @@ CONFIG_IEEE802154_FAKEHARD=m
 CONFIG_CAIF_TTY=m
 CONFIG_CAIF_SPI_SLAVE=m
 CONFIG_CAIF_SPI_SYNC=y
+CONFIG_RIONET=m
+CONFIG_RIONET_TX_SIZE=128
+CONFIG_RIONET_RX_SIZE=128
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 CONFIG_PLIP=m
@@ -2446,6 +2494,7 @@ CONFIG_INPUT_EVDEV=m
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ADP5588=m
 CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1070=m
 CONFIG_KEYBOARD_QT2160=m
 # CONFIG_KEYBOARD_LKKBD is not set
 CONFIG_KEYBOARD_GPIO=m
@@ -2506,6 +2555,7 @@ CONFIG_JOYSTICK_ZHENHUA=m
 CONFIG_JOYSTICK_DB9=m
 CONFIG_JOYSTICK_GAMECON=m
 CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
 CONFIG_JOYSTICK_JOYDUMP=m
 CONFIG_JOYSTICK_XPAD=m
 CONFIG_JOYSTICK_XPAD_FF=y
@@ -2524,6 +2574,7 @@ CONFIG_TOUCHSCREEN_AD7877=m
 CONFIG_TOUCHSCREEN_AD7879=m
 CONFIG_TOUCHSCREEN_AD7879_I2C=m
 CONFIG_TOUCHSCREEN_AD7879_SPI=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 CONFIG_TOUCHSCREEN_BU21013=m
 CONFIG_TOUCHSCREEN_CY8CTMG110=m
 CONFIG_TOUCHSCREEN_DYNAPRO=m
@@ -2539,16 +2590,16 @@ CONFIG_TOUCHSCREEN_INEXIO=m
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_TOUCHSCREEN_HTCPEN=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_QT602240=m
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_WM831X=m
 CONFIG_TOUCHSCREEN_WM97XX=m
-# CONFIG_TOUCHSCREEN_WM9705 is not set
-# CONFIG_TOUCHSCREEN_WM9712 is not set
-# CONFIG_TOUCHSCREEN_WM9713 is not set
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-# CONFIG_TOUCHSCREEN_MC13783 is not set
+CONFIG_TOUCHSCREEN_MC13783=m
 CONFIG_TOUCHSCREEN_USB_EGALAX=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
 CONFIG_TOUCHSCREEN_USB_3M=y
@@ -2561,15 +2612,18 @@ CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
 CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
 CONFIG_TOUCHSCREEN_USB_GOTOP=y
 CONFIG_TOUCHSCREEN_USB_JASTEC=y
-# CONFIG_TOUCHSCREEN_USB_E2I is not set
+CONFIG_TOUCHSCREEN_USB_E2I=y
 CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
 CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
 CONFIG_TOUCHSCREEN_USB_NEXIO=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC2005=m
 CONFIG_TOUCHSCREEN_TSC2007=m
-# CONFIG_TOUCHSCREEN_PCAP is not set
+CONFIG_TOUCHSCREEN_PCAP=m
+CONFIG_TOUCHSCREEN_ST1232=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AB8500_PONKEY=m
 CONFIG_INPUT_AD714X=m
 CONFIG_INPUT_AD714X_I2C=m
 CONFIG_INPUT_AD714X_SPI=m
@@ -2584,7 +2638,6 @@ CONFIG_INPUT_POWERMATE=m
 CONFIG_INPUT_YEALINK=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_WINBOND_CIR=m
 CONFIG_INPUT_PCF50633_PMU=m
 CONFIG_INPUT_PCF8574=m
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
@@ -2593,6 +2646,8 @@ CONFIG_INPUT_WM831X_ON=m
 CONFIG_INPUT_ADXL34X=m
 CONFIG_INPUT_ADXL34X_I2C=m
 CONFIG_INPUT_ADXL34X_SPI=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
 
 #
 # Hardware I/O ports
@@ -2621,25 +2676,24 @@ CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_DEVKMEM=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+# CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_NONSTANDARD=y
-# CONFIG_COMPUTONE is not set
 CONFIG_ROCKETPORT=m
 CONFIG_CYCLADES=m
 # CONFIG_CYZ_INTR is not set
-# CONFIG_DIGIEPCA is not set
 # CONFIG_MOXA_INTELLIO is not set
 # CONFIG_MOXA_SMARTIO is not set
-# CONFIG_ISI is not set
 CONFIG_SYNCLINK=m
 CONFIG_SYNCLINKMP=m
 # CONFIG_SYNCLINK_GT is not set
+CONFIG_NOZOMI=m
+# CONFIG_ISI is not set
 CONFIG_N_HDLC=m
 CONFIG_N_GSM=m
-# CONFIG_RISCOM8 is not set
-# CONFIG_SPECIALIX is not set
+# CONFIG_DEVKMEM is not set
 # CONFIG_STALDRV is not set
-CONFIG_NOZOMI=m
 
 #
 # Serial drivers
@@ -2664,14 +2718,14 @@ CONFIG_SERIAL_UARTLITE=m
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_OF_PLATFORM=m
 CONFIG_SERIAL_TIMBERDALE=m
 CONFIG_SERIAL_ALTERA_JTAGUART=m
 CONFIG_SERIAL_ALTERA_UART=m
 CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-# CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_IFX6X60=m
+CONFIG_SERIAL_PCH_UART=m
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
@@ -2706,7 +2760,6 @@ CONFIG_IPWIRELESS=m
 CONFIG_MWAVE=m
 CONFIG_PC8736x_GPIO=m
 CONFIG_NSC_GPIO=m
-CONFIG_CS5535_GPIO=m
 # CONFIG_RAW_DRIVER is not set
 CONFIG_HPET=y
 CONFIG_HPET_MMAP=y
@@ -2728,6 +2781,7 @@ CONFIG_I2C_MUX=m
 #
 # Multiplexer I2C Chip support
 #
+CONFIG_I2C_MUX_GPIO=m
 CONFIG_I2C_MUX_PCA9541=m
 CONFIG_I2C_MUX_PCA954x=m
 CONFIG_I2C_HELPER_AUTO=y
@@ -2771,12 +2825,16 @@ CONFIG_I2C_GPIO=m
 CONFIG_I2C_INTEL_MID=m
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_PXA=m
+CONFIG_I2C_PXA_PCI=y
 CONFIG_I2C_SIMTEC=m
 CONFIG_I2C_XILINX=m
+CONFIG_I2C_EG20T=m
 
 #
 # External I2C/SMBus adapter drivers
 #
+CONFIG_I2C_DIOLAN_U2C=m
 CONFIG_I2C_PARPORT=m
 CONFIG_I2C_PARPORT_LIGHT=m
 CONFIG_I2C_TAOS_EVM=m
@@ -2798,13 +2856,16 @@ CONFIG_SPI_MASTER=y
 #
 # SPI Master Controller Drivers
 #
+CONFIG_SPI_ALTERA=m
 CONFIG_SPI_BITBANG=m
 CONFIG_SPI_BUTTERFLY=m
 CONFIG_SPI_GPIO=m
 CONFIG_SPI_LM70_LLP=m
+CONFIG_SPI_OC_TINY=m
+CONFIG_SPI_PXA2XX=m
+CONFIG_SPI_PXA2XX_PCI=y
 CONFIG_SPI_TOPCLIFF_PCH=m
 CONFIG_SPI_XILINX=m
-CONFIG_SPI_XILINX_PLTFM=m
 # CONFIG_SPI_DESIGNWARE is not set
 
 #
@@ -2818,12 +2879,18 @@ CONFIG_SPI_TLE62X0=m
 #
 CONFIG_PPS=m
 # CONFIG_PPS_DEBUG is not set
+# CONFIG_NTP_PPS is not set
 
 #
 # PPS clients support
 #
 CONFIG_PPS_CLIENT_KTIMER=m
 CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+
+#
+# PPS generators support
+#
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIOLIB=y
 # CONFIG_DEBUG_GPIO is not set
@@ -2854,6 +2921,7 @@ CONFIG_GPIO_ADP5588=m
 CONFIG_GPIO_CS5535=m
 CONFIG_GPIO_LANGWELL=y
 CONFIG_GPIO_PCH=m
+CONFIG_GPIO_ML_IOH=m
 CONFIG_GPIO_TIMBERDALE=y
 CONFIG_GPIO_RDC321X=m
 
@@ -2890,6 +2958,7 @@ CONFIG_W1_MASTER_GPIO=m
 #
 CONFIG_W1_SLAVE_THERM=m
 CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2423=m
 CONFIG_W1_SLAVE_DS2431=m
 CONFIG_W1_SLAVE_DS2433=m
 # CONFIG_W1_SLAVE_DS2433_CRC is not set
@@ -2906,9 +2975,13 @@ CONFIG_BATTERY_DS2782=m
 CONFIG_BATTERY_OLPC=m
 CONFIG_BATTERY_BQ20Z75=m
 CONFIG_BATTERY_BQ27x00=m
+CONFIG_BATTERY_BQ27X00_I2C=y
+CONFIG_BATTERY_BQ27X00_PLATFORM=y
 CONFIG_BATTERY_MAX17040=m
+CONFIG_BATTERY_MAX17042=m
 CONFIG_CHARGER_PCF50633=m
 CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_GPIO=m
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -2936,6 +3009,7 @@ CONFIG_SENSORS_K8TEMP=m
 CONFIG_SENSORS_K10TEMP=m
 CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
 CONFIG_SENSORS_DS1621=m
 CONFIG_SENSORS_I5K_AMB=m
 CONFIG_SENSORS_F71805F=m
@@ -2952,6 +3026,7 @@ CONFIG_SENSORS_IBMAEM=m
 CONFIG_SENSORS_IBMPEX=m
 CONFIG_SENSORS_IT87=m
 CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_LINEAGE=m
 CONFIG_SENSORS_LM63=m
 CONFIG_SENSORS_LM70=m
 CONFIG_SENSORS_LM73=m
@@ -2965,17 +3040,25 @@ CONFIG_SENSORS_LM87=m
 CONFIG_SENSORS_LM90=m
 CONFIG_SENSORS_LM92=m
 CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4151=m
 CONFIG_SENSORS_LTC4215=m
 CONFIG_SENSORS_LTC4245=m
 CONFIG_SENSORS_LTC4261=m
 CONFIG_SENSORS_LM95241=m
 CONFIG_SENSORS_MAX1111=m
 CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX6639=m
 CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
 CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_SMM665=m
 CONFIG_SENSORS_DME1737=m
@@ -2984,6 +3067,8 @@ CONFIG_SENSORS_EMC2103=m
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47M192=m
 CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_ADS1015=m
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_AMC6821=m
@@ -3006,7 +3091,6 @@ CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_W83627HF=m
 CONFIG_SENSORS_W83627EHF=m
 CONFIG_SENSORS_WM831X=m
-CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_SENSORS_APPLESMC=m
 CONFIG_SENSORS_MC13783_ADC=m
 
@@ -3014,7 +3098,6 @@ CONFIG_SENSORS_MC13783_ADC=m
 # ACPI drivers
 #
 CONFIG_SENSORS_ATK0110=m
-CONFIG_SENSORS_LIS3LV02D=m
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
 CONFIG_WATCHDOG=y
@@ -3030,6 +3113,7 @@ CONFIG_ADVANTECH_WDT=m
 CONFIG_ALIM1535_WDT=m
 CONFIG_ALIM7101_WDT=m
 CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
 CONFIG_GEODE_WDT=m
 CONFIG_SC520_WDT=m
 CONFIG_SBC_FITPC2_WATCHDOG=m
@@ -3046,6 +3130,7 @@ CONFIG_HP_WATCHDOG=m
 CONFIG_HPWDT_NMI_DECODING=y
 CONFIG_SC1200_WDT=m
 CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
 CONFIG_60XX_WDT=m
 CONFIG_SBC8360_WDT=m
 CONFIG_SBC7240_WDT=m
@@ -3101,6 +3186,7 @@ CONFIG_MFD_SM501=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_HTC_PASIC3=m
 CONFIG_UCB1400_CORE=m
+CONFIG_TPS6105X=m
 CONFIG_TPS65010=m
 CONFIG_TPS6507X=m
 # CONFIG_MFD_TMIO is not set
@@ -3114,21 +3200,52 @@ CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
 CONFIG_ABX500_CORE=y
 CONFIG_EZX_PCAP=y
+CONFIG_AB8500_CORE=y
+# CONFIG_AB8500_DEBUG is not set
+CONFIG_AB8500_GPADC=y
+CONFIG_MFD_CS5535=m
 CONFIG_MFD_TIMBERDALE=m
 CONFIG_LPC_SCH=m
 CONFIG_MFD_RDC321X=m
 CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_MFD_VX855=m
-# CONFIG_REGULATOR is not set
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_DUMMY=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
+CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
+CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_BQ24022=m
+CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX8649=m
+CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_MAX8952=m
+CONFIG_REGULATOR_WM831X=m
+CONFIG_REGULATOR_WM8400=m
+CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_PCAP=m
+CONFIG_REGULATOR_MC13XXX_CORE=m
+CONFIG_REGULATOR_MC13783=m
+CONFIG_REGULATOR_MC13892=m
+CONFIG_REGULATOR_TPS6105X=m
+CONFIG_REGULATOR_TPS65023=m
+CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_AD5398=m
+CONFIG_REGULATOR_AB8500=y
+CONFIG_REGULATOR_TPS6524X=m
 CONFIG_MEDIA_SUPPORT=m
 
 #
 # Multimedia core support
 #
+CONFIG_MEDIA_CONTROLLER=y
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L2_COMMON=m
-CONFIG_VIDEO_ALLOW_V4L1=y
-CONFIG_VIDEO_V4L1_COMPAT=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_DVB_CORE=m
 CONFIG_VIDEO_MEDIA=m
 
@@ -3137,8 +3254,7 @@ CONFIG_VIDEO_MEDIA=m
 #
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_IR_CORE=m
-CONFIG_VIDEO_IR=m
+CONFIG_RC_CORE=m
 CONFIG_LIRC=m
 CONFIG_RC_MAP=m
 CONFIG_IR_NEC_DECODER=m
@@ -3151,8 +3267,11 @@ CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_ENE=m
 CONFIG_IR_IMON=m
 CONFIG_IR_MCEUSB=m
+CONFIG_IR_ITE_CIR=m
 CONFIG_IR_NUVOTON=m
 CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_RC_LOOPBACK=m
 CONFIG_MEDIA_ATTACH=y
 CONFIG_MEDIA_TUNER=m
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
@@ -3176,7 +3295,6 @@ CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_MAX2165=m
 CONFIG_MEDIA_TUNER_TDA18218=m
 CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L1=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_VMALLOC=m
@@ -3186,6 +3304,9 @@ CONFIG_VIDEO_BTCX=m
 CONFIG_VIDEO_TVEEPROM=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_VMALLOC=m
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
@@ -3202,7 +3323,6 @@ CONFIG_VIDEO_IR_I2C=m
 CONFIG_VIDEO_TVAUDIO=m
 CONFIG_VIDEO_TDA7432=m
 CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TDA9875=m
 CONFIG_VIDEO_TEA6415C=m
 CONFIG_VIDEO_TEA6420=m
 CONFIG_VIDEO_MSP3400=m
@@ -3289,6 +3409,7 @@ CONFIG_VIDEO_SAA7134_DVB=m
 CONFIG_VIDEO_MXB=m
 CONFIG_VIDEO_HEXIUM_ORION=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_TIMBERDALE=m
 CONFIG_VIDEO_CX88=m
 CONFIG_VIDEO_CX88_ALSA=m
 CONFIG_VIDEO_CX88_BLACKBIRD=m
@@ -3296,6 +3417,7 @@ CONFIG_VIDEO_CX88_DVB=m
 CONFIG_VIDEO_CX88_MPEG=m
 CONFIG_VIDEO_CX88_VP3054=m
 CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
 CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_FB_IVTV=m
@@ -3305,6 +3427,7 @@ CONFIG_VIDEO_SAA7164=m
 CONFIG_VIDEO_CAFE_CCIC=m
 CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_VIA_CAMERA=m
+CONFIG_VIDEO_NOON010PC30=m
 CONFIG_SOC_CAMERA=m
 CONFIG_SOC_CAMERA_IMX074=m
 CONFIG_SOC_CAMERA_MT9M001=m
@@ -3315,9 +3438,11 @@ CONFIG_SOC_CAMERA_MT9V022=m
 CONFIG_SOC_CAMERA_RJ54N1=m
 CONFIG_SOC_CAMERA_TW9910=m
 CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_SOC_CAMERA_OV2640=m
 CONFIG_SOC_CAMERA_OV6650=m
 CONFIG_SOC_CAMERA_OV772X=m
 CONFIG_SOC_CAMERA_OV9640=m
+CONFIG_SOC_CAMERA_OV9740=m
 CONFIG_V4L_USB_DRIVERS=y
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
@@ -3334,6 +3459,7 @@ CONFIG_USB_GSPCA_JEILINJ=m
 CONFIG_USB_GSPCA_KONICA=m
 CONFIG_USB_GSPCA_MARS=m
 CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
 CONFIG_USB_GSPCA_OV519=m
 CONFIG_USB_GSPCA_OV534=m
 CONFIG_USB_GSPCA_OV534_9=m
@@ -3360,6 +3486,7 @@ CONFIG_USB_GSPCA_SUNPLUS=m
 CONFIG_USB_GSPCA_T613=m
 CONFIG_USB_GSPCA_TV8532=m
 CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
 CONFIG_USB_GSPCA_XIRLINK_CIT=m
 CONFIG_USB_GSPCA_ZC3XX=m
 CONFIG_VIDEO_PVRUSB2=m
@@ -3372,15 +3499,11 @@ CONFIG_VIDEO_EM28XX_ALSA=m
 CONFIG_VIDEO_EM28XX_DVB=m
 CONFIG_VIDEO_TLG2300=m
 CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
 CONFIG_VIDEO_CX231XX_ALSA=m
 CONFIG_VIDEO_CX231XX_DVB=m
 CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_USBVIDEO=m
-CONFIG_USB_VICAM=m
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_KONICAWC=m
 CONFIG_USB_ET61X251=m
-CONFIG_USB_SE401=m
 CONFIG_USB_SN9C102=m
 CONFIG_USB_PWC=m
 # CONFIG_USB_PWC_DEBUG is not set
@@ -3396,7 +3519,6 @@ CONFIG_RADIO_RTRACK=m
 CONFIG_RADIO_RTRACK2=m
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_GEMTEK=m
-CONFIG_RADIO_GEMTEK_PCI=m
 CONFIG_RADIO_MAXIRADIO=m
 CONFIG_RADIO_MAESTRO=m
 CONFIG_RADIO_MIROPCM20=m
@@ -3417,6 +3539,12 @@ CONFIG_RADIO_TEA5764=m
 CONFIG_RADIO_SAA7706H=m
 CONFIG_RADIO_TEF6862=m
 CONFIG_RADIO_TIMBERDALE=m
+CONFIG_RADIO_WL1273=m
+
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+CONFIG_RADIO_WL128X=m
 CONFIG_DVB_MAX_ADAPTERS=8
 # CONFIG_DVB_DYNAMIC_MINORS is not set
 CONFIG_DVB_CAPTURE_DRIVERS=y
@@ -3468,6 +3596,7 @@ CONFIG_DVB_USB_FRIIO=m
 CONFIG_DVB_USB_EC168=m
 CONFIG_DVB_USB_AZ6027=m
 CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
 CONFIG_DVB_TTUSB_BUDGET=m
 CONFIG_DVB_TTUSB_DEC=m
 CONFIG_SMS_SIANO_MDTV=m
@@ -3500,9 +3629,11 @@ CONFIG_DVB_PLUTO2=m
 # Supported SDMC DM1105 Adapters
 #
 CONFIG_DVB_DM1105=m
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
 CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_FIREWIRE=y
-# CONFIG_DVB_FIREDTV_IEEE1394 is not set
 CONFIG_DVB_FIREDTV_INPUT=y
 
 #
@@ -3581,6 +3712,7 @@ CONFIG_DVB_DIB7000P=m
 CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
 
 #
 # DVB-C (cable) frontends
@@ -3606,7 +3738,9 @@ CONFIG_DVB_S5H1411=m
 #
 # ISDB-T (terrestrial) frontends
 #
+CONFIG_DVB_S921=m
 CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
 
 #
 # Digital terrestrial only tuners/PLL
@@ -3631,8 +3765,6 @@ CONFIG_DVB_IX2505V=m
 # Tools to develop new frontends
 #
 # CONFIG_DVB_DUMMY_FE is not set
-CONFIG_DAB=y
-CONFIG_USB_DABUSB=m
 
 #
 # Graphics support
@@ -3658,8 +3790,6 @@ CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_KMS=y
-CONFIG_DRM_I810=m
-CONFIG_DRM_I830=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
 CONFIG_DRM_MGA=m
@@ -3682,6 +3812,7 @@ CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=m
+# CONFIG_FB_WMT_GE_ROPS is not set
 CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
@@ -3696,6 +3827,7 @@ CONFIG_FB_CIRRUS=m
 CONFIG_FB_PM2=m
 CONFIG_FB_PM2_FIFO_DISCONNECT=y
 CONFIG_FB_CYBER2000=m
+CONFIG_FB_CYBER2000_DDC=y
 # CONFIG_FB_ARC is not set
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
@@ -3753,6 +3885,7 @@ CONFIG_FB_TRIDENT=m
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_TMIO is not set
 # CONFIG_FB_SM501 is not set
+CONFIG_FB_UDL=m
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
@@ -3767,11 +3900,12 @@ CONFIG_LCD_TDO24M=m
 CONFIG_LCD_VGG2432A4=m
 CONFIG_LCD_PLATFORM=m
 CONFIG_LCD_S6E63M0=m
+CONFIG_LCD_LD9040=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_PROGEAR=m
 CONFIG_BACKLIGHT_CARILLO_RANCH=m
-CONFIG_BACKLIGHT_MBP_NVIDIA=m
+CONFIG_BACKLIGHT_APPLE=m
 CONFIG_BACKLIGHT_SAHARA=m
 CONFIG_BACKLIGHT_WM831X=m
 CONFIG_BACKLIGHT_ADP8860=m
@@ -3794,9 +3928,9 @@ CONFIG_VGA_CONSOLE=y
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-# CONFIG_FB_CON_DECOR is not set
+CONFIG_FB_CON_DECOR=y
 CONFIG_FONTS=y
 # CONFIG_FONT_8x8 is not set
 CONFIG_FONT_8x16=y
@@ -3808,10 +3942,7 @@ CONFIG_FONT_8x16=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
@@ -3967,7 +4098,6 @@ CONFIG_SND_HDA_POWER_SAVE=y
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
-CONFIG_SND_HIFIER=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INTEL8X0=m
@@ -3999,10 +4129,15 @@ CONFIG_SND_USB_USX2Y=m
 CONFIG_SND_USB_CAIAQ=m
 CONFIG_SND_USB_CAIAQ_INPUT=y
 CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_FIREWIRE_SPEAKERS=m
 CONFIG_SND_PCMCIA=y
 CONFIG_SND_VXPOCKET=m
 CONFIG_SND_PDAUDIOCF=m
 CONFIG_SND_SOC=m
+CONFIG_SND_SOC_CACHE_LZO=y
 CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_ALL_CODECS is not set
 # CONFIG_SOUND_PRIME is not set
@@ -4023,6 +4158,7 @@ CONFIG_USB_HIDDEV=y
 #
 CONFIG_HID_3M_PCT=m
 CONFIG_HID_A4TECH=m
+CONFIG_HID_ACRUX=m
 CONFIG_HID_ACRUX_FF=m
 CONFIG_HID_APPLE=m
 CONFIG_HID_BELKIN=m
@@ -4033,15 +4169,17 @@ CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_CYPRESS=m
 CONFIG_HID_DRAGONRISE=m
 CONFIG_DRAGONRISE_FF=y
-CONFIG_HID_EGALAX=m
+CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_EZKEY=m
+CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
 CONFIG_HID_UCLOGIC=m
 CONFIG_HID_WALTOP=m
 CONFIG_HID_GYRATION=m
 CONFIG_HID_TWINHAN=m
 CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
 CONFIG_HID_LOGITECH=m
 CONFIG_LOGITECH_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
@@ -4051,6 +4189,7 @@ CONFIG_HID_MAGICMOUSE=m
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MOSART=m
 CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
 CONFIG_HID_NTRIG=m
 CONFIG_HID_ORTEK=m
 CONFIG_HID_PANTHERLORD=m
@@ -4063,7 +4202,11 @@ CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
 CONFIG_HID_QUANTA=m
 CONFIG_HID_ROCCAT=m
+CONFIG_HID_ROCCAT_COMMON=m
+CONFIG_HID_ROCCAT_ARVO=m
 CONFIG_HID_ROCCAT_KONE=m
+CONFIG_HID_ROCCAT_KONEPLUS=m
+CONFIG_HID_ROCCAT_KOVAPLUS=m
 CONFIG_HID_ROCCAT_PYRA=m
 CONFIG_HID_SAMSUNG=m
 CONFIG_HID_SONY=m
@@ -4145,6 +4288,7 @@ CONFIG_USB_TMC=m
 #
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
 CONFIG_USB_STORAGE_DATAFAB=m
 CONFIG_USB_STORAGE_FREECOM=m
 CONFIG_USB_STORAGE_ISD200=m
@@ -4156,6 +4300,7 @@ CONFIG_USB_STORAGE_ALAUDA=m
 CONFIG_USB_STORAGE_ONETOUCH=m
 CONFIG_USB_STORAGE_KARMA=m
 CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
 CONFIG_USB_UAS=m
 # CONFIG_USB_LIBUSUAL is not set
 
@@ -4272,14 +4417,17 @@ CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_FUSB300 is not set
 # CONFIG_USB_GADGET_R8A66597 is not set
+# CONFIG_USB_GADGET_PXA_U2O is not set
 # CONFIG_USB_GADGET_M66592 is not set
 # CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_CI13XXX is not set
+# CONFIG_USB_GADGET_CI13XXX_PCI is not set
 CONFIG_USB_GADGET_NET2280=y
 CONFIG_USB_NET2280=m
 # CONFIG_USB_GADGET_GOKU is not set
 # CONFIG_USB_GADGET_LANGWELL is not set
+# CONFIG_USB_GADGET_EG20T is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 CONFIG_USB_GADGET_DUALSPEED=y
 # CONFIG_USB_ZERO is not set
@@ -4287,6 +4435,7 @@ CONFIG_USB_AUDIO=m
 CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y
 # CONFIG_USB_ETH_EEM is not set
+CONFIG_USB_G_NCM=m
 CONFIG_USB_GADGETFS=m
 CONFIG_USB_FUNCTIONFS=m
 CONFIG_USB_FUNCTIONFS_ETH=y
@@ -4313,6 +4462,7 @@ CONFIG_USB_G_WEBCAM=m
 CONFIG_USB_OTG_UTILS=y
 CONFIG_USB_GPIO_VBUS=m
 CONFIG_NOP_USB_XCEIV=m
+CONFIG_AB8500_USB=m
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
 CONFIG_UWB_WHCI=m
@@ -4320,6 +4470,7 @@ CONFIG_UWB_I1480U=m
 CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
+CONFIG_MMC_CLKGATE=y
 
 #
 # MMC/SD/SDIO Card Drivers
@@ -4336,6 +4487,7 @@ CONFIG_SDIO_UART=m
 CONFIG_MMC_SDHCI=m
 CONFIG_MMC_SDHCI_PCI=m
 CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_OF=m
 CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_WBSD=m
 CONFIG_MMC_TIFM_SD=m
@@ -4357,17 +4509,20 @@ CONFIG_MSPRO_BLOCK=m
 #
 CONFIG_MEMSTICK_TIFM_MS=m
 CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 
 #
 # LED drivers
 #
+CONFIG_LEDS_LM3530=m
 CONFIG_LEDS_NET5501=m
 # CONFIG_LEDS_ALIX2 is not set
 CONFIG_LEDS_PCA9532=m
 CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_GPIO_PLATFORM=y
+CONFIG_LEDS_GPIO_OF=y
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP5521=m
 CONFIG_LEDS_LP5523=m
@@ -4375,6 +4530,7 @@ CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_LEDS_PCA955X=m
 CONFIG_LEDS_WM831X_STATUS=m
 CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_REGULATOR=m
 CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_LT3593=m
@@ -4395,6 +4551,8 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 #
 # iptables trigger is under Netfilter config (LED target)
 #
+CONFIG_NFC_DEVICES=y
+CONFIG_PN544_NFC=m
 CONFIG_ACCESSIBILITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 # CONFIG_INFINIBAND is not set
@@ -4490,6 +4648,7 @@ CONFIG_RTC_DRV_RP5C01=m
 CONFIG_RTC_DRV_V3020=m
 CONFIG_RTC_DRV_WM831X=m
 CONFIG_RTC_DRV_PCF50633=m
+CONFIG_RTC_DRV_AB8500=m
 
 #
 # on-CPU RTC drivers
@@ -4531,6 +4690,10 @@ CONFIG_UIO_PCI_GENERIC=m
 CONFIG_UIO_NETX=m
 CONFIG_STAGING=y
 # CONFIG_STAGING_EXCLUDE_BUILD is not set
+# CONFIG_DIGIEPCA is not set
+# CONFIG_RISCOM8 is not set
+# CONFIG_SPECIALIX is not set
+# CONFIG_COMPUTONE is not set
 CONFIG_ET131X=m
 # CONFIG_ET131X_DEBUG is not set
 CONFIG_SLICOSS=m
@@ -4549,10 +4712,7 @@ CONFIG_VIDEO_CX25821_ALSA=m
 CONFIG_VIDEO_TM6000=m
 CONFIG_VIDEO_TM6000_ALSA=m
 CONFIG_VIDEO_TM6000_DVB=m
-CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_USB=m
-CONFIG_VIDEO_STRADIS=m
+CONFIG_DVB_CXD2099=m
 CONFIG_USB_IP_COMMON=m
 CONFIG_USB_IP_VHCI_HCD=m
 CONFIG_USB_IP_HOST=m
@@ -4561,8 +4721,9 @@ CONFIG_W35UND=m
 CONFIG_PRISM2_USB=m
 CONFIG_ECHO=m
 CONFIG_BRCM80211=m
-CONFIG_BRCM80211_PCI=y
+CONFIG_BRCMSMAC=y
 # CONFIG_BRCMFMAC is not set
+# CONFIG_BRCMDBG is not set
 CONFIG_RT2860=m
 CONFIG_RT2870=m
 CONFIG_COMEDI=m
@@ -4692,6 +4853,9 @@ CONFIG_COMEDI_NI_LABPC=m
 CONFIG_COMEDI_8255=m
 CONFIG_COMEDI_DAS08=m
 CONFIG_COMEDI_FC=m
+CONFIG_FB_OLPC_DCON=m
+CONFIG_FB_OLPC_DCON_1=y
+CONFIG_FB_OLPC_DCON_1_5=y
 CONFIG_ASUS_OLED=m
 # CONFIG_PANEL is not set
 CONFIG_R8187SE=m
@@ -4699,11 +4863,12 @@ CONFIG_RTL8192U=m
 CONFIG_RTL8192E=m
 CONFIG_R8712U=m
 CONFIG_R8712_AP=y
+CONFIG_RTS_PSTOR=m
+# CONFIG_RTS_PSTOR_DEBUG is not set
 # CONFIG_TRANZPORT is not set
 CONFIG_POHMELFS=m
 # CONFIG_POHMELFS_DEBUG is not set
 CONFIG_POHMELFS_CRYPTO=y
-# CONFIG_AUTOFS_FS is not set
 CONFIG_IDE_PHISON=m
 CONFIG_LINE6_USB=m
 # CONFIG_LINE6_USB_DEBUG is not set
@@ -4726,37 +4891,30 @@ CONFIG_USB_SERIAL_QUATECH2=m
 CONFIG_USB_SERIAL_QUATECH_USB2=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
-CONFIG_FB_UDL=m
 CONFIG_HYPERV=m
 CONFIG_HYPERV_STORAGE=m
 CONFIG_HYPERV_BLOCK=m
 CONFIG_HYPERV_NET=m
 CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_MOUSE=m
 # CONFIG_VME_BUS is not set
+CONFIG_DX_SEP=m
 # CONFIG_IIO is not set
+CONFIG_CS5535_GPIO=m
+CONFIG_XVMALLOC=y
 CONFIG_ZRAM=m
+# CONFIG_ZRAM_DEBUG is not set
 CONFIG_WLAGS49_H2=m
 CONFIG_WLAGS49_H25=m
-# CONFIG_BATMAN_ADV is not set
-CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_FB_SM7XX=m
 CONFIG_VIDEO_DT3155=m
 CONFIG_DT3155_CCIR=y
 CONFIG_CRYSTALHD=m
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_ST_BT=m
-CONFIG_ADIS16255=m
 CONFIG_FB_XGI=m
 CONFIG_LIRC_STAGING=y
 CONFIG_LIRC_BT829=m
-CONFIG_LIRC_I2C=m
 CONFIG_LIRC_IGORPLUGUSB=m
 CONFIG_LIRC_IMON=m
-CONFIG_LIRC_IT87=m
-CONFIG_LIRC_ITE8709=m
 CONFIG_LIRC_PARALLEL=m
 CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SERIAL=m
@@ -4764,9 +4922,10 @@ CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
 CONFIG_LIRC_TTUSBIR=m
 CONFIG_LIRC_ZILOG=m
-CONFIG_SMB_FS=m
-# CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_EASYCAP=m
+CONFIG_EASYCAP_SND=y
+# CONFIG_EASYCAP_OSS is not set
+# CONFIG_EASYCAP_DEBUG is not set
 CONFIG_SOLO6X10=m
 CONFIG_ACPI_QUICKSTART=m
 CONFIG_MACH_NO_WESTBRIDGE=y
@@ -4793,6 +4952,7 @@ CONFIG_USB_ENESTORAGE=m
 CONFIG_BCM_WIMAX=m
 CONFIG_FT1000=m
 CONFIG_FT1000_USB=m
+CONFIG_FT1000_PCMCIA=m
 
 #
 # Speakup console speech
@@ -4813,15 +4973,25 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m
 CONFIG_SPEAKUP_SYNTH_SPKOUT=m
 CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
+CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
+CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
+CONFIG_DRM_PSB=m
+
+#
+# Altera FPGA firmware download module
+#
+CONFIG_ALTERA_STAPL=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
 CONFIG_ASUS_LAPTOP=m
 CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_WMI=m
+CONFIG_DELL_WMI_AIO=m
 CONFIG_FUJITSU_LAPTOP=m
 # CONFIG_FUJITSU_LAPTOP_DEBUG is not set
 CONFIG_TC1100_WMI=m
+CONFIG_HP_ACCEL=m
 CONFIG_HP_WMI=m
 CONFIG_MSI_LAPTOP=m
 CONFIG_PANASONIC_LAPTOP=m
@@ -4839,6 +5009,8 @@ CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_SENSORS_HDAPS=m
 CONFIG_INTEL_MENLOW=m
 CONFIG_EEEPC_LAPTOP=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
 CONFIG_EEEPC_WMI=m
 CONFIG_ACPI_WMI=m
 CONFIG_MSI_WMI=m
@@ -4850,6 +5022,8 @@ CONFIG_ACPI_CMPC=m
 CONFIG_INTEL_IPS=m
 CONFIG_IBM_RTL=m
 CONFIG_XO1_RFKILL=m
+CONFIG_XO15_EBOOK=m
+CONFIG_SAMSUNG_LAPTOP=m
 
 #
 # Firmware Drivers
@@ -4861,7 +5035,9 @@ CONFIG_EFI_VARS=m
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=m
 # CONFIG_ISCSI_IBFT_FIND is not set
+CONFIG_SIGMA=m
 
 #
 # File systems
@@ -4872,7 +5048,7 @@ CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
 # CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_FS=m
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 CONFIG_EXT3_FS_SECURITY=y
@@ -4897,7 +5073,6 @@ CONFIG_JFS_POSIX_ACL=y
 CONFIG_JFS_SECURITY=y
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFS_STATISTICS=y
-CONFIG_FS_POSIX_ACL=y
 CONFIG_XFS_FS=m
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
@@ -4914,7 +5089,8 @@ CONFIG_OCFS2_FS_STATS=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_NILFS2_FS=m
-CONFIG_EXPORTFS=m
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
 CONFIG_FILE_LOCKING=y
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
@@ -5006,6 +5182,7 @@ CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_VXFS_FS is not set
@@ -5014,6 +5191,7 @@ CONFIG_OMFS_FS=m
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_ROMFS_FS is not set
+CONFIG_PSTORE=y
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
@@ -5029,7 +5207,7 @@ CONFIG_NFS_V4=y
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
-CONFIG_NFS_USE_NEW_IDMAPPER=y
+# CONFIG_NFS_USE_NEW_IDMAPPER is not set
 CONFIG_NFSD=m
 # CONFIG_NFSD_DEPRECATED is not set
 CONFIG_NFSD_V2_ACL=y
@@ -5048,11 +5226,11 @@ CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
 CONFIG_CIFS_WEAK_PW_HASH=y
-# CONFIG_CIFS_UPCALL is not set
+CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
 # CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_DFS_UPCALL is not set
+CONFIG_CIFS_DFS_UPCALL=y
 CONFIG_CIFS_FSCACHE=y
 CONFIG_CIFS_ACL=y
 # CONFIG_CIFS_EXPERIMENTAL is not set
@@ -5142,7 +5320,8 @@ CONFIG_DLM=m
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
+CONFIG_PRINTK_TIME=y
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
@@ -5151,10 +5330,13 @@ CONFIG_STRIP_ASM_SYMS=y
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_HARDLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
 CONFIG_DETECT_HUNG_TASK=y
@@ -5172,7 +5354,6 @@ CONFIG_TIMER_STATS=y
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 CONFIG_DEBUG_MUTEXES=y
-CONFIG_BKL=y
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_SPARSE_RCU_POINTER is not set
@@ -5208,6 +5389,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
 # CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FTRACE_NMI_ENTER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
@@ -5216,28 +5398,35 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACER_MAX_TRACE=y
 CONFIG_RING_BUFFER=y
+CONFIG_FTRACE_NMI_ENTER=y
 CONFIG_EVENT_TRACING=y
+CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_RING_BUFFER_ALLOW_SWAP=y
 CONFIG_TRACING=y
 CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
 CONFIG_FTRACE=y
-# CONFIG_FUNCTION_TRACER is not set
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_PREEMPT_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
+CONFIG_SCHED_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
 # CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_STACK_TRACER is not set
+CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_FUNCTION_PROFILER=y
+CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_FTRACE_STARTUP_TEST is not set
 CONFIG_MMIOTRACE=y
 # CONFIG_MMIOTRACE_TEST is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
 # CONFIG_DYNAMIC_DEBUG is not set
@@ -5248,7 +5437,7 @@ CONFIG_ASYNC_RAID6_TEST=m
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_KMEMCHECK is not set
+CONFIG_TEST_KSTRTOX=m
 CONFIG_STRICT_DEVMEM=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_EARLY_PRINTK=y
@@ -5257,7 +5446,9 @@ CONFIG_EARLY_PRINTK=y
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 # CONFIG_X86_PTDUMP is not set
-# CONFIG_DEBUG_RODATA is not set
+CONFIG_DEBUG_RODATA=y
+# CONFIG_DEBUG_RODATA_TEST is not set
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
 # CONFIG_DEBUG_NX_TEST is not set
 CONFIG_DOUBLEFAULT=y
 # CONFIG_IOMMU_STRESS is not set
@@ -5280,6 +5471,8 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # Security options
 #
 CONFIG_KEYS=y
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=m
 # CONFIG_KEYS_DEBUG_PROC_KEYS is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 CONFIG_SECURITY=y
@@ -5351,6 +5544,7 @@ CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_LRW=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_XTS=m
+CONFIG_CRYPTO_FPU=m
 
 #
 # Hash modes
@@ -5383,6 +5577,7 @@ CONFIG_CRYPTO_WP512=m
 #
 CONFIG_CRYPTO_AES=m
 CONFIG_CRYPTO_AES_586=m
+CONFIG_CRYPTO_AES_NI_INTEL=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_BLOWFISH=m
@@ -5412,6 +5607,9 @@ CONFIG_CRYPTO_LZO=m
 # Random Number Generation
 #
 CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -5424,6 +5622,7 @@ CONFIG_HAVE_KVM_IRQCHIP=y
 CONFIG_HAVE_KVM_EVENTFD=y
 CONFIG_KVM_APIC_ARCHITECTURE=y
 CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
@@ -5457,9 +5656,19 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
 CONFIG_DECOMPRESS_GZIP=y
 CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
 CONFIG_DECOMPRESS_LZO=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
@@ -5470,5 +5679,7 @@ CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
 CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
+CONFIG_AVERAGE=y
diff --git a/abs/core/kernel26/config.x86_64 b/abs/core/kernel26/config.x86_64
index 9ab28ae..967937c 100644
--- a/abs/core/kernel26/config.x86_64
+++ b/abs/core/kernel26/config.x86_64
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux/x86_64 2.6.37 Kernel Configuration
-# Thu Jan  6 22:19:56 2011
+# Linux/x86_64 2.6.39 Kernel Configuration
+# Mon Jun 27 20:50:33 2011
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -48,10 +48,8 @@ CONFIG_AUDIT_ARCH=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_HAVE_INTEL_TXT=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_X86_64_SMP=y
 CONFIG_X86_HT=y
-CONFIG_X86_TRAMPOLINE=y
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
 # CONFIG_KTIME_SCALAR is not set
 CONFIG_ARCH_CPU_PROBE_RELEASE=y
@@ -64,7 +62,6 @@ CONFIG_IRQ_WORK=y
 # General setup
 #
 CONFIG_EXPERIMENTAL=y
-CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION="-ARCH"
@@ -72,10 +69,12 @@ CONFIG_LOCALVERSION_AUTO=y
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
 # CONFIG_KERNEL_GZIP is not set
 # CONFIG_KERNEL_BZIP2 is not set
-CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZMA is not set
+CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
@@ -84,6 +83,7 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_FHANDLE is not set
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
@@ -98,14 +98,11 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y
 # IRQ subsystem
 #
 CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set
 CONFIG_HAVE_SPARSE_IRQ=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_PENDING_IRQ=y
-# CONFIG_AUTO_IRQ_AFFINITY is not set
-# CONFIG_IRQ_PER_CPU is not set
-# CONFIG_HARDIRQS_SW_RESEND is not set
+CONFIG_IRQ_FORCED_THREADING=y
 # CONFIG_SPARSE_IRQ is not set
 
 #
@@ -133,6 +130,7 @@ CONFIG_RESOURCE_COUNTERS=y
 CONFIG_CGROUP_MEM_RES_CTLR=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 # CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
+# CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
@@ -144,6 +142,7 @@ CONFIG_IPC_NS=y
 CONFIG_USER_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
+CONFIG_SCHED_AUTOGROUP=y
 CONFIG_MM_OWNER=y
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_RELAY=y
@@ -152,11 +151,12 @@ CONFIG_INITRAMFS_SOURCE=""
 CONFIG_RD_GZIP=y
 CONFIG_RD_BZIP2=y
 CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
-# CONFIG_EMBEDDED is not set
+# CONFIG_EXPERT is not set
 CONFIG_UID16=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
@@ -175,6 +175,7 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
+# CONFIG_EMBEDDED is not set
 CONFIG_HAVE_PERF_EVENTS=y
 
 #
@@ -204,6 +205,7 @@ CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_OPTPROBES=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_HW_BREAKPOINT=y
@@ -230,7 +232,7 @@ CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
 CONFIG_BLK_DEV_BSG=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
-# CONFIG_BLK_DEV_THROTTLING is not set
+CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLOCK_COMPAT=y
 
 #
@@ -297,6 +299,7 @@ CONFIG_XEN_PVHVM=y
 CONFIG_XEN_MAX_DOMAIN_MEMORY=128
 CONFIG_XEN_SAVE_RESTORE=y
 # CONFIG_XEN_DEBUG_FS is not set
+# CONFIG_XEN_DEBUG is not set
 CONFIG_KVM_CLOCK=y
 CONFIG_KVM_GUEST=y
 CONFIG_PARAVIRT=y
@@ -310,9 +313,9 @@ CONFIG_NO_BOOTMEM=y
 # CONFIG_MCORE2 is not set
 # CONFIG_MATOM is not set
 CONFIG_GENERIC_CPU=y
-CONFIG_X86_CPU=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_INTERNODE_CACHE_SHIFT=7
 CONFIG_X86_CMPXCHG=y
+CONFIG_CMPXCHG_LOCAL=y
 CONFIG_X86_L1_CACHE_SHIFT=6
 CONFIG_X86_XADD=y
 CONFIG_X86_WP_WORKS_OK=y
@@ -330,7 +333,8 @@ CONFIG_DMI=y
 CONFIG_GART_IOMMU=y
 CONFIG_CALGARY_IOMMU=y
 CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
-# CONFIG_AMD_IOMMU is not set
+CONFIG_AMD_IOMMU=y
+# CONFIG_AMD_IOMMU_STATS is not set
 CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
 CONFIG_IOMMU_API=y
@@ -361,7 +365,12 @@ CONFIG_X86_CPUID=m
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_DIRECT_GBPAGES=y
-# CONFIG_NUMA is not set
+CONFIG_NUMA=y
+CONFIG_AMD_NUMA=y
+CONFIG_X86_64_ACPI_NUMA=y
+CONFIG_NODES_SPAN_OTHER_NODES=y
+# CONFIG_NUMA_EMU is not set
+CONFIG_NODES_SHIFT=6
 CONFIG_ARCH_PROC_KCORE_TEXT=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -371,6 +380,7 @@ CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM=y
+CONFIG_NEED_MULTIPLE_NODES=y
 CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
@@ -382,7 +392,7 @@ CONFIG_MEMORY_HOTPLUG_SPARSE=y
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_COMPACTION is not set
+CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
@@ -394,6 +404,9 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
 CONFIG_HWPOISON_INJECT=m
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_RESERVE_LOW=64
@@ -423,28 +436,28 @@ CONFIG_HOTPLUG_CPU=y
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
+CONFIG_USE_PERCPU_NUMA_NODE_ID=y
 
 #
 # Power management and ACPI options
 #
 CONFIG_ARCH_HIBERNATION_HEADER=y
-CONFIG_PM=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_ADVANCED_DEBUG=y
-# CONFIG_PM_VERBOSE is not set
-CONFIG_CAN_PM_TRACE=y
-# CONFIG_PM_TRACE_RTC is not set
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_SLEEP=y
-# CONFIG_PM_SLEEP_ADVANCED_DEBUG is not set
-CONFIG_SUSPEND_NVS=y
 CONFIG_SUSPEND=y
-# CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_SUSPEND_FREEZER=y
+CONFIG_HIBERNATE_CALLBACKS=y
 CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION=""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_RUNTIME=y
-CONFIG_PM_OPS=y
+CONFIG_PM=y
+CONFIG_PM_DEBUG=y
+# CONFIG_PM_VERBOSE is not set
+CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_CAN_PM_TRACE=y
+# CONFIG_PM_TRACE_RTC is not set
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_PROCFS=y
@@ -459,9 +472,11 @@ CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_FAN=m
 CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_IPMI=m
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
 CONFIG_ACPI_THERMAL=m
+CONFIG_ACPI_NUMA=y
 # CONFIG_ACPI_CUSTOM_DSDT is not set
 CONFIG_ACPI_BLACKLIST_YEAR=0
 # CONFIG_ACPI_DEBUG is not set
@@ -473,6 +488,7 @@ CONFIG_ACPI_SBS=m
 CONFIG_ACPI_HED=m
 CONFIG_ACPI_APEI=y
 CONFIG_ACPI_APEI_GHES=m
+CONFIG_ACPI_APEI_PCIEAER=y
 CONFIG_ACPI_APEI_EINJ=m
 CONFIG_ACPI_APEI_ERST_DEBUG=m
 CONFIG_SFI=y
@@ -527,7 +543,7 @@ CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_XEN=y
 CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_CNB20LE_QUIRK=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
 CONFIG_DMAR=y
 # CONFIG_DMAR_DEFAULT_ON is not set
 CONFIG_DMAR_FLOPPY_WA=y
@@ -548,6 +564,7 @@ CONFIG_XEN_PCIDEV_FRONTEND=m
 CONFIG_HT_IRQ=y
 CONFIG_PCI_IOV=y
 CONFIG_PCI_IOAPIC=y
+CONFIG_PCI_LABEL=y
 CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
 CONFIG_PCCARD=m
@@ -575,6 +592,15 @@ CONFIG_HOTPLUG_PCI_CPCI=y
 CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
 CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
 CONFIG_HOTPLUG_PCI_SHPC=m
+CONFIG_RAPIDIO=y
+CONFIG_RAPIDIO_DISC_TIMEOUT=30
+# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
+CONFIG_RAPIDIO_TSI57X=y
+CONFIG_RAPIDIO_CPS_XX=y
+CONFIG_RAPIDIO_TSI568=y
+CONFIG_RAPIDIO_CPS_GEN2=y
+CONFIG_RAPIDIO_TSI500=y
+CONFIG_RAPIDIO_DEBUG=y
 
 #
 # Executable file formats / Emulations
@@ -589,6 +615,7 @@ CONFIG_IA32_AOUT=m
 CONFIG_COMPAT=y
 CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
 CONFIG_SYSVIPC_COMPAT=y
+CONFIG_KEYS_COMPAT=y
 CONFIG_HAVE_TEXT_POKE_SMP=y
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
@@ -609,12 +636,11 @@ CONFIG_NET_KEY=m
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-CONFIG_IP_FIB_HASH=y
+CONFIG_IP_FIB_TRIE_STATS=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_MULTIPATH=y
 CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
 # CONFIG_IP_PNP is not set
 CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE_DEMUX=m
@@ -695,6 +721,7 @@ CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_ZONES=y
 CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CT_PROTO_DCCP=m
 CONFIG_NF_CT_PROTO_GRE=m
 CONFIG_NF_CT_PROTO_SCTP=m
@@ -703,7 +730,9 @@ CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
 CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
 CONFIG_NF_CONNTRACK_PPTP=m
 CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
@@ -717,10 +746,12 @@ CONFIG_NETFILTER_XTABLES=m
 #
 CONFIG_NETFILTER_XT_MARK=m
 CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
 
 #
 # Xtables targets
 #
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
@@ -745,6 +776,7 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 #
 # Xtables matches
 #
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
@@ -753,6 +785,7 @@ CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_CPU=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
@@ -782,6 +815,18 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_LIST_SET=m
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_IPV6 is not set
 # CONFIG_IP_VS_DEBUG is not set
@@ -826,7 +871,6 @@ CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_TTL=m
@@ -961,7 +1005,6 @@ CONFIG_IPDDP_DECAP=y
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
 CONFIG_PHONET=m
-# CONFIG_PHONET_PIPECTRLR is not set
 CONFIG_IEEE802154=m
 CONFIG_NET_SCHED=y
 
@@ -975,6 +1018,7 @@ CONFIG_NET_SCH_ATM=m
 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_MULTIQ=m
 CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
 CONFIG_NET_SCH_SFQ=m
 CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SCH_TBF=m
@@ -982,6 +1026,8 @@ CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCH_NETEM=m
 CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_CHOKE=m
 CONFIG_NET_SCH_INGRESS=m
 
 #
@@ -991,7 +1037,6 @@ CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=m
 CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
 # CONFIG_CLS_U32_PERF is not set
@@ -1016,7 +1061,11 @@ CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_DCB is not set
 CONFIG_DNS_RESOLVER=y
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_DEBUG is not set
 CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
 
 #
 # Network testing
@@ -1082,8 +1131,8 @@ CONFIG_VLSI_FIR=m
 CONFIG_VIA_FIR=m
 CONFIG_MCS_FIR=m
 CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
@@ -1113,6 +1162,7 @@ CONFIG_BT_HCIVHCI=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
 CONFIG_AF_RXRPC=m
 # CONFIG_AF_RXRPC_DEBUG is not set
 CONFIG_RXKAD=m
@@ -1179,11 +1229,11 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 CONFIG_SYS_HYPERVISOR=y
+CONFIG_ARCH_NO_SYSDEV_OPS=y
 CONFIG_CONNECTOR=m
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
 CONFIG_MTD_TESTS=m
-# CONFIG_MTD_CONCAT is not set
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_AR7_PARTS is not set
@@ -1202,6 +1252,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 CONFIG_SM_FTL=m
 # CONFIG_MTD_OOPS is not set
+CONFIG_MTD_SWAP=m
 
 #
 # RAM/ROM/Flash chip drivers
@@ -1304,6 +1355,7 @@ CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_RBD=m
+CONFIG_SENSORS_LIS3LV02D=m
 CONFIG_MISC_DEVICES=y
 CONFIG_AD525X_DPOT=m
 CONFIG_AD525X_DPOT_I2C=m
@@ -1354,6 +1406,7 @@ CONFIG_IWMC3200TOP=m
 # Texas Instruments shared transport line discipline
 #
 CONFIG_TI_ST=m
+CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_HAVE_IDE=y
 CONFIG_IDE=m
 
@@ -1461,7 +1514,6 @@ CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
-# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 CONFIG_SCSI_SRP_ATTRS=m
 CONFIG_SCSI_SRP_TGT_ATTRS=y
 CONFIG_SCSI_LOWLEVEL=y
@@ -1470,6 +1522,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m
 CONFIG_SCSI_CXGB3_ISCSI=m
 CONFIG_SCSI_CXGB4_ISCSI=m
 CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
 CONFIG_BE2ISCSI=m
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_HPSA=m
@@ -1574,6 +1627,7 @@ CONFIG_SATA_PMP=y
 CONFIG_SATA_AHCI=m
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
 CONFIG_SATA_SIL24=m
 CONFIG_ATA_SFF=y
 
@@ -1604,6 +1658,7 @@ CONFIG_SATA_VITESSE=m
 #
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
+CONFIG_PATA_ARASAN_CF=m
 CONFIG_PATA_ARTOP=m
 CONFIG_PATA_ATIIXP=m
 CONFIG_PATA_ATP867X=m
@@ -1672,6 +1727,7 @@ CONFIG_BLK_DEV_DM=m
 CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_MIRROR=m
+CONFIG_DM_RAID=m
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
@@ -1679,6 +1735,13 @@ CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
 CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_LOOPBACK_TARGET=m
+# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
@@ -1824,7 +1887,6 @@ CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
-# CONFIG_R8169_VLAN is not set
 CONFIG_SIS190=m
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
@@ -1847,11 +1909,8 @@ CONFIG_NETDEV_10000=y
 CONFIG_MDIO=m
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3_DEPENDS=y
 CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4_DEPENDS=y
 CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF_DEPENDS=y
 CONFIG_CHELSIO_T4VF=m
 CONFIG_ENIC=m
 CONFIG_IXGBE=m
@@ -1902,6 +1961,8 @@ CONFIG_ATH_COMMON=m
 # CONFIG_ATH_DEBUG is not set
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
 CONFIG_ATH9K_HW=m
 CONFIG_ATH9K_COMMON=m
 CONFIG_ATH9K=m
@@ -1920,6 +1981,7 @@ CONFIG_B43_PCICORE_AUTOSELECT=y
 CONFIG_B43_PCMCIA=y
 CONFIG_B43_SDIO=y
 CONFIG_B43_PIO=y
+CONFIG_B43_PHY_N=y
 CONFIG_B43_PHY_LP=y
 CONFIG_B43_LEDS=y
 CONFIG_B43_HWRNG=y
@@ -1952,16 +2014,22 @@ CONFIG_IPW2200_QOS=y
 # CONFIG_IPW2200_DEBUG is not set
 CONFIG_LIBIPW=m
 # CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
+CONFIG_IWLAGN=m
 
 #
 # Debugging Options
 #
 # CONFIG_IWLWIFI_DEBUG is not set
 CONFIG_IWLWIFI_DEVICE_TRACING=y
-CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
-CONFIG_IWL5000=y
+CONFIG_IWL_P2P=y
+CONFIG_IWLWIFI_LEGACY=m
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_LEGACY_DEBUG is not set
+# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set
+CONFIG_IWL4965=m
 CONFIG_IWL3945=m
 CONFIG_IWM=m
 # CONFIG_IWM_DEBUG is not set
@@ -1993,14 +2061,14 @@ CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
 CONFIG_RT2500PCI=m
 CONFIG_RT61PCI=m
-CONFIG_RT2800PCI_PCI=y
 CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT30XX=y
+CONFIG_RT2800PCI_RT33XX=y
 CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
 CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT30XX=y
+CONFIG_RT2800USB_RT33XX=y
 CONFIG_RT2800USB_RT35XX=y
 CONFIG_RT2800USB_UNKNOWN=y
 CONFIG_RT2800_LIB=m
@@ -2012,13 +2080,19 @@ CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTL8192C_COMMON=m
 CONFIG_WL1251=m
 CONFIG_WL1251_SPI=m
 CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX=m
-CONFIG_WL1271=m
-CONFIG_WL1271_SPI=m
-CONFIG_WL1271_SDIO=m
+CONFIG_WL12XX_HT=y
+CONFIG_WL12XX_SPI=m
+CONFIG_WL12XX_SDIO=m
+CONFIG_WL12XX_SDIO_TEST=m
 CONFIG_WL12XX_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
@@ -2043,6 +2117,7 @@ CONFIG_USB_USBNET=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_CDCETHER=m
 CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
 CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_SMSC75XX=m
 CONFIG_USB_NET_SMSC95XX=m
@@ -2065,6 +2140,7 @@ CONFIG_USB_NET_INT51X1=m
 CONFIG_USB_CDC_PHONET=m
 CONFIG_USB_IPHETH=m
 CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
 CONFIG_NET_PCMCIA=y
 CONFIG_PCMCIA_3C589=m
 CONFIG_PCMCIA_3C574=m
@@ -2115,6 +2191,10 @@ CONFIG_CAIF_TTY=m
 CONFIG_CAIF_SPI_SLAVE=m
 CONFIG_CAIF_SPI_SYNC=y
 CONFIG_XEN_NETDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_BACKEND=m
+CONFIG_RIONET=m
+CONFIG_RIONET_TX_SIZE=128
+CONFIG_RIONET_RX_SIZE=128
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 CONFIG_PLIP=m
@@ -2295,7 +2375,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_EVDEV=m
 # CONFIG_INPUT_EVBUG is not set
-CONFIG_XEN_KBDDEV_FRONTEND=m
 
 #
 # Input Device Drivers
@@ -2303,6 +2382,7 @@ CONFIG_XEN_KBDDEV_FRONTEND=m
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ADP5588=m
 CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1070=m
 CONFIG_KEYBOARD_QT2160=m
 # CONFIG_KEYBOARD_LKKBD is not set
 CONFIG_KEYBOARD_GPIO=m
@@ -2358,6 +2438,7 @@ CONFIG_JOYSTICK_ZHENHUA=m
 CONFIG_JOYSTICK_DB9=m
 CONFIG_JOYSTICK_GAMECON=m
 CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
 CONFIG_JOYSTICK_JOYDUMP=m
 CONFIG_JOYSTICK_XPAD=m
 CONFIG_JOYSTICK_XPAD_FF=y
@@ -2376,6 +2457,7 @@ CONFIG_TOUCHSCREEN_AD7877=m
 CONFIG_TOUCHSCREEN_AD7879=m
 CONFIG_TOUCHSCREEN_AD7879_I2C=m
 CONFIG_TOUCHSCREEN_AD7879_SPI=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 CONFIG_TOUCHSCREEN_BU21013=m
 CONFIG_TOUCHSCREEN_CY8CTMG110=m
 CONFIG_TOUCHSCREEN_DYNAPRO=m
@@ -2390,16 +2472,16 @@ CONFIG_TOUCHSCREEN_MTOUCH=m
 CONFIG_TOUCHSCREEN_INEXIO=m
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_QT602240=m
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_WM831X=m
 CONFIG_TOUCHSCREEN_WM97XX=m
-# CONFIG_TOUCHSCREEN_WM9705 is not set
-# CONFIG_TOUCHSCREEN_WM9712 is not set
-# CONFIG_TOUCHSCREEN_WM9713 is not set
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-# CONFIG_TOUCHSCREEN_MC13783 is not set
+CONFIG_TOUCHSCREEN_MC13783=m
 CONFIG_TOUCHSCREEN_USB_EGALAX=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
 CONFIG_TOUCHSCREEN_USB_3M=y
@@ -2412,15 +2494,18 @@ CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
 CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
 CONFIG_TOUCHSCREEN_USB_GOTOP=y
 CONFIG_TOUCHSCREEN_USB_JASTEC=y
-# CONFIG_TOUCHSCREEN_USB_E2I is not set
+CONFIG_TOUCHSCREEN_USB_E2I=y
 CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
 CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
 CONFIG_TOUCHSCREEN_USB_NEXIO=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC2005=m
 CONFIG_TOUCHSCREEN_TSC2007=m
-# CONFIG_TOUCHSCREEN_PCAP is not set
+CONFIG_TOUCHSCREEN_PCAP=m
+CONFIG_TOUCHSCREEN_ST1232=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AB8500_PONKEY=m
 CONFIG_INPUT_AD714X=m
 CONFIG_INPUT_AD714X_I2C=m
 CONFIG_INPUT_AD714X_SPI=m
@@ -2434,7 +2519,6 @@ CONFIG_INPUT_POWERMATE=m
 CONFIG_INPUT_YEALINK=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_WINBOND_CIR=m
 CONFIG_INPUT_PCF50633_PMU=m
 CONFIG_INPUT_PCF8574=m
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
@@ -2443,6 +2527,9 @@ CONFIG_INPUT_WM831X_ON=m
 CONFIG_INPUT_ADXL34X=m
 CONFIG_INPUT_ADXL34X_I2C=m
 CONFIG_INPUT_ADXL34X_SPI=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
 
 #
 # Hardware I/O ports
@@ -2471,25 +2558,24 @@ CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_DEVKMEM=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+# CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_NONSTANDARD=y
-# CONFIG_COMPUTONE is not set
 CONFIG_ROCKETPORT=m
 CONFIG_CYCLADES=m
 # CONFIG_CYZ_INTR is not set
-# CONFIG_DIGIEPCA is not set
 # CONFIG_MOXA_INTELLIO is not set
 # CONFIG_MOXA_SMARTIO is not set
-# CONFIG_ISI is not set
 CONFIG_SYNCLINK=m
 CONFIG_SYNCLINKMP=m
 # CONFIG_SYNCLINK_GT is not set
+CONFIG_NOZOMI=m
+# CONFIG_ISI is not set
 CONFIG_N_HDLC=m
 CONFIG_N_GSM=m
-# CONFIG_RISCOM8 is not set
-# CONFIG_SPECIALIX is not set
+# CONFIG_DEVKMEM is not set
 # CONFIG_STALDRV is not set
-CONFIG_NOZOMI=m
 
 #
 # Serial drivers
@@ -2519,9 +2605,8 @@ CONFIG_SERIAL_ALTERA_JTAGUART=m
 CONFIG_SERIAL_ALTERA_UART=m
 CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-# CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_IFX6X60=m
+CONFIG_SERIAL_PCH_UART=m
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
@@ -2574,6 +2659,7 @@ CONFIG_I2C_MUX=m
 #
 # Multiplexer I2C Chip support
 #
+CONFIG_I2C_MUX_GPIO=m
 CONFIG_I2C_MUX_PCA9541=m
 CONFIG_I2C_MUX_PCA954x=m
 CONFIG_I2C_HELPER_AUTO=y
@@ -2617,12 +2703,15 @@ CONFIG_I2C_GPIO=m
 CONFIG_I2C_INTEL_MID=m
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_PCA_PLATFORM=m
+# CONFIG_I2C_PXA_PCI is not set
 CONFIG_I2C_SIMTEC=m
 CONFIG_I2C_XILINX=m
+CONFIG_I2C_EG20T=m
 
 #
 # External I2C/SMBus adapter drivers
 #
+CONFIG_I2C_DIOLAN_U2C=m
 CONFIG_I2C_PARPORT=m
 CONFIG_I2C_PARPORT_LIGHT=m
 CONFIG_I2C_TAOS_EVM=m
@@ -2642,13 +2731,15 @@ CONFIG_SPI_MASTER=y
 #
 # SPI Master Controller Drivers
 #
+CONFIG_SPI_ALTERA=m
 CONFIG_SPI_BITBANG=m
 CONFIG_SPI_BUTTERFLY=m
 CONFIG_SPI_GPIO=m
 CONFIG_SPI_LM70_LLP=m
+CONFIG_SPI_OC_TINY=m
+# CONFIG_SPI_PXA2XX_PCI is not set
 CONFIG_SPI_TOPCLIFF_PCH=m
 CONFIG_SPI_XILINX=m
-CONFIG_SPI_XILINX_PLTFM=m
 # CONFIG_SPI_DESIGNWARE is not set
 
 #
@@ -2668,6 +2759,11 @@ CONFIG_PPS=m
 #
 CONFIG_PPS_CLIENT_KTIMER=m
 CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+
+#
+# PPS generators support
+#
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIOLIB=y
 # CONFIG_DEBUG_GPIO is not set
@@ -2698,6 +2794,7 @@ CONFIG_GPIO_ADP5588=m
 CONFIG_GPIO_CS5535=m
 CONFIG_GPIO_LANGWELL=y
 CONFIG_GPIO_PCH=m
+CONFIG_GPIO_ML_IOH=m
 CONFIG_GPIO_TIMBERDALE=y
 CONFIG_GPIO_RDC321X=m
 
@@ -2734,6 +2831,7 @@ CONFIG_W1_MASTER_GPIO=m
 #
 CONFIG_W1_SLAVE_THERM=m
 CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2423=m
 CONFIG_W1_SLAVE_DS2431=m
 CONFIG_W1_SLAVE_DS2433=m
 # CONFIG_W1_SLAVE_DS2433_CRC is not set
@@ -2749,9 +2847,13 @@ CONFIG_BATTERY_DS2760=m
 CONFIG_BATTERY_DS2782=m
 CONFIG_BATTERY_BQ20Z75=m
 CONFIG_BATTERY_BQ27x00=m
+CONFIG_BATTERY_BQ27X00_I2C=y
+CONFIG_BATTERY_BQ27X00_PLATFORM=y
 CONFIG_BATTERY_MAX17040=m
+CONFIG_BATTERY_MAX17042=m
 CONFIG_CHARGER_PCF50633=m
 CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_GPIO=m
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -2779,6 +2881,7 @@ CONFIG_SENSORS_K8TEMP=m
 CONFIG_SENSORS_K10TEMP=m
 CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
 CONFIG_SENSORS_DS1621=m
 CONFIG_SENSORS_I5K_AMB=m
 CONFIG_SENSORS_F71805F=m
@@ -2795,6 +2898,7 @@ CONFIG_SENSORS_IBMAEM=m
 CONFIG_SENSORS_IBMPEX=m
 CONFIG_SENSORS_IT87=m
 CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_LINEAGE=m
 CONFIG_SENSORS_LM63=m
 CONFIG_SENSORS_LM70=m
 CONFIG_SENSORS_LM73=m
@@ -2808,17 +2912,25 @@ CONFIG_SENSORS_LM87=m
 CONFIG_SENSORS_LM90=m
 CONFIG_SENSORS_LM92=m
 CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4151=m
 CONFIG_SENSORS_LTC4215=m
 CONFIG_SENSORS_LTC4245=m
 CONFIG_SENSORS_LTC4261=m
 CONFIG_SENSORS_LM95241=m
 CONFIG_SENSORS_MAX1111=m
 CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX6639=m
 CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
 CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_SMM665=m
 CONFIG_SENSORS_DME1737=m
@@ -2827,6 +2939,8 @@ CONFIG_SENSORS_EMC2103=m
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47M192=m
 CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_ADS1015=m
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_AMC6821=m
@@ -2849,7 +2963,6 @@ CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_W83627HF=m
 CONFIG_SENSORS_W83627EHF=m
 CONFIG_SENSORS_WM831X=m
-CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_SENSORS_APPLESMC=m
 CONFIG_SENSORS_MC13783_ADC=m
 
@@ -2857,7 +2970,6 @@ CONFIG_SENSORS_MC13783_ADC=m
 # ACPI drivers
 #
 CONFIG_SENSORS_ATK0110=m
-CONFIG_SENSORS_LIS3LV02D=m
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
 CONFIG_WATCHDOG=y
@@ -2873,6 +2985,7 @@ CONFIG_ADVANTECH_WDT=m
 CONFIG_ALIM1535_WDT=m
 CONFIG_ALIM7101_WDT=m
 CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
 CONFIG_GEODE_WDT=m
 CONFIG_SC520_WDT=m
 CONFIG_SBC_FITPC2_WATCHDOG=m
@@ -2889,6 +3002,7 @@ CONFIG_HP_WATCHDOG=m
 CONFIG_HPWDT_NMI_DECODING=y
 CONFIG_SC1200_WDT=m
 CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
 CONFIG_60XX_WDT=m
 CONFIG_SBC8360_WDT=m
 CONFIG_CPU5_WDT=m
@@ -2901,6 +3015,7 @@ CONFIG_W83877F_WDT=m
 CONFIG_W83977F_WDT=m
 CONFIG_MACHZ_WDT=m
 CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_XEN_WDT=m
 
 #
 # PCI-based Watchdog Cards
@@ -2936,6 +3051,7 @@ CONFIG_MFD_SM501=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_HTC_PASIC3=m
 CONFIG_UCB1400_CORE=m
+CONFIG_TPS6105X=m
 CONFIG_TPS65010=m
 CONFIG_TPS6507X=m
 # CONFIG_MFD_TMIO is not set
@@ -2949,21 +3065,52 @@ CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
 CONFIG_ABX500_CORE=y
 CONFIG_EZX_PCAP=y
+CONFIG_AB8500_CORE=y
+# CONFIG_AB8500_DEBUG is not set
+CONFIG_AB8500_GPADC=y
+CONFIG_MFD_CS5535=m
 CONFIG_MFD_TIMBERDALE=m
 CONFIG_LPC_SCH=m
 CONFIG_MFD_RDC321X=m
 CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_MFD_VX855=m
-# CONFIG_REGULATOR is not set
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_DUMMY=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
+CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
+CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_BQ24022=m
+CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX8649=m
+CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_MAX8952=m
+CONFIG_REGULATOR_WM831X=m
+CONFIG_REGULATOR_WM8400=m
+CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_PCAP=m
+CONFIG_REGULATOR_MC13XXX_CORE=m
+CONFIG_REGULATOR_MC13783=m
+CONFIG_REGULATOR_MC13892=m
+CONFIG_REGULATOR_TPS6105X=m
+CONFIG_REGULATOR_TPS65023=m
+CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_AD5398=m
+CONFIG_REGULATOR_AB8500=y
+CONFIG_REGULATOR_TPS6524X=m
 CONFIG_MEDIA_SUPPORT=m
 
 #
 # Multimedia core support
 #
+CONFIG_MEDIA_CONTROLLER=y
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L2_COMMON=m
-CONFIG_VIDEO_ALLOW_V4L1=y
-CONFIG_VIDEO_V4L1_COMPAT=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_DVB_CORE=m
 CONFIG_VIDEO_MEDIA=m
 
@@ -2972,8 +3119,7 @@ CONFIG_VIDEO_MEDIA=m
 #
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_IR_CORE=m
-CONFIG_VIDEO_IR=m
+CONFIG_RC_CORE=m
 CONFIG_LIRC=m
 CONFIG_RC_MAP=m
 CONFIG_IR_NEC_DECODER=m
@@ -2986,8 +3132,11 @@ CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_ENE=m
 CONFIG_IR_IMON=m
 CONFIG_IR_MCEUSB=m
+CONFIG_IR_ITE_CIR=m
 CONFIG_IR_NUVOTON=m
 CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_RC_LOOPBACK=m
 CONFIG_MEDIA_ATTACH=y
 CONFIG_MEDIA_TUNER=m
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
@@ -3011,7 +3160,6 @@ CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_MAX2165=m
 CONFIG_MEDIA_TUNER_TDA18218=m
 CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L1=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_VMALLOC=m
@@ -3021,6 +3169,9 @@ CONFIG_VIDEO_BTCX=m
 CONFIG_VIDEO_TVEEPROM=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_VMALLOC=m
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
@@ -3037,7 +3188,6 @@ CONFIG_VIDEO_IR_I2C=m
 CONFIG_VIDEO_TVAUDIO=m
 CONFIG_VIDEO_TDA7432=m
 CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TDA9875=m
 CONFIG_VIDEO_TEA6415C=m
 CONFIG_VIDEO_TEA6420=m
 CONFIG_VIDEO_MSP3400=m
@@ -3123,6 +3273,7 @@ CONFIG_VIDEO_SAA7134_DVB=m
 CONFIG_VIDEO_MXB=m
 CONFIG_VIDEO_HEXIUM_ORION=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_TIMBERDALE=m
 CONFIG_VIDEO_CX88=m
 CONFIG_VIDEO_CX88_ALSA=m
 CONFIG_VIDEO_CX88_BLACKBIRD=m
@@ -3130,6 +3281,7 @@ CONFIG_VIDEO_CX88_DVB=m
 CONFIG_VIDEO_CX88_MPEG=m
 CONFIG_VIDEO_CX88_VP3054=m
 CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
 CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_FB_IVTV=m
@@ -3139,6 +3291,7 @@ CONFIG_VIDEO_SAA7164=m
 CONFIG_VIDEO_CAFE_CCIC=m
 CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_VIA_CAMERA=m
+CONFIG_VIDEO_NOON010PC30=m
 CONFIG_SOC_CAMERA=m
 CONFIG_SOC_CAMERA_IMX074=m
 CONFIG_SOC_CAMERA_MT9M001=m
@@ -3149,9 +3302,11 @@ CONFIG_SOC_CAMERA_MT9V022=m
 CONFIG_SOC_CAMERA_RJ54N1=m
 CONFIG_SOC_CAMERA_TW9910=m
 CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_SOC_CAMERA_OV2640=m
 CONFIG_SOC_CAMERA_OV6650=m
 CONFIG_SOC_CAMERA_OV772X=m
 CONFIG_SOC_CAMERA_OV9640=m
+CONFIG_SOC_CAMERA_OV9740=m
 CONFIG_V4L_USB_DRIVERS=y
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
@@ -3168,6 +3323,7 @@ CONFIG_USB_GSPCA_JEILINJ=m
 CONFIG_USB_GSPCA_KONICA=m
 CONFIG_USB_GSPCA_MARS=m
 CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
 CONFIG_USB_GSPCA_OV519=m
 CONFIG_USB_GSPCA_OV534=m
 CONFIG_USB_GSPCA_OV534_9=m
@@ -3194,6 +3350,7 @@ CONFIG_USB_GSPCA_SUNPLUS=m
 CONFIG_USB_GSPCA_T613=m
 CONFIG_USB_GSPCA_TV8532=m
 CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
 CONFIG_USB_GSPCA_XIRLINK_CIT=m
 CONFIG_USB_GSPCA_ZC3XX=m
 CONFIG_VIDEO_PVRUSB2=m
@@ -3206,15 +3363,11 @@ CONFIG_VIDEO_EM28XX_ALSA=m
 CONFIG_VIDEO_EM28XX_DVB=m
 CONFIG_VIDEO_TLG2300=m
 CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
 CONFIG_VIDEO_CX231XX_ALSA=m
 CONFIG_VIDEO_CX231XX_DVB=m
 CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_USBVIDEO=m
-CONFIG_USB_VICAM=m
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_KONICAWC=m
 CONFIG_USB_ET61X251=m
-CONFIG_USB_SE401=m
 CONFIG_USB_SN9C102=m
 CONFIG_USB_PWC=m
 # CONFIG_USB_PWC_DEBUG is not set
@@ -3225,7 +3378,6 @@ CONFIG_USB_S2255=m
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_MEM2MEM_TESTDEV=m
 CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_GEMTEK_PCI=m
 CONFIG_RADIO_MAXIRADIO=m
 CONFIG_RADIO_MAESTRO=m
 CONFIG_I2C_SI4713=m
@@ -3239,6 +3391,12 @@ CONFIG_RADIO_TEA5764=m
 CONFIG_RADIO_SAA7706H=m
 CONFIG_RADIO_TEF6862=m
 CONFIG_RADIO_TIMBERDALE=m
+CONFIG_RADIO_WL1273=m
+
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+CONFIG_RADIO_WL128X=m
 CONFIG_DVB_MAX_ADAPTERS=8
 # CONFIG_DVB_DYNAMIC_MINORS is not set
 CONFIG_DVB_CAPTURE_DRIVERS=y
@@ -3290,6 +3448,7 @@ CONFIG_DVB_USB_FRIIO=m
 CONFIG_DVB_USB_EC168=m
 CONFIG_DVB_USB_AZ6027=m
 CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
 CONFIG_DVB_TTUSB_BUDGET=m
 CONFIG_DVB_TTUSB_DEC=m
 CONFIG_SMS_SIANO_MDTV=m
@@ -3322,9 +3481,11 @@ CONFIG_DVB_PLUTO2=m
 # Supported SDMC DM1105 Adapters
 #
 CONFIG_DVB_DM1105=m
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
 CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_FIREWIRE=y
-# CONFIG_DVB_FIREDTV_IEEE1394 is not set
 CONFIG_DVB_FIREDTV_INPUT=y
 
 #
@@ -3403,6 +3564,7 @@ CONFIG_DVB_DIB7000P=m
 CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
 
 #
 # DVB-C (cable) frontends
@@ -3428,7 +3590,9 @@ CONFIG_DVB_S5H1411=m
 #
 # ISDB-T (terrestrial) frontends
 #
+CONFIG_DVB_S921=m
 CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
 
 #
 # Digital terrestrial only tuners/PLL
@@ -3453,8 +3617,6 @@ CONFIG_DVB_IX2505V=m
 # Tools to develop new frontends
 #
 # CONFIG_DVB_DUMMY_FE is not set
-CONFIG_DAB=y
-CONFIG_USB_DABUSB=m
 
 #
 # Graphics support
@@ -3474,8 +3636,6 @@ CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_KMS=y
-CONFIG_DRM_I810=m
-CONFIG_DRM_I830=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
 CONFIG_DRM_MGA=m
@@ -3498,6 +3658,7 @@ CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=m
+# CONFIG_FB_WMT_GE_ROPS is not set
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_SVGALIB=m
 # CONFIG_FB_MACMODES is not set
@@ -3512,6 +3673,7 @@ CONFIG_FB_CIRRUS=m
 CONFIG_FB_PM2=m
 CONFIG_FB_PM2_FIFO_DISCONNECT=y
 CONFIG_FB_CYBER2000=m
+CONFIG_FB_CYBER2000_DDC=y
 # CONFIG_FB_ARC is not set
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
@@ -3567,6 +3729,7 @@ CONFIG_FB_TRIDENT=m
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_TMIO is not set
 # CONFIG_FB_SM501 is not set
+CONFIG_FB_UDL=m
 # CONFIG_FB_VIRTUAL is not set
 CONFIG_XEN_FBDEV_FRONTEND=m
 # CONFIG_FB_METRONOME is not set
@@ -3582,11 +3745,12 @@ CONFIG_LCD_TDO24M=m
 CONFIG_LCD_VGG2432A4=m
 CONFIG_LCD_PLATFORM=m
 CONFIG_LCD_S6E63M0=m
+CONFIG_LCD_LD9040=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_PROGEAR=m
 CONFIG_BACKLIGHT_CARILLO_RANCH=m
-CONFIG_BACKLIGHT_MBP_NVIDIA=m
+CONFIG_BACKLIGHT_APPLE=m
 CONFIG_BACKLIGHT_SAHARA=m
 CONFIG_BACKLIGHT_WM831X=m
 CONFIG_BACKLIGHT_ADP8860=m
@@ -3608,7 +3772,7 @@ CONFIG_VGA_CONSOLE=y
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FONTS=y
 # CONFIG_FONT_8x8 is not set
@@ -3621,10 +3785,7 @@ CONFIG_FONT_8x16=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
@@ -3744,7 +3905,6 @@ CONFIG_SND_HDA_POWER_SAVE=y
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
-CONFIG_SND_HIFIER=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INTEL8X0=m
@@ -3775,10 +3935,15 @@ CONFIG_SND_USB_USX2Y=m
 CONFIG_SND_USB_CAIAQ=m
 CONFIG_SND_USB_CAIAQ_INPUT=y
 CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_FIREWIRE_SPEAKERS=m
 CONFIG_SND_PCMCIA=y
 CONFIG_SND_VXPOCKET=m
 CONFIG_SND_PDAUDIOCF=m
 CONFIG_SND_SOC=m
+CONFIG_SND_SOC_CACHE_LZO=y
 CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_ALL_CODECS is not set
 # CONFIG_SOUND_PRIME is not set
@@ -3799,6 +3964,7 @@ CONFIG_USB_HIDDEV=y
 #
 CONFIG_HID_3M_PCT=m
 CONFIG_HID_A4TECH=m
+CONFIG_HID_ACRUX=m
 CONFIG_HID_ACRUX_FF=m
 CONFIG_HID_APPLE=m
 CONFIG_HID_BELKIN=m
@@ -3809,15 +3975,17 @@ CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_CYPRESS=m
 CONFIG_HID_DRAGONRISE=m
 CONFIG_DRAGONRISE_FF=y
-CONFIG_HID_EGALAX=m
+CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_EZKEY=m
+CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
 CONFIG_HID_UCLOGIC=m
 CONFIG_HID_WALTOP=m
 CONFIG_HID_GYRATION=m
 CONFIG_HID_TWINHAN=m
 CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
 CONFIG_HID_LOGITECH=m
 CONFIG_LOGITECH_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
@@ -3827,6 +3995,7 @@ CONFIG_HID_MAGICMOUSE=m
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MOSART=m
 CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
 CONFIG_HID_NTRIG=m
 CONFIG_HID_ORTEK=m
 CONFIG_HID_PANTHERLORD=m
@@ -3839,7 +4008,11 @@ CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
 CONFIG_HID_QUANTA=m
 CONFIG_HID_ROCCAT=m
+CONFIG_HID_ROCCAT_COMMON=m
+CONFIG_HID_ROCCAT_ARVO=m
 CONFIG_HID_ROCCAT_KONE=m
+CONFIG_HID_ROCCAT_KONEPLUS=m
+CONFIG_HID_ROCCAT_KOVAPLUS=m
 CONFIG_HID_ROCCAT_PYRA=m
 CONFIG_HID_SAMSUNG=m
 CONFIG_HID_SONY=m
@@ -3921,6 +4094,7 @@ CONFIG_USB_TMC=m
 #
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
 CONFIG_USB_STORAGE_DATAFAB=m
 CONFIG_USB_STORAGE_FREECOM=m
 CONFIG_USB_STORAGE_ISD200=m
@@ -3932,6 +4106,7 @@ CONFIG_USB_STORAGE_ALAUDA=m
 CONFIG_USB_STORAGE_ONETOUCH=m
 CONFIG_USB_STORAGE_KARMA=m
 CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
 CONFIG_USB_UAS=m
 # CONFIG_USB_LIBUSUAL is not set
 
@@ -4048,14 +4223,17 @@ CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_FUSB300 is not set
 # CONFIG_USB_GADGET_R8A66597 is not set
+# CONFIG_USB_GADGET_PXA_U2O is not set
 # CONFIG_USB_GADGET_M66592 is not set
 # CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_CI13XXX is not set
+# CONFIG_USB_GADGET_CI13XXX_PCI is not set
 CONFIG_USB_GADGET_NET2280=y
 CONFIG_USB_NET2280=m
 # CONFIG_USB_GADGET_GOKU is not set
 # CONFIG_USB_GADGET_LANGWELL is not set
+# CONFIG_USB_GADGET_EG20T is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 CONFIG_USB_GADGET_DUALSPEED=y
 # CONFIG_USB_ZERO is not set
@@ -4063,6 +4241,7 @@ CONFIG_USB_AUDIO=m
 CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y
 # CONFIG_USB_ETH_EEM is not set
+CONFIG_USB_G_NCM=m
 CONFIG_USB_GADGETFS=m
 CONFIG_USB_FUNCTIONFS=m
 CONFIG_USB_FUNCTIONFS_ETH=y
@@ -4089,6 +4268,7 @@ CONFIG_USB_G_WEBCAM=m
 CONFIG_USB_OTG_UTILS=y
 CONFIG_USB_GPIO_VBUS=m
 CONFIG_NOP_USB_XCEIV=m
+CONFIG_AB8500_USB=m
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
 CONFIG_UWB_WHCI=m
@@ -4096,6 +4276,7 @@ CONFIG_UWB_I1480U=m
 CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
+CONFIG_MMC_CLKGATE=y
 
 #
 # MMC/SD/SDIO Card Drivers
@@ -4134,12 +4315,14 @@ CONFIG_MSPRO_BLOCK=m
 #
 CONFIG_MEMSTICK_TIFM_MS=m
 CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 
 #
 # LED drivers
 #
+CONFIG_LEDS_LM3530=m
 CONFIG_LEDS_NET5501=m
 # CONFIG_LEDS_ALIX2 is not set
 CONFIG_LEDS_PCA9532=m
@@ -4152,6 +4335,7 @@ CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_LEDS_PCA955X=m
 CONFIG_LEDS_WM831X_STATUS=m
 CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_REGULATOR=m
 CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_LT3593=m
@@ -4172,6 +4356,8 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 #
 # iptables trigger is under Netfilter config (LED target)
 #
+CONFIG_NFC_DEVICES=y
+CONFIG_PN544_NFC=m
 CONFIG_ACCESSIBILITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 # CONFIG_INFINIBAND is not set
@@ -4264,6 +4450,7 @@ CONFIG_RTC_DRV_RP5C01=m
 CONFIG_RTC_DRV_V3020=m
 CONFIG_RTC_DRV_WM831X=m
 CONFIG_RTC_DRV_PCF50633=m
+CONFIG_RTC_DRV_AB8500=m
 
 #
 # on-CPU RTC drivers
@@ -4310,13 +4497,21 @@ CONFIG_UIO_NETX=m
 CONFIG_XEN_BALLOON=y
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XEN_BACKEND=y
 CONFIG_XENFS=m
 CONFIG_XEN_COMPAT_XENFS=y
 CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_XENBUS_FRONTEND=m
+CONFIG_XEN_GNTDEV=m
+CONFIG_XEN_GRANT_DEV_ALLOC=m
 CONFIG_XEN_PLATFORM_PCI=m
 CONFIG_SWIOTLB_XEN=y
 CONFIG_STAGING=y
 # CONFIG_STAGING_EXCLUDE_BUILD is not set
+# CONFIG_DIGIEPCA is not set
+# CONFIG_RISCOM8 is not set
+# CONFIG_SPECIALIX is not set
+# CONFIG_COMPUTONE is not set
 CONFIG_ET131X=m
 # CONFIG_ET131X_DEBUG is not set
 CONFIG_SLICOSS=m
@@ -4335,10 +4530,7 @@ CONFIG_VIDEO_CX25821_ALSA=m
 CONFIG_VIDEO_TM6000=m
 CONFIG_VIDEO_TM6000_ALSA=m
 CONFIG_VIDEO_TM6000_DVB=m
-CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_USB=m
-CONFIG_VIDEO_STRADIS=m
+CONFIG_DVB_CXD2099=m
 CONFIG_USB_IP_COMMON=m
 CONFIG_USB_IP_VHCI_HCD=m
 CONFIG_USB_IP_HOST=m
@@ -4347,8 +4539,9 @@ CONFIG_W35UND=m
 CONFIG_PRISM2_USB=m
 CONFIG_ECHO=m
 CONFIG_BRCM80211=m
-CONFIG_BRCM80211_PCI=y
+CONFIG_BRCMSMAC=y
 # CONFIG_BRCMFMAC is not set
+# CONFIG_BRCMDBG is not set
 CONFIG_RT2860=m
 CONFIG_RT2870=m
 CONFIG_COMEDI=m
@@ -4443,11 +4636,12 @@ CONFIG_RTL8192U=m
 CONFIG_RTL8192E=m
 CONFIG_R8712U=m
 CONFIG_R8712_AP=y
+CONFIG_RTS_PSTOR=m
+# CONFIG_RTS_PSTOR_DEBUG is not set
 # CONFIG_TRANZPORT is not set
 CONFIG_POHMELFS=m
 # CONFIG_POHMELFS_DEBUG is not set
 CONFIG_POHMELFS_CRYPTO=y
-# CONFIG_AUTOFS_FS is not set
 CONFIG_IDE_PHISON=m
 CONFIG_LINE6_USB=m
 # CONFIG_LINE6_USB_DEBUG is not set
@@ -4470,37 +4664,29 @@ CONFIG_USB_SERIAL_QUATECH2=m
 CONFIG_USB_SERIAL_QUATECH_USB2=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
-CONFIG_FB_UDL=m
 CONFIG_HYPERV=m
 CONFIG_HYPERV_STORAGE=m
 CONFIG_HYPERV_BLOCK=m
 CONFIG_HYPERV_NET=m
 CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_MOUSE=m
 # CONFIG_VME_BUS is not set
+CONFIG_DX_SEP=m
 # CONFIG_IIO is not set
+CONFIG_XVMALLOC=y
 CONFIG_ZRAM=m
+# CONFIG_ZRAM_DEBUG is not set
 CONFIG_WLAGS49_H2=m
 CONFIG_WLAGS49_H25=m
-# CONFIG_BATMAN_ADV is not set
-CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_FB_SM7XX=m
 CONFIG_VIDEO_DT3155=m
 CONFIG_DT3155_CCIR=y
 CONFIG_CRYSTALHD=m
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_ST_BT=m
-CONFIG_ADIS16255=m
 CONFIG_FB_XGI=m
 CONFIG_LIRC_STAGING=y
 CONFIG_LIRC_BT829=m
-CONFIG_LIRC_I2C=m
 CONFIG_LIRC_IGORPLUGUSB=m
 CONFIG_LIRC_IMON=m
-CONFIG_LIRC_IT87=m
-CONFIG_LIRC_ITE8709=m
 CONFIG_LIRC_PARALLEL=m
 CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SERIAL=m
@@ -4508,9 +4694,10 @@ CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
 CONFIG_LIRC_TTUSBIR=m
 CONFIG_LIRC_ZILOG=m
-CONFIG_SMB_FS=m
-# CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_EASYCAP=m
+CONFIG_EASYCAP_SND=y
+# CONFIG_EASYCAP_OSS is not set
+# CONFIG_EASYCAP_DEBUG is not set
 CONFIG_SOLO6X10=m
 CONFIG_ACPI_QUICKSTART=m
 CONFIG_MACH_NO_WESTBRIDGE=y
@@ -4537,6 +4724,7 @@ CONFIG_USB_ENESTORAGE=m
 CONFIG_BCM_WIMAX=m
 CONFIG_FT1000=m
 CONFIG_FT1000_USB=m
+CONFIG_FT1000_PCMCIA=m
 
 #
 # Speakup console speech
@@ -4557,14 +4745,24 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m
 CONFIG_SPEAKUP_SYNTH_SPKOUT=m
 CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
+CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
+CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
+CONFIG_DRM_PSB=m
+
+#
+# Altera FPGA firmware download module
+#
+CONFIG_ALTERA_STAPL=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
 CONFIG_ASUS_LAPTOP=m
 CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_WMI=m
+CONFIG_DELL_WMI_AIO=m
 CONFIG_FUJITSU_LAPTOP=m
 # CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+CONFIG_HP_ACCEL=m
 CONFIG_HP_WMI=m
 CONFIG_MSI_LAPTOP=m
 CONFIG_PANASONIC_LAPTOP=m
@@ -4582,6 +4780,8 @@ CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_SENSORS_HDAPS=m
 CONFIG_INTEL_MENLOW=m
 CONFIG_EEEPC_LAPTOP=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
 CONFIG_EEEPC_WMI=m
 CONFIG_ACPI_WMI=m
 CONFIG_MSI_WMI=m
@@ -4592,6 +4792,8 @@ CONFIG_TOSHIBA_BT_RFKILL=m
 CONFIG_ACPI_CMPC=m
 CONFIG_INTEL_IPS=m
 CONFIG_IBM_RTL=m
+CONFIG_XO15_EBOOK=m
+CONFIG_SAMSUNG_LAPTOP=m
 
 #
 # Firmware Drivers
@@ -4603,7 +4805,9 @@ CONFIG_EFI_VARS=m
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=m
 # CONFIG_ISCSI_IBFT_FIND is not set
+CONFIG_SIGMA=m
 
 #
 # File systems
@@ -4614,7 +4818,7 @@ CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
 # CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_FS=m
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 CONFIG_EXT3_FS_SECURITY=y
@@ -4639,7 +4843,6 @@ CONFIG_JFS_POSIX_ACL=y
 CONFIG_JFS_SECURITY=y
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFS_STATISTICS=y
-CONFIG_FS_POSIX_ACL=y
 CONFIG_XFS_FS=m
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
@@ -4656,7 +4859,8 @@ CONFIG_OCFS2_FS_STATS=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_NILFS2_FS=m
-CONFIG_EXPORTFS=m
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
 CONFIG_FILE_LOCKING=y
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
@@ -4749,6 +4953,7 @@ CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_VXFS_FS is not set
@@ -4757,6 +4962,7 @@ CONFIG_OMFS_FS=m
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_ROMFS_FS is not set
+CONFIG_PSTORE=y
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
@@ -4772,7 +4978,7 @@ CONFIG_NFS_V4=y
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
-CONFIG_NFS_USE_NEW_IDMAPPER=y
+# CONFIG_NFS_USE_NEW_IDMAPPER is not set
 CONFIG_NFSD=m
 # CONFIG_NFSD_DEPRECATED is not set
 CONFIG_NFSD_V2_ACL=y
@@ -4791,11 +4997,11 @@ CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
 CONFIG_CIFS_WEAK_PW_HASH=y
-# CONFIG_CIFS_UPCALL is not set
+CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
 # CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_DFS_UPCALL is not set
+CONFIG_CIFS_DFS_UPCALL=y
 CONFIG_CIFS_FSCACHE=y
 CONFIG_CIFS_ACL=y
 # CONFIG_CIFS_EXPERIMENTAL is not set
@@ -4885,7 +5091,8 @@ CONFIG_DLM=m
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
+CONFIG_PRINTK_TIME=y
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=2048
@@ -4894,10 +5101,13 @@ CONFIG_STRIP_ASM_SYMS=y
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_HARDLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
 CONFIG_DETECT_HUNG_TASK=y
@@ -4914,7 +5124,6 @@ CONFIG_TIMER_STATS=y
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 CONFIG_DEBUG_MUTEXES=y
-CONFIG_BKL=y
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_SPARSE_RCU_POINTER is not set
@@ -4950,6 +5159,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
 # CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FTRACE_NMI_ENTER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
@@ -4958,28 +5168,35 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACER_MAX_TRACE=y
 CONFIG_RING_BUFFER=y
+CONFIG_FTRACE_NMI_ENTER=y
 CONFIG_EVENT_TRACING=y
+CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_RING_BUFFER_ALLOW_SWAP=y
 CONFIG_TRACING=y
 CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
 CONFIG_FTRACE=y
-# CONFIG_FUNCTION_TRACER is not set
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_PREEMPT_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
+CONFIG_SCHED_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
 # CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_STACK_TRACER is not set
+CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_FUNCTION_PROFILER=y
+CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_FTRACE_STARTUP_TEST is not set
 CONFIG_MMIOTRACE=y
 # CONFIG_MMIOTRACE_TEST is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
 # CONFIG_DYNAMIC_DEBUG is not set
@@ -4990,7 +5207,7 @@ CONFIG_ASYNC_RAID6_TEST=m
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_KMEMCHECK is not set
+CONFIG_TEST_KSTRTOX=m
 CONFIG_STRICT_DEVMEM=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_EARLY_PRINTK=y
@@ -4999,7 +5216,9 @@ CONFIG_EARLY_PRINTK=y
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 # CONFIG_X86_PTDUMP is not set
-# CONFIG_DEBUG_RODATA is not set
+CONFIG_DEBUG_RODATA=y
+# CONFIG_DEBUG_RODATA_TEST is not set
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
 # CONFIG_DEBUG_NX_TEST is not set
 # CONFIG_IOMMU_DEBUG is not set
 # CONFIG_IOMMU_STRESS is not set
@@ -5022,6 +5241,8 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # Security options
 #
 CONFIG_KEYS=y
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=m
 # CONFIG_KEYS_DEBUG_PROC_KEYS is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 CONFIG_SECURITY=y
@@ -5157,6 +5378,9 @@ CONFIG_CRYPTO_LZO=m
 # Random Number Generation
 #
 CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -5168,6 +5392,7 @@ CONFIG_HAVE_KVM_IRQCHIP=y
 CONFIG_HAVE_KVM_EVENTFD=y
 CONFIG_KVM_APIC_ARCHITECTURE=y
 CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
@@ -5199,9 +5424,19 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
 CONFIG_DECOMPRESS_GZIP=y
 CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
 CONFIG_DECOMPRESS_LZO=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
@@ -5212,5 +5447,7 @@ CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
 CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
+CONFIG_AVERAGE=y
diff --git a/abs/core/kernel26/fix_ck2.patch b/abs/core/kernel26/fix_ck2.patch
new file mode 100644
index 0000000..6c5b52e
--- /dev/null
+++ b/abs/core/kernel26/fix_ck2.patch
@@ -0,0 +1,23 @@
+--- patch-2.6.39-ck2.orig	2011-07-09 18:36:33.930129931 +0200
++++ patch-2.6.39-ck2	2011-07-09 18:37:03.227763663 +0200
+@@ -9219,15 +9219,15 @@ Index: linux-2.6.39-ck2/init/calibrate.c
+ ===================================================================
+ --- linux-2.6.39-ck2.orig/init/calibrate.c	2011-05-19 16:29:17.000000000 +1000
+ +++ linux-2.6.39-ck2/init/calibrate.c	2011-06-04 09:10:50.271373487 +1000
+-@@ -208,7 +208,7 @@ void __cpuinit calibrate_delay(void)
++@@ -209,7 +209,7 @@ void __cpuinit calibrate_delay(void)
+  	if (!printed)
+  		pr_cont("%lu.%02lu BogoMIPS (lpj=%lu)\n",
+- 			loops_per_jiffy/(500000/HZ),
+--			(loops_per_jiffy/(5000/HZ)) % 100, loops_per_jiffy);
+-+			(loops_per_jiffy * 10 /(50000/HZ)) % 100, loops_per_jiffy);
++ 			lpj/(500000/HZ),
++-			(lpj/(5000/HZ)) % 100, lpj);
+++			(lpj * 10 / (50000/HZ)) % 100, lpj);
+  
++ 	loops_per_jiffy = lpj;
+  	printed = true;
+- }
+ Index: linux-2.6.39-ck2/kernel/Kconfig.preempt
+ ===================================================================
+ --- linux-2.6.39-ck2.orig/kernel/Kconfig.preempt	2009-06-10 13:05:27.000000000 +1000
diff --git a/abs/core/kernel26/kernel26.install b/abs/core/kernel26/kernel26.install
index 8fb5459..dceaea6 100644
--- a/abs/core/kernel26/kernel26.install
+++ b/abs/core/kernel26/kernel26.install
@@ -2,12 +2,12 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=2.6.37-LinHES
+KERNEL_VERSION=2.6.39-LinHES
 
 post_install () {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  depmod $KERNEL_VERSION 
+  /sbin/depmod $KERNEL_VERSION 
   # generate init ramdisks
   echo ">>> MKINITCPIO SETUP"
   echo ">>> ----------------"
@@ -84,7 +84,7 @@ post_upgrade() {
   fi
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  depmod $KERNEL_VERSION
+  /sbin/depmod $KERNEL_VERSION
   echo ">>> MKINITCPIO SETUP"
   echo ">>> ----------------"
   if [ "`vercmp $2 2.6.18`" -lt 0 ]; then
diff --git a/abs/core/kernel26/lh.patch b/abs/core/kernel26/lh.patch
new file mode 100644
index 0000000..025d094
--- /dev/null
+++ b/abs/core/kernel26/lh.patch
@@ -0,0 +1,13 @@
+diff -Nur linux-2.6.39.orig/Makefile linux-2.6.39/Makefile
+--- linux-2.6.39.orig/Makefile  2011-07-15 05:54:11.000000000 +0000
++++ linux-2.6.39/Makefile       2011-07-15 06:28:23.000000000 +0000
+@@ -10,9 +10,9 @@
+ # Comments in this file are targeted only to the developer, do not
+ # expect to learn how to build the kernel reading this file.
+ 
+-CKVERSION = -ck2
+-CKNAME = BFS Powered
+-EXTRAVERSION := $(EXTRAVERSION)$(CKVERSION)
++#CKVERSION = -ck2
++#CKNAME = BFS Powered
++#EXTRAVERSION := $(EXTRAVERSION)$(CKVERSION)
diff --git a/abs/core/kernel26/lh.patch.bz2 b/abs/core/kernel26/lh.patch.bz2
deleted file mode 100644
index ef7beb9..0000000
--- a/abs/core/kernel26/lh.patch.bz2
+++ /dev/null
diff --git a/abs/core/kernel26/logo_linux_clut224.ppm b/abs/core/kernel26/logo_linux_clut224.ppm
new file mode 100644
index 0000000..d682bb8
--- /dev/null
+++ b/abs/core/kernel26/logo_linux_clut224.ppm
@@ -0,0 +1,883 @@
+P3
+80 80
+255
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 18 18 18 56 56 57 94 94 94 120 125 122 120 125 122 
+114 114 114 100 104 100 73 72 69 45 45 45 12 12 12 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 3 3 3 52 52 53 114 114 114 162 165 165 193 194 195 207 206 206 207 206 206 
+203 206 205 199 199 199 177 177 178 154 155 153 107 107 107 40 41 40 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+73 72 69 177 177 178 214 214 214 211 211 211 191 191 190 157 157 157 124 124 125 124 124 125 
+128 128 128 134 135 134 169 167 166 198 198 198 212 212 212 213 213 213 162 165 165 49 49 49 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 5 5 130 133 131 
+214 214 214 198 198 198 120 125 122 25 25 25 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 39 39 39 139 141 141 211 211 211 207 206 206 
+81 81 81 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 4 4 145 142 144 214 214 214 
+145 142 144 4 4 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 25 25 25 188 188 188 
+214 214 214 97 101 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 134 135 134 214 214 214 120 125 122 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 8 8 8 37 37 37 18 18 18 0 0 0 0 0 0 
+181 183 183 213 213 213 77 81 80 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 55 55 55 214 214 214 162 165 165 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 25 25 25 110 113 110 97 101 100 18 18 18 0 0 0 
+4 5 5 198 198 198 202 202 202 34 34 34 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 1 1 1 134 135 134 211 211 211 23 22 22 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 39 39 39 113 117 114 94 94 94 35 35 37 0 0 0 
+0 0 0 45 45 45 213 213 213 145 142 144 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 8 8 8 188 188 188 169 170 170 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 25 25 25 52 52 53 15 15 15 1 1 1 0 0 0 
+0 0 0 0 0 0 149 149 149 215 215 216 56 56 57 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 25 26 28 209 209 208 107 107 107 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 1 1 1 25 26 28 211 211 211 139 141 141 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 39 39 39 214 214 214 73 72 69 1 1 1 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 181 183 183 193 194 195 13 13 13 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 39 39 39 214 214 214 70 70 70 0 0 0 0 0 0 
+0 0 0 3 3 3 3 3 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 13 13 13 8 8 8 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 107 107 107 214 214 214 49 49 49 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 39 39 39 214 214 214 70 70 70 0 0 0 0 0 0 
+0 0 0 4 4 4 34 34 34 25 25 25 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 10 11 10 23 22 22 23 22 22 61 61 62 8 8 8 0 0 0 
+0 0 0 0 0 0 0 0 0 34 34 34 213 213 213 81 81 81 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 39 39 39 214 214 214 70 70 70 0 0 0 1 1 1 
+61 61 62 110 110 110 56 56 57 31 30 29 10 11 10 0 0 0 0 0 0 0 0 0 
+10 11 10 81 81 81 139 141 141 157 157 157 134 135 134 34 34 34 12 12 12 0 0 0 
+0 0 0 0 0 0 0 0 0 3 3 3 207 206 206 110 110 110 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 39 39 39 214 214 214 70 70 70 0 0 0 55 55 55 
+177 177 178 221 220 221 191 191 190 61 61 62 0 0 0 0 0 0 0 0 0 6 6 6 
+124 124 125 202 202 202 221 220 221 228 228 229 209 209 208 97 101 100 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 196 196 196 134 135 134 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 39 39 39 214 214 214 70 70 70 0 0 0 128 128 128 
+228 228 229 207 206 206 254 254 254 202 202 202 4 5 5 0 0 0 0 0 0 67 66 67 
+234 234 234 253 253 253 181 183 183 176 176 176 237 237 237 193 194 195 30 30 32 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 180 180 180 134 135 134 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 37 37 37 214 214 214 77 81 80 0 0 0 176 176 176 
+73 72 69 45 45 45 113 117 114 255 255 255 55 55 55 0 0 0 0 0 0 107 107 107 
+254 254 254 134 135 134 0 0 0 61 61 62 130 133 131 255 255 255 124 124 125 1 1 1 
+0 0 0 0 0 0 0 0 0 0 0 0 169 170 170 149 149 149 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 25 25 25 207 206 206 100 104 100 0 0 0 154 155 153 
+8 8 8 56 56 57 88 88 89 215 215 216 81 81 81 0 0 0 16 17 20 97 101 100 
+249 249 249 45 45 45 0 0 0 15 15 15 34 34 34 234 234 234 193 194 195 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 169 170 170 154 155 153 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 13 13 13 196 196 196 128 128 128 0 0 0 154 155 153 
+30 30 32 4 4 4 25 26 28 190 189 187 99 93 71 82 49 3 62 44 1 99 93 71 
+215 215 216 30 30 32 0 0 0 0 0 0 8 8 8 228 228 229 188 188 188 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 157 157 157 157 157 157 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 4 5 5 191 191 190 145 142 144 0 0 0 128 128 128 
+139 141 141 4 4 4 30 22 14 204 154 40 242 195 5 230 195 12 217 191 5 186 140 3 
+222 194 54 114 84 20 15 10 5 0 0 0 88 88 89 255 255 255 130 133 131 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 128 128 128 169 167 166 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 1 1 1 177 177 178 157 157 157 0 0 0 39 39 39 
+221 220 221 114 84 20 222 162 5 223 177 4 237 182 9 229 197 11 229 197 11 228 195 28 
+228 195 28 229 197 11 195 161 5 162 127 35 229 224 210 228 228 229 25 26 28 1 1 1 
+0 0 0 0 0 0 0 0 0 0 0 0 107 107 107 176 176 176 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 162 165 165 169 167 166 0 0 0 1 1 1 
+154 122 74 229 173 12 237 182 9 239 190 12 242 195 5 243 196 15 230 195 17 222 194 54 
+222 194 54 228 195 28 229 197 11 229 197 11 228 195 28 162 127 35 15 10 5 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 84 85 85 180 180 180 1 1 1 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 149 149 149 162 165 165 0 0 0 116 72 0 
+187 127 3 222 162 5 237 185 12 239 190 12 239 190 12 229 197 11 228 195 28 222 194 54 
+222 194 54 229 197 11 229 197 11 229 197 11 217 191 5 230 195 17 140 97 3 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 88 88 89 180 180 180 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 147 147 147 180 180 180 1 1 1 151 101 3 
+213 151 4 222 165 7 238 185 5 239 190 12 242 195 5 228 195 28 222 194 54 222 194 54 
+229 197 11 229 197 11 229 197 11 195 161 5 186 140 3 218 161 4 140 97 3 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 81 81 81 191 191 190 10 11 10 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 23 22 22 107 107 107 162 165 165 202 202 202 193 194 195 0 0 0 82 49 3 
+187 127 3 228 171 5 238 183 8 239 190 12 243 196 15 228 195 28 228 195 28 229 197 11 
+217 191 5 195 161 5 186 140 3 201 141 4 218 161 4 213 151 4 82 49 3 1 1 1 
+3 3 3 8 8 8 0 0 0 0 0 0 56 56 57 215 215 216 39 39 39 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+45 45 45 193 194 195 214 214 214 209 209 208 188 188 188 146 154 152 36 40 42 25 25 25 
+140 97 3 179 126 3 234 182 9 243 196 15 228 195 28 228 195 28 217 191 5 195 161 5 
+179 126 3 186 140 3 201 141 4 208 149 5 187 127 3 204 160 78 56 56 57 0 0 0 
+3 3 3 67 66 67 45 45 45 3 3 3 34 34 34 211 211 211 70 70 70 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 30 30 32 
+193 194 195 212 212 213 169 170 170 128 141 142 128 141 142 127 136 134 105 117 113 105 117 113 
+153 141 120 140 97 3 151 101 3 195 161 5 195 161 5 179 126 3 179 126 3 187 127 3 
+201 141 4 201 141 4 187 127 3 204 154 40 175 166 153 193 194 195 157 157 157 4 5 5 
+0 0 0 34 34 34 124 124 125 67 66 67 10 11 10 191 191 190 107 107 107 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 81 81 81 
+214 214 214 154 161 162 110 137 133 144 159 160 146 154 152 128 141 142 97 111 112 127 136 134 
+196 196 196 153 141 120 140 97 3 168 114 3 208 149 5 208 149 5 208 149 5 201 131 2 
+187 127 3 171 122 18 194 167 117 184 186 188 209 210 212 215 215 216 199 199 199 70 70 70 
+0 0 0 0 0 0 61 61 62 70 70 70 0 0 0 157 157 157 149 149 149 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 81 81 81 
+214 214 214 144 159 160 110 137 133 144 159 160 108 121 120 139 147 145 108 121 120 120 125 122 
+181 183 183 193 194 195 153 141 120 151 101 3 151 101 3 160 105 2 160 105 2 160 105 2 
+154 122 74 175 166 153 188 189 194 207 209 211 249 249 249 255 255 255 248 246 246 157 157 157 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 114 114 114 191 191 190 10 11 10 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 45 45 45 
+215 215 216 171 176 176 127 136 134 139 147 145 123 130 126 134 135 134 120 125 122 108 121 120 
+162 165 165 209 209 208 184 186 188 175 166 153 153 141 120 153 141 120 153 141 120 175 166 153 
+181 183 183 193 194 195 221 220 221 253 253 253 255 255 255 254 254 254 255 255 255 237 237 237 
+49 49 49 0 0 0 0 0 0 0 0 0 0 0 0 61 61 62 213 213 213 107 107 107 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 61 62 
+211 211 211 162 165 165 128 141 142 110 137 133 128 141 142 108 121 120 130 133 131 105 117 113 
+146 154 152 228 228 229 188 188 188 188 188 188 184 186 188 190 189 187 188 188 188 188 189 194 
+199 199 199 234 234 234 255 255 255 255 255 255 254 254 254 254 254 254 254 254 254 255 255 255 
+154 155 153 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 110 113 110 214 214 214 
+113 117 114 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 52 52 53 203 206 205 
+157 157 157 52 52 53 144 159 160 108 121 120 128 141 142 105 117 113 135 141 132 110 113 110 
+127 136 134 237 237 237 221 220 221 184 186 188 184 186 188 181 183 183 188 188 188 212 212 213 
+243 243 243 255 255 255 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 255 255 255 
+234 234 234 25 25 25 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 100 104 100 
+215 215 216 113 117 114 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 23 22 22 188 188 188 169 167 166 
+13 13 13 10 11 10 139 147 145 108 121 120 128 141 142 108 121 120 135 141 132 110 137 133 
+121 124 114 212 217 217 255 255 255 228 228 229 212 211 208 215 215 216 237 237 237 253 253 253 
+255 255 255 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 
+255 255 255 110 110 110 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+94 94 94 215 215 216 84 85 85 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 134 135 134 202 202 202 30 30 32 
+0 0 0 0 0 0 108 121 120 139 141 141 134 135 134 108 121 120 113 117 114 110 137 133 
+121 124 114 181 183 183 255 255 255 255 255 255 254 254 254 255 255 255 255 255 255 255 255 255 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 
+255 255 255 207 206 206 4 4 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 145 142 144 198 198 198 25 25 25 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 45 45 45 212 212 212 107 107 107 0 0 0 
+0 0 0 0 0 0 77 81 80 169 167 166 121 124 114 97 101 100 97 111 112 97 111 112 
+110 108 102 154 155 153 255 255 255 254 254 254 255 255 255 254 254 254 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 255 255 255 
+255 255 255 255 255 255 56 56 57 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 34 34 34 207 206 206 120 125 122 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 134 135 134 188 188 188 15 15 15 0 0 0 
+0 0 0 0 0 0 36 40 42 154 161 162 97 111 112 100 104 100 97 111 112 105 117 113 
+121 124 114 135 141 132 249 249 249 255 255 255 253 253 253 255 255 255 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 255 255 255 255 255 255 255 255 255 255 255 255 251 250 250 
+249 249 249 255 255 255 124 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 124 124 125 207 206 206 39 39 39 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 39 39 39 207 206 206 128 128 128 3 3 3 0 0 0 
+0 0 0 0 0 0 10 11 10 146 154 152 128 141 142 97 101 100 86 97 95 105 117 113 
+110 137 133 108 121 120 234 234 234 243 243 243 228 228 229 237 237 237 254 254 254 254 254 254 
+254 254 254 254 254 254 253 253 253 237 237 237 228 228 229 225 225 225 215 215 216 213 213 213 
+209 209 208 237 237 237 209 209 208 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 25 25 25 203 206 205 128 128 128 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 94 94 94 207 209 211 73 72 69 84 85 85 8 8 8 
+0 0 0 0 0 0 1 1 1 97 111 112 175 166 153 135 141 132 123 130 126 123 130 126 
+120 125 122 113 117 114 203 206 205 249 249 249 234 234 234 251 250 250 254 254 254 254 254 254 
+254 254 254 254 254 254 253 253 253 237 237 237 215 215 216 207 206 206 157 157 157 97 101 100 
+176 176 176 196 196 196 243 243 243 88 88 89 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 23 22 22 18 18 18 120 125 122 191 191 190 10 11 10 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 145 142 144 162 165 165 25 25 25 147 147 147 77 81 80 
+3 3 3 0 0 0 0 0 0 84 85 85 146 154 152 105 117 113 120 125 122 105 117 113 
+105 117 113 97 111 112 171 176 176 254 254 254 253 253 253 255 255 255 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 255 255 255 255 255 255 231 231 232 134 135 134 12 12 12 
+134 135 134 202 202 202 213 213 213 199 199 199 6 6 6 0 0 0 0 0 0 0 0 0 
+30 30 32 88 88 89 25 25 25 55 55 55 213 213 213 37 37 37 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 1 1 1 177 177 178 113 117 114 1 1 1 70 70 70 134 135 134 
+107 107 107 52 52 53 35 35 37 162 165 165 146 154 152 105 117 113 120 125 122 105 117 113 
+123 130 126 105 117 113 146 154 152 255 255 255 255 255 255 255 255 255 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 255 255 255 255 255 255 209 209 208 70 70 70 0 0 0 
+120 125 122 249 249 249 203 206 205 237 237 237 107 107 107 0 0 0 40 41 40 94 94 94 
+94 94 94 31 30 29 0 0 0 31 30 29 211 211 211 56 56 57 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 13 13 13 198 198 198 81 81 81 1 1 1 3 3 3 37 37 37 
+97 101 100 130 133 131 130 133 131 157 157 157 149 149 149 139 147 145 139 147 145 139 141 141 
+139 141 141 127 136 134 147 147 147 253 253 253 255 255 255 255 255 255 255 255 255 254 254 254 
+254 254 254 254 254 254 255 255 255 254 254 254 251 250 250 176 176 176 45 45 45 0 0 0 
+88 88 89 254 254 254 225 225 225 193 194 195 169 167 166 107 107 107 94 94 94 55 55 55 
+10 11 10 0 0 0 0 0 0 12 12 12 191 191 190 94 94 94 0 0 0 1 1 1 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 23 22 22 207 206 206 61 61 62 0 0 0 0 0 0 0 0 0 
+4 4 4 52 52 53 97 101 100 113 117 114 124 124 125 128 128 128 130 133 131 134 135 134 
+134 135 134 139 141 141 134 135 134 157 157 157 147 147 147 81 81 81 181 183 183 255 255 255 
+255 255 255 248 246 246 184 186 188 157 157 157 139 141 141 124 124 125 31 30 29 0 0 0 
+31 30 29 124 124 125 124 124 125 97 101 100 67 66 67 31 30 29 3 3 3 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 169 167 166 120 125 122 8 8 8 18 18 18 
+3 3 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 31 30 29 209 209 208 49 49 49 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 6 6 6 31 30 29 55 55 55 77 81 80 88 88 89 94 94 94 
+94 94 94 88 88 89 84 85 85 73 72 69 35 35 37 0 0 0 23 22 22 231 231 232 
+255 255 255 145 142 144 18 18 18 56 56 57 67 66 67 40 41 40 1 1 1 0 0 0 
+1 1 1 15 15 15 18 18 18 4 4 4 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 154 155 153 128 128 128 18 18 18 25 26 28 
+1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 25 26 28 209 209 208 52 52 53 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 5 5 6 6 6 
+10 11 10 6 6 6 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 180 180 180 
+255 255 255 73 72 69 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 157 157 157 124 124 125 0 0 0 8 8 8 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 18 18 18 202 202 202 77 81 80 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 176 176 176 
+255 255 255 67 66 67 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 3 3 3 180 180 180 110 110 110 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 3 3 3 177 177 178 134 135 134 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 4 4 213 213 213 
+255 255 255 100 104 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 39 39 39 211 211 211 73 72 69 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 107 107 107 212 212 212 56 56 57 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 77 81 80 255 255 255 
+255 255 255 188 188 188 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 139 141 141 196 196 196 23 22 22 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 45 45 45 214 214 214 84 85 85 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 25 25 25 215 215 216 255 255 255 
+255 255 255 255 255 255 97 101 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 10 11 10 191 191 190 110 110 110 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 81 81 81 203 206 205 25 25 25 0 0 0 88 88 89 
+31 30 29 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 67 66 67 215 215 216 255 255 255 254 254 254 
+254 254 254 255 255 255 251 250 250 128 128 128 8 8 8 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 1 1 1 177 177 178 110 110 110 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 114 114 114 177 177 178 3 3 3 4 4 4 215 215 216 
+237 237 237 130 133 131 56 56 57 13 13 13 0 0 0 0 0 0 0 0 0 0 0 0 
+10 11 10 40 41 40 88 88 89 181 183 183 253 253 253 255 255 255 254 254 254 254 254 254 
+254 254 254 254 254 254 255 255 255 255 255 255 213 213 212 124 124 125 52 52 53 13 13 13 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 25 25 25 49 49 49 0 0 0 
+0 0 0 0 0 0 0 0 0 162 165 165 128 128 128 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 130 133 131 154 155 153 0 0 0 15 15 15 234 234 234 
+255 255 255 255 255 255 254 254 254 231 231 232 203 206 205 188 188 188 184 186 188 202 202 202 
+228 228 229 248 246 246 237 237 237 255 255 255 255 255 255 254 254 254 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 254 254 254 255 255 255 255 255 255 253 253 253 231 231 232 
+199 199 199 177 177 178 169 170 170 177 177 178 202 202 202 249 249 249 199 199 199 0 0 0 
+0 0 0 0 0 0 0 0 0 145 142 144 145 142 144 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 1 1 1 134 135 134 149 149 149 0 0 0 25 25 25 243 243 243 
+255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 
+255 255 255 248 246 246 228 228 229 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 255 255 255 255 255 255 
+255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 198 198 198 0 0 0 
+0 0 0 0 0 0 0 0 0 128 128 128 162 165 165 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 25 25 25 147 147 147 211 211 211 154 155 153 0 0 0 25 26 28 243 243 243 
+254 254 254 255 255 255 255 255 255 255 255 255 254 254 254 254 254 254 254 254 254 254 254 254 
+255 255 255 248 246 246 228 228 229 255 255 255 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 198 198 198 0 0 0 
+0 0 0 0 0 0 0 0 0 120 125 122 176 176 176 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+84 85 85 198 198 198 216 206 185 225 196 105 154 122 74 0 0 0 23 22 22 237 237 237 
+255 255 255 255 255 255 255 255 255 255 255 255 254 254 254 254 254 254 254 254 254 254 254 254 
+255 255 255 248 246 246 228 228 229 255 255 255 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 255 255 255 255 255 255 255 255 255 254 254 254 255 255 255 169 170 170 0 0 0 
+0 0 0 0 0 0 0 0 0 120 125 122 176 176 176 25 26 28 56 56 57 77 81 80 
+73 72 69 37 37 37 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61 61 62 
+214 214 214 216 206 185 216 160 17 243 196 15 243 196 15 151 101 3 23 22 22 231 231 232 
+255 255 255 255 255 255 255 255 255 255 255 255 254 254 254 254 254 254 254 254 254 254 254 254 
+255 255 255 248 246 246 228 228 229 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 120 125 122 0 0 0 
+0 0 0 0 0 0 0 0 0 124 124 125 211 211 211 207 206 206 214 214 214 213 213 212 
+211 211 211 211 211 211 70 70 70 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 176 176 176 
+221 220 221 216 160 17 239 190 12 237 185 12 243 196 15 242 195 5 171 122 18 225 225 225 
+255 255 255 255 255 255 255 255 255 255 255 255 254 254 254 254 254 254 254 254 254 254 254 254 
+255 255 255 248 246 246 228 228 229 255 255 255 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 255 255 255 255 255 255 253 253 253 232 222 197 225 196 105 171 122 18 114 84 20 
+116 72 0 82 49 3 62 44 1 154 122 74 194 167 117 194 167 117 204 160 78 204 154 40 
+204 160 78 212 211 208 202 202 202 39 39 39 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 110 113 110 214 214 214 
+225 196 105 213 151 4 233 176 10 236 185 12 237 185 12 239 190 12 238 185 5 225 196 105 
+255 255 255 255 255 255 255 255 255 255 255 255 254 254 254 254 254 254 254 254 254 254 254 254 
+255 255 255 248 246 246 225 225 225 253 253 253 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 255 255 255 255 255 255 242 240 234 204 154 40 201 131 2 222 162 5 225 161 13 
+225 161 13 216 160 17 225 161 13 216 160 17 216 160 17 222 165 7 232 176 8 229 170 8 
+218 161 4 204 154 40 221 220 221 128 128 128 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 4 4 4 34 34 34 134 135 134 214 214 214 216 206 185 
+207 143 4 220 158 5 229 173 12 234 183 11 236 185 12 237 185 12 239 190 12 243 196 15 
+232 222 197 255 255 255 255 255 255 255 255 255 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 253 253 253 243 243 243 253 253 253 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 255 255 255 254 254 254 199 194 153 177 118 3 213 151 4 220 158 5 222 165 7 
+229 170 8 225 161 13 225 161 13 229 170 8 233 176 10 233 176 10 235 180 11 234 178 8 
+229 173 12 220 158 5 209 205 199 154 155 153 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+4 4 4 97 101 100 157 157 157 181 183 183 211 211 211 215 214 212 199 194 153 207 143 4 
+220 153 4 229 173 12 233 176 10 236 185 12 236 185 12 237 185 12 237 184 11 238 185 5 
+222 194 54 253 253 255 254 254 254 255 255 255 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 254 254 254 255 255 255 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 
+255 255 255 243 243 243 224 225 229 204 160 78 177 118 3 214 156 5 229 170 8 234 178 8 
+235 180 11 235 180 11 235 180 11 234 183 12 235 180 11 235 182 11 237 183 11 236 182 10 
+233 176 10 218 161 4 212 201 177 190 189 187 8 8 8 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 13 13 
+157 157 157 215 214 212 217 216 212 216 206 185 225 196 105 204 160 78 201 131 2 214 156 5 
+229 170 8 234 178 8 237 184 11 237 185 12 237 185 12 237 185 12 237 185 12 238 185 5 
+234 183 12 225 196 105 255 255 255 255 255 255 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 255 255 255 
+253 253 253 207 206 206 188 189 194 162 127 35 187 127 3 220 158 5 228 171 5 235 180 9 
+236 184 11 236 185 12 236 183 11 235 183 10 234 183 11 237 184 10 237 184 10 238 183 8 
+235 179 10 220 153 4 199 194 153 213 213 213 61 61 62 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 39 39 39 120 125 122 
+215 215 216 199 194 153 213 151 4 222 162 5 220 158 5 218 161 4 222 165 7 229 170 8 
+233 176 10 236 182 10 237 184 11 237 185 12 237 185 12 237 185 12 237 185 12 237 184 10 
+238 185 5 229 173 12 229 224 210 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 255 255 255 
+249 249 249 199 199 199 190 189 187 162 127 35 201 131 2 214 156 5 232 176 6 237 183 11 
+237 184 11 237 184 10 236 182 10 235 182 10 235 184 11 236 185 12 237 184 10 237 182 9 
+235 179 10 218 161 4 204 154 40 212 211 208 176 176 176 13 13 13 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 56 56 57 149 149 149 
+216 206 185 213 151 4 229 170 8 232 176 8 235 179 10 238 183 8 235 180 9 235 180 9 
+234 178 8 235 183 9 237 184 10 236 185 12 237 185 12 237 185 12 237 185 12 237 185 12 
+238 185 5 235 185 11 222 194 54 253 253 255 255 255 255 254 254 254 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 255 255 255 
+251 250 250 202 202 202 190 189 187 171 122 18 197 139 3 220 158 5 234 177 7 235 180 9 
+235 180 9 235 183 9 235 182 10 235 182 10 235 183 10 236 185 12 237 184 10 235 180 9 
+234 178 8 222 165 7 197 139 3 194 167 117 215 215 216 169 167 166 40 41 40 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 56 56 57 147 147 147 
+216 206 185 220 158 5 235 180 11 236 183 11 237 184 10 237 182 9 235 180 9 235 180 9 
+234 182 9 235 183 10 236 184 11 236 184 11 236 185 12 237 185 12 237 185 12 237 185 12 
+237 184 10 238 185 5 223 177 4 232 222 197 251 250 250 255 255 255 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 209 210 212 190 189 187 171 122 18 207 143 4 222 165 7 235 183 9 232 176 8 
+234 178 8 235 182 10 235 182 10 235 183 10 235 183 10 235 183 10 237 184 10 235 180 9 
+235 180 9 229 170 8 214 156 5 201 131 2 225 196 105 215 215 216 212 212 212 130 133 131 
+4 5 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 52 52 53 145 142 144 
+212 211 208 216 160 17 233 176 10 235 182 11 237 184 10 236 185 12 235 184 11 237 184 10 
+235 184 11 235 184 11 236 184 11 236 183 11 236 184 11 237 185 12 237 185 12 237 185 12 
+237 185 12 238 185 5 238 185 5 228 195 28 242 240 234 255 255 255 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 
+255 255 255 228 228 229 157 157 157 171 122 18 207 143 4 223 170 6 235 180 9 234 178 8 
+234 178 8 235 182 10 235 182 10 235 183 10 235 183 10 235 183 10 235 183 9 234 180 7 
+234 178 8 229 173 12 229 170 8 220 158 5 207 143 4 204 154 40 212 201 177 215 214 212 
+107 107 107 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 31 30 29 114 114 114 
+217 216 212 216 160 17 229 170 8 235 180 11 235 184 11 235 184 11 235 184 11 235 183 10 
+235 183 10 235 182 10 236 183 11 236 184 11 236 185 12 236 185 12 236 185 12 236 185 12 
+235 184 11 236 185 12 238 185 5 223 177 4 225 196 105 255 255 255 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 
+255 255 255 199 199 199 31 30 29 140 97 3 201 141 4 222 165 7 234 177 7 235 180 9 
+234 180 7 235 182 10 235 182 10 236 183 11 235 182 10 235 183 10 235 184 11 235 180 9 
+235 180 9 235 180 9 233 176 10 229 170 8 225 161 13 220 153 4 207 143 4 225 196 105 
+154 155 153 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 18 18 18 97 101 100 
+212 211 208 204 154 40 229 170 8 235 180 11 235 183 10 235 183 10 235 182 10 235 182 10 
+235 183 10 234 183 11 236 183 11 236 183 11 236 183 11 236 184 11 235 184 11 234 183 12 
+234 183 12 234 183 11 237 184 10 231 192 4 234 182 9 232 222 197 255 255 255 254 254 254 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 255 255 255 
+215 215 216 35 35 37 3 1 1 151 101 3 208 149 5 228 171 5 235 180 7 235 180 9 
+235 182 10 235 182 10 235 182 10 236 183 11 236 183 11 236 183 11 236 184 11 236 184 11 
+237 184 10 237 184 10 235 182 10 235 180 11 223 170 6 225 161 13 207 143 4 212 201 177 
+145 142 144 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 18 18 18 94 94 94 
+217 216 212 216 160 17 216 160 17 235 180 11 236 183 11 236 182 10 235 182 10 235 182 10 
+235 183 10 234 183 11 236 183 11 236 183 11 236 183 11 236 183 11 235 184 11 234 183 11 
+234 183 12 234 183 11 237 183 11 238 183 8 231 192 4 222 194 54 248 246 246 255 255 255 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 255 255 255 255 255 255 169 170 170 
+23 22 22 0 0 0 15 10 5 168 114 3 208 149 5 228 171 5 235 180 7 235 180 7 
+236 184 11 236 185 12 236 185 12 237 184 11 237 184 11 236 183 11 236 183 11 236 184 11 
+236 184 11 237 185 12 237 185 12 235 185 11 220 158 5 201 131 2 225 196 105 209 210 212 
+55 55 55 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 25 26 28 110 110 110 
+217 216 212 204 154 40 225 161 13 235 180 11 237 185 12 237 184 10 235 183 9 235 183 9 
+235 182 10 235 182 10 236 183 11 236 183 11 236 184 11 236 184 11 235 185 11 236 185 12 
+234 183 12 234 183 11 235 183 10 234 180 7 234 180 7 223 170 6 225 196 105 255 255 255 
+255 255 255 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 254 
+254 254 254 254 254 254 255 255 255 255 255 255 255 255 255 237 237 237 94 94 94 0 0 0 
+0 0 0 1 1 1 30 22 14 177 118 3 214 156 5 228 171 5 234 177 7 234 180 7 
+236 185 12 237 185 12 237 185 12 237 185 12 237 185 12 236 184 11 235 184 11 236 184 11 
+237 185 12 237 185 12 237 185 12 233 176 10 207 143 4 194 167 117 215 215 216 114 114 114 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 49 49 49 139 141 141 
+217 216 212 213 151 4 222 165 7 235 180 9 236 184 11 237 184 10 235 180 9 234 178 8 
+234 178 8 235 183 9 236 183 11 236 184 11 236 184 11 236 185 12 236 185 12 236 185 12 
+234 183 12 234 183 11 234 180 7 234 180 7 231 176 7 223 177 4 197 139 3 212 201 177 
+253 253 253 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 
+255 255 255 255 255 255 255 255 255 234 234 234 139 141 141 25 25 25 0 0 0 0 0 0 
+0 0 0 0 0 0 62 44 1 177 118 3 214 156 5 228 171 5 232 176 6 234 183 11 
+235 185 11 236 185 12 237 185 12 237 185 12 236 184 11 235 184 11 235 184 11 235 184 11 
+237 185 12 237 185 12 234 183 12 220 153 4 225 196 105 212 211 208 128 128 128 13 13 13 
+4 5 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 97 101 100 181 183 183 
+216 206 185 213 151 4 222 165 7 234 177 7 235 180 9 237 182 9 234 178 8 232 176 8 
+232 176 8 234 178 8 236 183 11 236 184 11 236 185 12 236 185 12 236 185 12 236 185 12 
+234 183 12 234 183 11 234 182 9 235 180 7 231 176 7 218 161 4 208 149 5 116 72 0 
+73 72 69 162 165 165 228 228 229 243 243 243 237 237 237 243 243 243 237 237 237 225 225 225 
+191 191 190 145 142 144 77 81 80 18 18 18 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 62 44 1 187 127 3 214 156 5 228 171 5 232 176 6 234 180 7 
+236 185 12 237 185 12 237 185 12 235 184 11 235 182 11 234 183 11 235 182 11 235 182 11 
+233 176 10 229 170 8 225 161 13 194 167 117 212 212 213 113 117 114 1 1 1 10 11 10 
+4 4 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 120 125 122 198 198 198 
+199 194 153 220 153 4 214 156 5 222 165 7 228 171 5 228 171 5 228 171 5 228 171 5 
+231 176 7 234 177 7 236 182 10 237 183 11 237 185 12 237 185 12 237 185 12 237 185 12 
+236 185 12 236 185 12 236 184 11 237 182 9 234 177 7 222 165 7 208 149 5 151 101 3 
+30 22 14 0 0 0 13 13 13 25 25 25 25 25 25 25 25 25 25 25 25 12 12 12 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 82 49 3 187 127 3 214 156 5 228 171 5 232 176 6 234 180 7 
+235 182 10 236 185 12 237 185 12 235 180 11 235 179 10 235 179 10 232 176 8 233 176 10 
+220 158 5 204 154 40 199 194 153 217 216 212 107 107 107 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 113 117 114 200 199 196 
+212 201 177 197 139 3 201 131 2 197 139 3 208 149 5 208 149 5 214 156 5 220 158 5 
+222 162 5 222 165 7 229 170 8 232 176 8 232 176 8 235 179 10 237 183 11 236 183 11 
+236 182 10 236 182 10 236 182 10 236 182 10 231 176 7 214 156 5 197 139 3 151 101 3 
+82 49 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 3 3 3 82 49 3 179 126 3 208 149 5 218 161 4 232 176 6 234 177 7 
+234 180 7 235 180 9 235 179 10 232 176 8 232 176 8 229 170 8 220 158 5 207 143 4 
+194 167 117 209 205 199 202 202 202 73 72 69 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 56 56 57 134 135 134 
+217 216 212 216 206 185 194 167 117 171 122 18 177 118 3 177 118 3 187 127 3 197 139 3 
+197 139 3 201 141 4 208 149 5 208 149 5 220 158 5 222 165 7 229 170 8 234 178 8 
+234 177 7 232 176 8 232 176 8 229 170 8 218 161 4 197 139 3 177 118 3 140 97 3 
+62 44 1 3 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 82 49 3 168 114 3 201 131 2 208 149 5 222 162 5 228 171 5 
+231 176 7 229 170 8 229 170 8 222 162 5 220 158 5 197 139 3 179 126 3 212 201 177 
+214 214 214 180 180 180 40 41 40 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 8 8 
+114 114 114 191 191 190 214 214 214 217 216 212 209 205 199 199 194 153 194 167 117 162 127 35 
+168 114 3 160 105 2 168 114 3 177 118 3 179 126 3 197 139 3 208 149 5 214 156 5 
+218 161 4 218 161 4 214 156 5 208 149 5 197 139 3 177 118 3 151 101 3 116 72 0 
+30 22 14 0 0 0 1 1 1 23 22 22 45 45 45 61 61 62 77 81 80 88 88 89 
+88 88 89 88 88 89 88 88 89 88 88 89 94 94 94 88 88 89 70 70 70 49 49 49 
+52 52 53 6 6 6 62 44 1 151 101 3 179 126 3 187 127 3 201 141 4 208 149 5 
+214 156 5 214 156 5 208 149 5 201 141 4 177 118 3 162 127 35 212 211 208 212 212 213 
+110 113 110 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 8 8 8 49 49 49 110 110 110 162 165 165 202 202 202 215 214 212 217 216 212 
+212 211 208 212 201 177 194 167 117 154 122 74 140 97 3 140 97 3 160 105 2 179 126 3 
+187 127 3 187 127 3 187 127 3 177 118 3 160 105 2 151 101 3 116 72 0 82 49 3 
+73 72 69 162 165 165 191 191 190 209 209 208 213 213 213 214 214 214 213 213 213 212 212 212 
+211 211 211 211 211 211 211 211 211 211 211 211 211 211 211 211 211 211 211 211 211 212 212 212 
+213 213 213 203 206 205 78 71 29 116 72 0 160 105 2 177 118 3 187 127 3 187 127 3 
+197 139 3 187 127 3 187 127 3 160 105 2 162 127 35 207 206 206 202 202 202 67 66 67 
+1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 15 15 15 56 56 57 100 104 100 
+147 147 147 181 183 183 207 209 211 215 214 212 200 199 196 175 166 153 154 122 74 116 72 0 
+140 97 3 151 101 3 151 101 3 151 101 3 140 97 3 116 72 0 82 49 3 160 157 151 
+214 214 214 207 206 206 149 149 149 97 101 100 70 70 70 55 55 55 45 45 45 35 35 37 
+35 35 37 35 35 37 35 35 37 35 35 37 35 35 37 35 35 37 34 34 34 35 35 37 
+97 101 100 212 211 208 160 157 151 82 49 3 116 72 0 151 101 3 168 114 3 177 118 3 
+177 118 3 168 114 3 116 72 0 154 122 74 209 209 208 199 199 199 49 49 49 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 6 6 6 37 37 37 84 85 85 157 157 157 212 211 208 209 209 208 200 199 196 
+154 122 74 82 49 3 116 72 0 82 49 3 82 49 3 114 84 20 180 180 180 217 216 212 
+130 133 131 23 22 22 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 157 157 157 213 213 212 153 141 120 82 49 3 82 49 3 116 72 0 116 72 0 
+116 72 0 114 84 20 175 166 153 209 205 199 191 191 190 39 39 39 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 37 37 37 107 107 107 191 191 190 
+212 217 217 212 211 208 190 189 187 190 189 187 200 199 196 214 214 214 212 212 212 114 114 114 
+3 3 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 23 22 22 169 167 166 212 212 213 207 206 206 169 170 170 153 141 120 110 108 102 
+162 165 165 207 206 206 213 213 213 157 157 157 31 30 29 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 10 
+84 85 85 134 135 134 149 149 149 157 157 157 145 142 144 113 117 114 40 41 40 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 4 4 4 77 81 80 147 147 147 176 176 176 188 189 194 196 196 196 
+191 191 190 149 149 149 67 66 67 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+
diff --git a/abs/core/kernel26/tmp/patch-2.6.37-ck2 b/abs/core/kernel26/tmp/patch-2.6.37-ck2
deleted file mode 100644
index c4657e7..0000000
--- a/abs/core/kernel26/tmp/patch-2.6.37-ck2
+++ /dev/null
@@ -1,9083 +0,0 @@
-Index: linux-2.6.37-ck2/arch/powerpc/platforms/cell/spufs/sched.c
-===================================================================
---- linux-2.6.37-ck2.orig/arch/powerpc/platforms/cell/spufs/sched.c	2010-05-17 18:51:19.000000000 +1000
-+++ linux-2.6.37-ck2/arch/powerpc/platforms/cell/spufs/sched.c	2011-02-14 09:47:50.982252001 +1100
-@@ -64,11 +64,6 @@
- static struct timer_list spuloadavg_timer;
- 
- /*
-- * Priority of a normal, non-rt, non-niced'd process (aka nice level 0).
-- */
--#define NORMAL_PRIO		120
--
--/*
-  * Frequency of the spu scheduler tick.  By default we do one SPU scheduler
-  * tick for every 10 CPU scheduler ticks.
-  */
-Index: linux-2.6.37-ck2/Documentation/scheduler/sched-BFS.txt
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.37-ck2/Documentation/scheduler/sched-BFS.txt	2011-02-14 09:47:50.984252001 +1100
-@@ -0,0 +1,351 @@
-+BFS - The Brain Fuck Scheduler by Con Kolivas.
-+
-+Goals.
-+
-+The goal of the Brain Fuck Scheduler, referred to as BFS from here on, is to
-+completely do away with the complex designs of the past for the cpu process
-+scheduler and instead implement one that is very simple in basic design.
-+The main focus of BFS is to achieve excellent desktop interactivity and
-+responsiveness without heuristics and tuning knobs that are difficult to
-+understand, impossible to model and predict the effect of, and when tuned to
-+one workload cause massive detriment to another.
-+
-+
-+Design summary.
-+
-+BFS is best described as a single runqueue, O(n) lookup, earliest effective
-+virtual deadline first design, loosely based on EEVDF (earliest eligible virtual
-+deadline first) and my previous Staircase Deadline scheduler. Each component
-+shall be described in order to understand the significance of, and reasoning for
-+it. The codebase when the first stable version was released was approximately
-+9000 lines less code than the existing mainline linux kernel scheduler (in
-+2.6.31). This does not even take into account the removal of documentation and
-+the cgroups code that is not used.
-+
-+Design reasoning.
-+
-+The single runqueue refers to the queued but not running processes for the
-+entire system, regardless of the number of CPUs. The reason for going back to
-+a single runqueue design is that once multiple runqueues are introduced,
-+per-CPU or otherwise, there will be complex interactions as each runqueue will
-+be responsible for the scheduling latency and fairness of the tasks only on its
-+own runqueue, and to achieve fairness and low latency across multiple CPUs, any
-+advantage in throughput of having CPU local tasks causes other disadvantages.
-+This is due to requiring a very complex balancing system to at best achieve some
-+semblance of fairness across CPUs and can only maintain relatively low latency
-+for tasks bound to the same CPUs, not across them. To increase said fairness
-+and latency across CPUs, the advantage of local runqueue locking, which makes
-+for better scalability, is lost due to having to grab multiple locks.
-+
-+A significant feature of BFS is that all accounting is done purely based on CPU
-+used and nowhere is sleep time used in any way to determine entitlement or
-+interactivity. Interactivity "estimators" that use some kind of sleep/run
-+algorithm are doomed to fail to detect all interactive tasks, and to falsely tag
-+tasks that aren't interactive as being so. The reason for this is that it is
-+close to impossible to determine that when a task is sleeping, whether it is
-+doing it voluntarily, as in a userspace application waiting for input in the
-+form of a mouse click or otherwise, or involuntarily, because it is waiting for
-+another thread, process, I/O, kernel activity or whatever. Thus, such an
-+estimator will introduce corner cases, and more heuristics will be required to
-+cope with those corner cases, introducing more corner cases and failed
-+interactivity detection and so on. Interactivity in BFS is built into the design
-+by virtue of the fact that tasks that are waking up have not used up their quota
-+of CPU time, and have earlier effective deadlines, thereby making it very likely
-+they will preempt any CPU bound task of equivalent nice level. See below for
-+more information on the virtual deadline mechanism. Even if they do not preempt
-+a running task, because the rr interval is guaranteed to have a bound upper
-+limit on how long a task will wait for, it will be scheduled within a timeframe
-+that will not cause visible interface jitter.
-+
-+
-+Design details.
-+
-+Task insertion.
-+
-+BFS inserts tasks into each relevant queue as an O(1) insertion into a double
-+linked list. On insertion, *every* running queue is checked to see if the newly
-+queued task can run on any idle queue, or preempt the lowest running task on the
-+system. This is how the cross-CPU scheduling of BFS achieves significantly lower
-+latency per extra CPU the system has. In this case the lookup is, in the worst
-+case scenario, O(n) where n is the number of CPUs on the system.
-+
-+Data protection.
-+
-+BFS has one single lock protecting the process local data of every task in the
-+global queue. Thus every insertion, removal and modification of task data in the
-+global runqueue needs to grab the global lock. However, once a task is taken by
-+a CPU, the CPU has its own local data copy of the running process' accounting
-+information which only that CPU accesses and modifies (such as during a
-+timer tick) thus allowing the accounting data to be updated lockless. Once a
-+CPU has taken a task to run, it removes it from the global queue. Thus the
-+global queue only ever has, at most,
-+
-+	(number of tasks requesting cpu time) - (number of logical CPUs) + 1
-+
-+tasks in the global queue. This value is relevant for the time taken to look up
-+tasks during scheduling. This will increase if many tasks with CPU affinity set
-+in their policy to limit which CPUs they're allowed to run on if they outnumber
-+the number of CPUs. The +1 is because when rescheduling a task, the CPU's
-+currently running task is put back on the queue. Lookup will be described after
-+the virtual deadline mechanism is explained.
-+
-+Virtual deadline.
-+
-+The key to achieving low latency, scheduling fairness, and "nice level"
-+distribution in BFS is entirely in the virtual deadline mechanism. The one
-+tunable in BFS is the rr_interval, or "round robin interval". This is the
-+maximum time two SCHED_OTHER (or SCHED_NORMAL, the common scheduling policy)
-+tasks of the same nice level will be running for, or looking at it the other
-+way around, the longest duration two tasks of the same nice level will be
-+delayed for. When a task requests cpu time, it is given a quota (time_slice)
-+equal to the rr_interval and a virtual deadline. The virtual deadline is
-+offset from the current time in jiffies by this equation:
-+
-+	jiffies + (prio_ratio * rr_interval)
-+
-+The prio_ratio is determined as a ratio compared to the baseline of nice -20
-+and increases by 10% per nice level. The deadline is a virtual one only in that
-+no guarantee is placed that a task will actually be scheduled by this time, but
-+it is used to compare which task should go next. There are three components to
-+how a task is next chosen. First is time_slice expiration. If a task runs out
-+of its time_slice, it is descheduled, the time_slice is refilled, and the
-+deadline reset to that formula above. Second is sleep, where a task no longer
-+is requesting CPU for whatever reason. The time_slice and deadline are _not_
-+adjusted in this case and are just carried over for when the task is next
-+scheduled. Third is preemption, and that is when a newly waking task is deemed
-+higher priority than a currently running task on any cpu by virtue of the fact
-+that it has an earlier virtual deadline than the currently running task. The
-+earlier deadline is the key to which task is next chosen for the first and
-+second cases. Once a task is descheduled, it is put back on the queue, and an
-+O(n) lookup of all queued-but-not-running tasks is done to determine which has
-+the earliest deadline and that task is chosen to receive CPU next.
-+
-+The CPU proportion of different nice tasks works out to be approximately the
-+
-+	(prio_ratio difference)^2
-+
-+The reason it is squared is that a task's deadline does not change while it is
-+running unless it runs out of time_slice. Thus, even if the time actually
-+passes the deadline of another task that is queued, it will not get CPU time
-+unless the current running task deschedules, and the time "base" (jiffies) is
-+constantly moving.
-+
-+Task lookup.
-+
-+BFS has 103 priority queues. 100 of these are dedicated to the static priority
-+of realtime tasks, and the remaining 3 are, in order of best to worst priority,
-+SCHED_ISO (isochronous), SCHED_NORMAL, and SCHED_IDLEPRIO (idle priority
-+scheduling). When a task of these priorities is queued, a bitmap of running
-+priorities is set showing which of these priorities has tasks waiting for CPU
-+time. When a CPU is made to reschedule, the lookup for the next task to get
-+CPU time is performed in the following way:
-+
-+First the bitmap is checked to see what static priority tasks are queued. If
-+any realtime priorities are found, the corresponding queue is checked and the
-+first task listed there is taken (provided CPU affinity is suitable) and lookup
-+is complete. If the priority corresponds to a SCHED_ISO task, they are also
-+taken in FIFO order (as they behave like SCHED_RR). If the priority corresponds
-+to either SCHED_NORMAL or SCHED_IDLEPRIO, then the lookup becomes O(n). At this
-+stage, every task in the runlist that corresponds to that priority is checked
-+to see which has the earliest set deadline, and (provided it has suitable CPU
-+affinity) it is taken off the runqueue and given the CPU. If a task has an
-+expired deadline, it is taken and the rest of the lookup aborted (as they are
-+chosen in FIFO order).
-+
-+Thus, the lookup is O(n) in the worst case only, where n is as described
-+earlier, as tasks may be chosen before the whole task list is looked over.
-+
-+
-+Scalability.
-+
-+The major limitations of BFS will be that of scalability, as the separate
-+runqueue designs will have less lock contention as the number of CPUs rises.
-+However they do not scale linearly even with separate runqueues as multiple
-+runqueues will need to be locked concurrently on such designs to be able to
-+achieve fair CPU balancing, to try and achieve some sort of nice-level fairness
-+across CPUs, and to achieve low enough latency for tasks on a busy CPU when
-+other CPUs would be more suited. BFS has the advantage that it requires no
-+balancing algorithm whatsoever, as balancing occurs by proxy simply because
-+all CPUs draw off the global runqueue, in priority and deadline order. Despite
-+the fact that scalability is _not_ the prime concern of BFS, it both shows very
-+good scalability to smaller numbers of CPUs and is likely a more scalable design
-+at these numbers of CPUs.
-+
-+It also has some very low overhead scalability features built into the design
-+when it has been deemed their overhead is so marginal that they're worth adding.
-+The first is the local copy of the running process' data to the CPU it's running
-+on to allow that data to be updated lockless where possible. Then there is
-+deference paid to the last CPU a task was running on, by trying that CPU first
-+when looking for an idle CPU to use the next time it's scheduled. Finally there
-+is the notion of cache locality beyond the last running CPU. The sched_domains
-+information is used to determine the relative virtual "cache distance" that
-+other CPUs have from the last CPU a task was running on. CPUs with shared
-+caches, such as SMT siblings, or multicore CPUs with shared caches, are treated
-+as cache local. CPUs without shared caches are treated as not cache local, and
-+CPUs on different NUMA nodes are treated as very distant. This "relative cache
-+distance" is used by modifying the virtual deadline value when doing lookups.
-+Effectively, the deadline is unaltered between "cache local" CPUs, doubled for
-+"cache distant" CPUs, and quadrupled for "very distant" CPUs. The reasoning
-+behind the doubling of deadlines is as follows. The real cost of migrating a
-+task from one CPU to another is entirely dependant on the cache footprint of
-+the task, how cache intensive the task is, how long it's been running on that
-+CPU to take up the bulk of its cache, how big the CPU cache is, how fast and
-+how layered the CPU cache is, how fast a context switch is... and so on. In
-+other words, it's close to random in the real world where we do more than just
-+one sole workload. The only thing we can be sure of is that it's not free. So
-+BFS uses the principle that an idle CPU is a wasted CPU and utilising idle CPUs
-+is more important than cache locality, and cache locality only plays a part
-+after that. Doubling the effective deadline is based on the premise that the
-+"cache local" CPUs will tend to work on the same tasks up to double the number
-+of cache local CPUs, and once the workload is beyond that amount, it is likely
-+that none of the tasks are cache warm anywhere anyway. The quadrupling for NUMA
-+is a value I pulled out of my arse.
-+
-+When choosing an idle CPU for a waking task, the cache locality is determined
-+according to where the task last ran and then idle CPUs are ranked from best
-+to worst to choose the most suitable idle CPU based on cache locality, NUMA
-+node locality and hyperthread sibling business. They are chosen in the
-+following preference (if idle):
-+
-+* Same core, idle or busy cache, idle threads
-+* Other core, same cache, idle or busy cache, idle threads.
-+* Same node, other CPU, idle cache, idle threads.
-+* Same node, other CPU, busy cache, idle threads.
-+* Same core, busy threads.
-+* Other core, same cache, busy threads.
-+* Same node, other CPU, busy threads.
-+* Other node, other CPU, idle cache, idle threads.
-+* Other node, other CPU, busy cache, idle threads.
-+* Other node, other CPU, busy threads.
-+
-+This shows the SMT or "hyperthread" awareness in the design as well which will
-+choose a real idle core first before a logical SMT sibling which already has
-+tasks on the physical CPU.
-+
-+Early benchmarking of BFS suggested scalability dropped off at the 16 CPU mark.
-+However this benchmarking was performed on an earlier design that was far less
-+scalable than the current one so it's hard to know how scalable it is in terms
-+of both CPUs (due to the global runqueue) and heavily loaded machines (due to
-+O(n) lookup) at this stage. Note that in terms of scalability, the number of
-+_logical_ CPUs matters, not the number of _physical_ CPUs. Thus, a dual (2x)
-+quad core (4X) hyperthreaded (2X) machine is effectively a 16X. Newer benchmark
-+results are very promising indeed, without needing to tweak any knobs, features
-+or options. Benchmark contributions are most welcome.
-+
-+
-+Features
-+
-+As the initial prime target audience for BFS was the average desktop user, it
-+was designed to not need tweaking, tuning or have features set to obtain benefit
-+from it. Thus the number of knobs and features has been kept to an absolute
-+minimum and should not require extra user input for the vast majority of cases.
-+There are precisely 2 tunables, and 2 extra scheduling policies. The rr_interval
-+and iso_cpu tunables, and the SCHED_ISO and SCHED_IDLEPRIO policies. In addition
-+to this, BFS also uses sub-tick accounting. What BFS does _not_ now feature is
-+support for CGROUPS. The average user should neither need to know what these
-+are, nor should they need to be using them to have good desktop behaviour.
-+
-+rr_interval
-+
-+There is only one "scheduler" tunable, the round robin interval. This can be
-+accessed in
-+
-+	/proc/sys/kernel/rr_interval
-+
-+The value is in milliseconds, and the default value is set to 6 on a
-+uniprocessor machine, and automatically set to a progressively higher value on
-+multiprocessor machines. The reasoning behind increasing the value on more CPUs
-+is that the effective latency is decreased by virtue of there being more CPUs on
-+BFS (for reasons explained above), and increasing the value allows for less
-+cache contention and more throughput. Valid values are from 1 to 1000
-+Decreasing the value will decrease latencies at the cost of decreasing
-+throughput, while increasing it will improve throughput, but at the cost of
-+worsening latencies. The accuracy of the rr interval is limited by HZ resolution
-+of the kernel configuration. Thus, the worst case latencies are usually slightly
-+higher than this actual value. The default value of 6 is not an arbitrary one.
-+It is based on the fact that humans can detect jitter at approximately 7ms, so
-+aiming for much lower latencies is pointless under most circumstances. It is
-+worth noting this fact when comparing the latency performance of BFS to other
-+schedulers. Worst case latencies being higher than 7ms are far worse than
-+average latencies not being in the microsecond range.
-+
-+Isochronous scheduling.
-+
-+Isochronous scheduling is a unique scheduling policy designed to provide
-+near-real-time performance to unprivileged (ie non-root) users without the
-+ability to starve the machine indefinitely. Isochronous tasks (which means
-+"same time") are set using, for example, the schedtool application like so:
-+
-+	schedtool -I -e amarok
-+
-+This will start the audio application "amarok" as SCHED_ISO. How SCHED_ISO works
-+is that it has a priority level between true realtime tasks and SCHED_NORMAL
-+which would allow them to preempt all normal tasks, in a SCHED_RR fashion (ie,
-+if multiple SCHED_ISO tasks are running, they purely round robin at rr_interval
-+rate). However if ISO tasks run for more than a tunable finite amount of time,
-+they are then demoted back to SCHED_NORMAL scheduling. This finite amount of
-+time is the percentage of _total CPU_ available across the machine, configurable
-+as a percentage in the following "resource handling" tunable (as opposed to a
-+scheduler tunable):
-+
-+	/proc/sys/kernel/iso_cpu
-+
-+and is set to 70% by default. It is calculated over a rolling 5 second average
-+Because it is the total CPU available, it means that on a multi CPU machine, it
-+is possible to have an ISO task running as realtime scheduling indefinitely on
-+just one CPU, as the other CPUs will be available. Setting this to 100 is the
-+equivalent of giving all users SCHED_RR access and setting it to 0 removes the
-+ability to run any pseudo-realtime tasks.
-+
-+A feature of BFS is that it detects when an application tries to obtain a
-+realtime policy (SCHED_RR or SCHED_FIFO) and the caller does not have the
-+appropriate privileges to use those policies. When it detects this, it will
-+give the task SCHED_ISO policy instead. Thus it is transparent to the user.
-+Because some applications constantly set their policy as well as their nice
-+level, there is potential for them to undo the override specified by the user
-+on the command line of setting the policy to SCHED_ISO. To counter this, once
-+a task has been set to SCHED_ISO policy, it needs superuser privileges to set
-+it back to SCHED_NORMAL. This will ensure the task remains ISO and all child
-+processes and threads will also inherit the ISO policy.
-+
-+Idleprio scheduling.
-+
-+Idleprio scheduling is a scheduling policy designed to give out CPU to a task
-+_only_ when the CPU would be otherwise idle. The idea behind this is to allow
-+ultra low priority tasks to be run in the background that have virtually no
-+effect on the foreground tasks. This is ideally suited to distributed computing
-+clients (like setiathome, folding, mprime etc) but can also be used to start
-+a video encode or so on without any slowdown of other tasks. To avoid this
-+policy from grabbing shared resources and holding them indefinitely, if it
-+detects a state where the task is waiting on I/O, the machine is about to
-+suspend to ram and so on, it will transiently schedule them as SCHED_NORMAL. As
-+per the Isochronous task management, once a task has been scheduled as IDLEPRIO,
-+it cannot be put back to SCHED_NORMAL without superuser privileges. Tasks can
-+be set to start as SCHED_IDLEPRIO with the schedtool command like so:
-+
-+	schedtool -D -e ./mprime
-+
-+Subtick accounting.
-+
-+It is surprisingly difficult to get accurate CPU accounting, and in many cases,
-+the accounting is done by simply determining what is happening at the precise
-+moment a timer tick fires off. This becomes increasingly inaccurate as the
-+timer tick frequency (HZ) is lowered. It is possible to create an application
-+which uses almost 100% CPU, yet by being descheduled at the right time, records
-+zero CPU usage. While the main problem with this is that there are possible
-+security implications, it is also difficult to determine how much CPU a task
-+really does use. BFS tries to use the sub-tick accounting from the TSC clock,
-+where possible, to determine real CPU usage. This is not entirely reliable, but
-+is far more likely to produce accurate CPU usage data than the existing designs
-+and will not show tasks as consuming no CPU usage when they actually are. Thus,
-+the amount of CPU reported as being used by BFS will more accurately represent
-+how much CPU the task itself is using (as is shown for example by the 'time'
-+application), so the reported values may be quite different to other schedulers.
-+Values reported as the 'load' are more prone to problems with this design, but
-+per process values are closer to real usage. When comparing throughput of BFS
-+to other designs, it is important to compare the actual completed work in terms
-+of total wall clock time taken and total work done, rather than the reported
-+"cpu usage".
-+
-+
-+Con Kolivas <kernel@kolivas.org> Fri Aug 27 2010
-Index: linux-2.6.37-ck2/Documentation/sysctl/kernel.txt
-===================================================================
---- linux-2.6.37-ck2.orig/Documentation/sysctl/kernel.txt	2011-01-06 14:04:07.000000000 +1100
-+++ linux-2.6.37-ck2/Documentation/sysctl/kernel.txt	2011-02-14 09:47:50.984252001 +1100
-@@ -32,6 +32,7 @@
- - domainname
- - hostname
- - hotplug
-+- iso_cpu
- - java-appletviewer           [ binfmt_java, obsolete ]
- - java-interpreter            [ binfmt_java, obsolete ]
- - kstack_depth_to_print       [ X86 only ]
-@@ -54,6 +55,7 @@
- - randomize_va_space
- - real-root-dev               ==> Documentation/initrd.txt
- - reboot-cmd                  [ SPARC only ]
-+- rr_interval
- - rtsig-max
- - rtsig-nr
- - sem
-@@ -254,6 +256,16 @@
- 
- ==============================================================
- 
-+iso_cpu: (BFS CPU scheduler only).
-+
-+This sets the percentage cpu that the unprivileged SCHED_ISO tasks can
-+run effectively at realtime priority, averaged over a rolling five
-+seconds over the -whole- system, meaning all cpus.
-+
-+Set to 70 (percent) by default.
-+
-+==============================================================
-+
- l2cr: (PPC only)
- 
- This flag controls the L2 cache of G3 processor boards. If
-@@ -428,6 +440,20 @@
- 
- ==============================================================
- 
-+rr_interval: (BFS CPU scheduler only)
-+
-+This is the smallest duration that any cpu process scheduling unit
-+will run for. Increasing this value can increase throughput of cpu
-+bound tasks substantially but at the expense of increased latencies
-+overall. Conversely decreasing it will decrease average and maximum
-+latencies but at the expense of throughput. This value is in
-+milliseconds and the default value chosen depends on the number of
-+cpus available at scheduler initialisation with a minimum of 6.
-+
-+Valid values are from 1-1000.
-+
-+==============================================================
-+
- rtsig-max & rtsig-nr:
- 
- The file rtsig-max can be used to tune the maximum number
-Index: linux-2.6.37-ck2/fs/proc/base.c
-===================================================================
---- linux-2.6.37-ck2.orig/fs/proc/base.c	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/fs/proc/base.c	2011-02-14 09:47:50.986252000 +1100
-@@ -356,7 +356,7 @@
- static int proc_pid_schedstat(struct task_struct *task, char *buffer)
- {
- 	return sprintf(buffer, "%llu %llu %lu\n",
--			(unsigned long long)task->se.sum_exec_runtime,
-+			(unsigned long long)tsk_seruntime(task),
- 			(unsigned long long)task->sched_info.run_delay,
- 			task->sched_info.pcount);
- }
-Index: linux-2.6.37-ck2/include/linux/init_task.h
-===================================================================
---- linux-2.6.37-ck2.orig/include/linux/init_task.h	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/include/linux/init_task.h	2011-02-14 09:47:50.986252001 +1100
-@@ -114,6 +114,67 @@
-  *  INIT_TASK is used to set up the first task table, touch at
-  * your own risk!. Base=0, limit=0x1fffff (=2MB)
-  */
-+#ifdef CONFIG_SCHED_BFS
-+#define INIT_TASK(tsk)	\
-+{									\
-+	.state		= 0,						\
-+	.stack		= &init_thread_info,				\
-+	.usage		= ATOMIC_INIT(2),				\
-+	.flags		= PF_KTHREAD,					\
-+	.lock_depth	= -1,						\
-+	.prio		= NORMAL_PRIO,					\
-+	.static_prio	= MAX_PRIO-20,					\
-+	.normal_prio	= NORMAL_PRIO,					\
-+	.deadline	= 0,						\
-+	.policy		= SCHED_NORMAL,					\
-+	.cpus_allowed	= CPU_MASK_ALL,					\
-+	.mm		= NULL,						\
-+	.active_mm	= &init_mm,					\
-+	.run_list	= LIST_HEAD_INIT(tsk.run_list),			\
-+	.time_slice	= HZ,					\
-+	.tasks		= LIST_HEAD_INIT(tsk.tasks),			\
-+	.pushable_tasks = PLIST_NODE_INIT(tsk.pushable_tasks, MAX_PRIO), \
-+	.ptraced	= LIST_HEAD_INIT(tsk.ptraced),			\
-+	.ptrace_entry	= LIST_HEAD_INIT(tsk.ptrace_entry),		\
-+	.real_parent	= &tsk,						\
-+	.parent		= &tsk,						\
-+	.children	= LIST_HEAD_INIT(tsk.children),			\
-+	.sibling	= LIST_HEAD_INIT(tsk.sibling),			\
-+	.group_leader	= &tsk,						\
-+	RCU_INIT_POINTER(.real_cred, &init_cred),			\
-+	RCU_INIT_POINTER(.cred, &init_cred),				\
-+	.comm		= "swapper",					\
-+	.thread		= INIT_THREAD,					\
-+	.fs		= &init_fs,					\
-+	.files		= &init_files,					\
-+	.signal		= &init_signals,				\
-+	.sighand	= &init_sighand,				\
-+	.nsproxy	= &init_nsproxy,				\
-+	.pending	= {						\
-+		.list = LIST_HEAD_INIT(tsk.pending.list),		\
-+		.signal = {{0}}},					\
-+	.blocked	= {{0}},					\
-+	.alloc_lock	= __SPIN_LOCK_UNLOCKED(tsk.alloc_lock),		\
-+	.journal_info	= NULL,						\
-+	.cpu_timers	= INIT_CPU_TIMERS(tsk.cpu_timers),		\
-+	.fs_excl	= ATOMIC_INIT(0),				\
-+	.pi_lock	= __RAW_SPIN_LOCK_UNLOCKED(tsk.pi_lock),		\
-+	.timer_slack_ns = 50000, /* 50 usec default slack */		\
-+	.pids = {							\
-+		[PIDTYPE_PID]  = INIT_PID_LINK(PIDTYPE_PID),		\
-+		[PIDTYPE_PGID] = INIT_PID_LINK(PIDTYPE_PGID),		\
-+		[PIDTYPE_SID]  = INIT_PID_LINK(PIDTYPE_SID),		\
-+	},								\
-+	.dirties = INIT_PROP_LOCAL_SINGLE(dirties),			\
-+	INIT_IDS							\
-+	INIT_PERF_EVENTS(tsk)						\
-+	INIT_TRACE_IRQFLAGS						\
-+	INIT_LOCKDEP							\
-+	INIT_FTRACE_GRAPH						\
-+	INIT_TRACE_RECURSION						\
-+	INIT_TASK_RCU_PREEMPT(tsk)					\
-+}
-+#else /* CONFIG_SCHED_BFS */
- #define INIT_TASK(tsk)	\
- {									\
- 	.state		= 0,						\
-@@ -179,7 +240,7 @@
- 	INIT_TRACE_RECURSION						\
- 	INIT_TASK_RCU_PREEMPT(tsk)					\
- }
--
-+#endif /* CONFIG_SCHED_BFS */
- 
- #define INIT_CPU_TIMERS(cpu_timers)					\
- {									\
-Index: linux-2.6.37-ck2/include/linux/ioprio.h
-===================================================================
---- linux-2.6.37-ck2.orig/include/linux/ioprio.h	2009-06-10 13:05:27.000000000 +1000
-+++ linux-2.6.37-ck2/include/linux/ioprio.h	2011-02-14 09:47:50.986252001 +1100
-@@ -64,6 +64,8 @@
- 
- static inline int task_nice_ioprio(struct task_struct *task)
- {
-+	if (iso_task(task))
-+		return 0;
- 	return (task_nice(task) + 20) / 5;
- }
- 
-Index: linux-2.6.37-ck2/include/linux/sched.h
-===================================================================
---- linux-2.6.37-ck2.orig/include/linux/sched.h	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/include/linux/sched.h	2011-02-14 10:11:01.691252000 +1100
-@@ -36,8 +36,15 @@
- #define SCHED_FIFO		1
- #define SCHED_RR		2
- #define SCHED_BATCH		3
--/* SCHED_ISO: reserved but not implemented yet */
-+/* SCHED_ISO: Implemented on BFS only */
- #define SCHED_IDLE		5
-+#define SCHED_IDLEPRIO		SCHED_IDLE
-+#ifdef CONFIG_SCHED_BFS
-+#define SCHED_ISO		4
-+#define SCHED_MAX		(SCHED_IDLEPRIO)
-+#define SCHED_RANGE(policy)	((policy) <= SCHED_MAX)
-+#endif
-+
- /* Can be ORed in to make sure the process is reverted back to SCHED_NORMAL on fork */
- #define SCHED_RESET_ON_FORK     0x40000000
- 
-@@ -268,8 +275,6 @@
- extern void init_idle(struct task_struct *idle, int cpu);
- extern void init_idle_bootup_task(struct task_struct *idle);
- 
--extern int runqueue_is_locked(int cpu);
--
- extern cpumask_var_t nohz_cpu_mask;
- #if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ)
- extern void select_nohz_load_balancer(int stop_tick);
-@@ -1188,17 +1193,31 @@
- 
- 	int lock_depth;		/* BKL lock depth */
- 
-+#ifndef CONFIG_SCHED_BFS
- #ifdef CONFIG_SMP
- #ifdef __ARCH_WANT_UNLOCKED_CTXSW
- 	int oncpu;
- #endif
- #endif
-+#else /* CONFIG_SCHED_BFS */
-+	int oncpu;
-+#endif
- 
- 	int prio, static_prio, normal_prio;
- 	unsigned int rt_priority;
-+#ifdef CONFIG_SCHED_BFS
-+	int time_slice;
-+	u64 deadline;
-+	struct list_head run_list;
-+	u64 last_ran;
-+	u64 sched_time; /* sched_clock time spent running */
-+
-+	unsigned long rt_timeout;
-+#else /* CONFIG_SCHED_BFS */
- 	const struct sched_class *sched_class;
- 	struct sched_entity se;
- 	struct sched_rt_entity rt;
-+#endif
- 
- #ifdef CONFIG_PREEMPT_NOTIFIERS
- 	/* list of struct preempt_notifier: */
-@@ -1295,6 +1314,9 @@
- 	int __user *clear_child_tid;		/* CLONE_CHILD_CLEARTID */
- 
- 	cputime_t utime, stime, utimescaled, stimescaled;
-+#ifdef CONFIG_SCHED_BFS
-+	unsigned long utime_pc, stime_pc;
-+#endif
- 	cputime_t gtime;
- #ifndef CONFIG_VIRT_CPU_ACCOUNTING
- 	cputime_t prev_utime, prev_stime;
-@@ -1514,6 +1536,60 @@
- #endif
- };
- 
-+#ifdef CONFIG_SCHED_BFS
-+extern int grunqueue_is_locked(void);
-+extern void grq_unlock_wait(void);
-+#define tsk_seruntime(t)		((t)->sched_time)
-+#define tsk_rttimeout(t)		((t)->rt_timeout)
-+
-+static inline void tsk_cpus_current(struct task_struct *p)
-+{
-+}
-+
-+#define runqueue_is_locked(cpu)	grunqueue_is_locked()
-+
-+static inline void print_scheduler_version(void)
-+{
-+	printk(KERN_INFO"BFS CPU scheduler v0.363 by Con Kolivas.\n");
-+}
-+
-+static inline int iso_task(struct task_struct *p)
-+{
-+	return (p->policy == SCHED_ISO);
-+}
-+extern void remove_cpu(unsigned long cpu);
-+extern int above_background_load(void);
-+#else /* CFS */
-+extern int runqueue_is_locked(int cpu);
-+#define tsk_seruntime(t)	((t)->se.sum_exec_runtime)
-+#define tsk_rttimeout(t)	((t)->rt.timeout)
-+
-+static inline void tsk_cpus_current(struct task_struct *p)
-+{
-+	p->rt.nr_cpus_allowed = current->rt.nr_cpus_allowed;
-+}
-+
-+static inline void print_scheduler_version(void)
-+{
-+	printk(KERN_INFO"CFS CPU scheduler.\n");
-+}
-+
-+static inline int iso_task(struct task_struct *p)
-+{
-+	return 0;
-+}
-+
-+static inline void remove_cpu(unsigned long cpu)
-+{
-+}
-+
-+/* Anyone feel like implementing this? */
-+static inline int above_background_load(void)
-+{
-+	return 1;
-+}
-+#endif /* CONFIG_SCHED_BFS */
-+
- /* Future-safe accessor for struct task_struct's cpus_allowed. */
- #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
- 
-@@ -1531,10 +1607,20 @@
-  */
- 
- #define MAX_USER_RT_PRIO	100
--#define MAX_RT_PRIO		MAX_USER_RT_PRIO
-+#define MAX_RT_PRIO		(MAX_USER_RT_PRIO + 1)
-+#define DEFAULT_PRIO		(MAX_RT_PRIO + 20)
- 
-+#ifdef CONFIG_SCHED_BFS
-+#define PRIO_RANGE		(40)
-+#define MAX_PRIO		(MAX_RT_PRIO + PRIO_RANGE)
-+#define ISO_PRIO		(MAX_RT_PRIO)
-+#define NORMAL_PRIO		(MAX_RT_PRIO + 1)
-+#define IDLE_PRIO		(MAX_RT_PRIO + 2)
-+#define PRIO_LIMIT		((IDLE_PRIO) + 1)
-+#else /* CONFIG_SCHED_BFS */
- #define MAX_PRIO		(MAX_RT_PRIO + 40)
--#define DEFAULT_PRIO		(MAX_RT_PRIO + 20)
-+#define NORMAL_PRIO		DEFAULT_PRIO
-+#endif /* CONFIG_SCHED_BFS */
- 
- static inline int rt_prio(int prio)
- {
-@@ -1862,7 +1948,7 @@
- extern unsigned long long thread_group_sched_runtime(struct task_struct *task);
- 
- /* sched_exec is called by processes performing an exec */
--#ifdef CONFIG_SMP
-+#if defined(CONFIG_SMP) && !defined(CONFIG_SCHED_BFS)
- extern void sched_exec(void);
- #else
- #define sched_exec()   {}
-Index: linux-2.6.37-ck2/init/Kconfig
-===================================================================
---- linux-2.6.37-ck2.orig/init/Kconfig	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/init/Kconfig	2011-02-14 09:47:50.988252001 +1100
-@@ -30,6 +30,19 @@
- 
- menu "General setup"
- 
-+config SCHED_BFS
-+	bool "BFS cpu scheduler"
-+	---help---
-+	  The Brain Fuck CPU Scheduler for excellent interactivity and
-+	  responsiveness on the desktop and solid scalability on normal
-+          hardware. Not recommended for 4096 CPUs.
-+
-+	  Currently incompatible with the Group CPU scheduler, and RCU TORTURE
-+          TEST so these options are disabled.
-+
-+          Say Y here.
-+	default y
-+
- config EXPERIMENTAL
- 	bool "Prompt for development and/or incomplete code/drivers"
- 	---help---
-@@ -563,6 +576,7 @@
- 
- config CGROUP_CPUACCT
- 	bool "Simple CPU accounting cgroup subsystem"
-+	depends on !SCHED_BFS
- 	help
- 	  Provides a simple Resource Controller for monitoring the
- 	  total CPU consumed by the tasks in a cgroup.
-@@ -629,7 +643,7 @@
- 
- menuconfig CGROUP_SCHED
- 	bool "Group CPU scheduler"
--	depends on EXPERIMENTAL
-+	depends on EXPERIMENTAL && !SCHED_BFS
- 	default n
- 	help
- 	  This feature lets CPU scheduler recognize task groups and control CPU
-Index: linux-2.6.37-ck2/init/main.c
-===================================================================
---- linux-2.6.37-ck2.orig/init/main.c	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/init/main.c	2011-02-14 09:47:50.989252001 +1100
-@@ -824,6 +824,7 @@
- 	system_state = SYSTEM_RUNNING;
- 	numa_default_policy();
- 
-+	print_scheduler_version();
- 
- 	current->signal->flags |= SIGNAL_UNKILLABLE;
- 
-Index: linux-2.6.37-ck2/kernel/delayacct.c
-===================================================================
---- linux-2.6.37-ck2.orig/kernel/delayacct.c	2009-12-03 21:40:09.000000000 +1100
-+++ linux-2.6.37-ck2/kernel/delayacct.c	2011-02-14 09:47:50.989252001 +1100
-@@ -128,7 +128,7 @@
- 	 */
- 	t1 = tsk->sched_info.pcount;
- 	t2 = tsk->sched_info.run_delay;
--	t3 = tsk->se.sum_exec_runtime;
-+	t3 = tsk_seruntime(tsk);
- 
- 	d->cpu_count += t1;
- 
-Index: linux-2.6.37-ck2/kernel/exit.c
-===================================================================
---- linux-2.6.37-ck2.orig/kernel/exit.c	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/kernel/exit.c	2011-02-14 09:47:50.989252001 +1100
-@@ -132,7 +132,7 @@
- 		sig->inblock += task_io_get_inblock(tsk);
- 		sig->oublock += task_io_get_oublock(tsk);
- 		task_io_accounting_add(&sig->ioac, &tsk->ioac);
--		sig->sum_sched_runtime += tsk->se.sum_exec_runtime;
-+		sig->sum_sched_runtime += tsk_seruntime(tsk);
- 	}
- 
- 	sig->nr_threads--;
-Index: linux-2.6.37-ck2/kernel/kthread.c
-===================================================================
---- linux-2.6.37-ck2.orig/kernel/kthread.c	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/kernel/kthread.c	2011-02-14 09:47:50.989252001 +1100
-@@ -184,7 +184,9 @@
- 	}
- 
- 	p->cpus_allowed = cpumask_of_cpu(cpu);
-+#ifndef CONFIG_SCHED_BFS
- 	p->rt.nr_cpus_allowed = 1;
-+#endif
- 	p->flags |= PF_THREAD_BOUND;
- }
- EXPORT_SYMBOL(kthread_bind);
-Index: linux-2.6.37-ck2/kernel/posix-cpu-timers.c
-===================================================================
---- linux-2.6.37-ck2.orig/kernel/posix-cpu-timers.c	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/kernel/posix-cpu-timers.c	2011-02-14 09:47:50.990252001 +1100
-@@ -248,7 +248,7 @@
- 	do {
- 		times->utime = cputime_add(times->utime, t->utime);
- 		times->stime = cputime_add(times->stime, t->stime);
--		times->sum_exec_runtime += t->se.sum_exec_runtime;
-+		times->sum_exec_runtime += tsk_seruntime(t);
- 	} while_each_thread(tsk, t);
- out:
- 	rcu_read_unlock();
-@@ -508,7 +508,7 @@
- void posix_cpu_timers_exit(struct task_struct *tsk)
- {
- 	cleanup_timers(tsk->cpu_timers,
--		       tsk->utime, tsk->stime, tsk->se.sum_exec_runtime);
-+		       tsk->utime, tsk->stime, tsk_seruntime(tsk));
- 
- }
- void posix_cpu_timers_exit_group(struct task_struct *tsk)
-@@ -518,7 +518,7 @@
- 	cleanup_timers(tsk->signal->cpu_timers,
- 		       cputime_add(tsk->utime, sig->utime),
- 		       cputime_add(tsk->stime, sig->stime),
--		       tsk->se.sum_exec_runtime + sig->sum_sched_runtime);
-+		       tsk_seruntime(tsk) + sig->sum_sched_runtime);
- }
- 
- static void clear_dead_task(struct k_itimer *timer, union cpu_time_count now)
-@@ -949,7 +949,7 @@
- 		struct cpu_timer_list *t = list_first_entry(timers,
- 						      struct cpu_timer_list,
- 						      entry);
--		if (!--maxfire || tsk->se.sum_exec_runtime < t->expires.sched) {
-+		if (!--maxfire || tsk_seruntime(tsk) < t->expires.sched) {
- 			tsk->cputime_expires.sched_exp = t->expires.sched;
- 			break;
- 		}
-@@ -966,7 +966,7 @@
- 			ACCESS_ONCE(sig->rlim[RLIMIT_RTTIME].rlim_max);
- 
- 		if (hard != RLIM_INFINITY &&
--		    tsk->rt.timeout > DIV_ROUND_UP(hard, USEC_PER_SEC/HZ)) {
-+		    tsk_rttimeout(tsk) > DIV_ROUND_UP(hard, USEC_PER_SEC/HZ)) {
- 			/*
- 			 * At the hard limit, we just die.
- 			 * No need to calculate anything else now.
-@@ -974,7 +974,7 @@
- 			__group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk);
- 			return;
- 		}
--		if (tsk->rt.timeout > DIV_ROUND_UP(soft, USEC_PER_SEC/HZ)) {
-+		if (tsk_rttimeout(tsk) > DIV_ROUND_UP(soft, USEC_PER_SEC/HZ)) {
- 			/*
- 			 * At the soft limit, send a SIGXCPU every second.
- 			 */
-@@ -1276,7 +1276,7 @@
- 		struct task_cputime task_sample = {
- 			.utime = tsk->utime,
- 			.stime = tsk->stime,
--			.sum_exec_runtime = tsk->se.sum_exec_runtime
-+			.sum_exec_runtime = tsk_seruntime(tsk)
- 		};
- 
- 		if (task_cputime_expired(&task_sample, &tsk->cputime_expires))
-Index: linux-2.6.37-ck2/kernel/sched_bfs.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.37-ck2/kernel/sched_bfs.c	2011-02-14 10:11:00.294252001 +1100
-@@ -0,0 +1,7243 @@
-+/*
-+ *  kernel/sched_bfs.c, was sched.c
-+ *
-+ *  Kernel scheduler and related syscalls
-+ *
-+ *  Copyright (C) 1991-2002  Linus Torvalds
-+ *
-+ *  1996-12-23  Modified by Dave Grothe to fix bugs in semaphores and
-+ *		make semaphores SMP safe
-+ *  1998-11-19	Implemented schedule_timeout() and related stuff
-+ *		by Andrea Arcangeli
-+ *  2002-01-04	New ultra-scalable O(1) scheduler by Ingo Molnar:
-+ *		hybrid priority-list and round-robin design with
-+ *		an array-switch method of distributing timeslices
-+ *		and per-CPU runqueues.  Cleanups and useful suggestions
-+ *		by Davide Libenzi, preemptible kernel bits by Robert Love.
-+ *  2003-09-03	Interactivity tuning by Con Kolivas.
-+ *  2004-04-02	Scheduler domains code by Nick Piggin
-+ *  2007-04-15  Work begun on replacing all interactivity tuning with a
-+ *              fair scheduling design by Con Kolivas.
-+ *  2007-05-05  Load balancing (smp-nice) and other improvements
-+ *              by Peter Williams
-+ *  2007-05-06  Interactivity improvements to CFS by Mike Galbraith
-+ *  2007-07-01  Group scheduling enhancements by Srivatsa Vaddagiri
-+ *  2007-11-29  RT balancing improvements by Steven Rostedt, Gregory Haskins,
-+ *              Thomas Gleixner, Mike Kravetz
-+ *  now		Brainfuck deadline scheduling policy by Con Kolivas deletes
-+ *              a whole lot of those previous things.
-+ */
-+
-+#include <linux/mm.h>
-+#include <linux/module.h>
-+#include <linux/nmi.h>
-+#include <linux/init.h>
-+#include <asm/uaccess.h>
-+#include <linux/highmem.h>
-+#include <linux/smp_lock.h>
-+#include <asm/mmu_context.h>
-+#include <linux/interrupt.h>
-+#include <linux/capability.h>
-+#include <linux/completion.h>
-+#include <linux/kernel_stat.h>
-+#include <linux/debug_locks.h>
-+#include <linux/perf_event.h>
-+#include <linux/security.h>
-+#include <linux/notifier.h>
-+#include <linux/profile.h>
-+#include <linux/freezer.h>
-+#include <linux/vmalloc.h>
-+#include <linux/blkdev.h>
-+#include <linux/delay.h>
-+#include <linux/smp.h>
-+#include <linux/threads.h>
-+#include <linux/timer.h>
-+#include <linux/rcupdate.h>
-+#include <linux/cpu.h>
-+#include <linux/cpuset.h>
-+#include <linux/cpumask.h>
-+#include <linux/percpu.h>
-+#include <linux/proc_fs.h>
-+#include <linux/seq_file.h>
-+#include <linux/syscalls.h>
-+#include <linux/times.h>
-+#include <linux/tsacct_kern.h>
-+#include <linux/kprobes.h>
-+#include <linux/delayacct.h>
-+#include <linux/log2.h>
-+#include <linux/bootmem.h>
-+#include <linux/ftrace.h>
-+#include <linux/slab.h>
-+
-+#include <asm/tlb.h>
-+#include <asm/unistd.h>
-+
-+#include "sched_cpupri.h"
-+#include "workqueue_sched.h"
-+
-+#define CREATE_TRACE_POINTS
-+#include <trace/events/sched.h>
-+
-+#define rt_prio(prio)		unlikely((prio) < MAX_RT_PRIO)
-+#define rt_task(p)		rt_prio((p)->prio)
-+#define rt_queue(rq)		rt_prio((rq)->rq_prio)
-+#define batch_task(p)		(unlikely((p)->policy == SCHED_BATCH))
-+#define is_rt_policy(policy)	((policy) == SCHED_FIFO || \
-+					(policy) == SCHED_RR)
-+#define has_rt_policy(p)	unlikely(is_rt_policy((p)->policy))
-+#define idleprio_task(p)	unlikely((p)->policy == SCHED_IDLEPRIO)
-+#define iso_task(p)		unlikely((p)->policy == SCHED_ISO)
-+#define iso_queue(rq)		unlikely((rq)->rq_policy == SCHED_ISO)
-+#define ISO_PERIOD		((5 * HZ * num_online_cpus()) + 1)
-+
-+/*
-+ * Convert user-nice values [ -20 ... 0 ... 19 ]
-+ * to static priority [ MAX_RT_PRIO..MAX_PRIO-1 ],
-+ * and back.
-+ */
-+#define NICE_TO_PRIO(nice)	(MAX_RT_PRIO + (nice) + 20)
-+#define PRIO_TO_NICE(prio)	((prio) - MAX_RT_PRIO - 20)
-+#define TASK_NICE(p)		PRIO_TO_NICE((p)->static_prio)
-+
-+/*
-+ * 'User priority' is the nice value converted to something we
-+ * can work with better when scaling various scheduler parameters,
-+ * it's a [ 0 ... 39 ] range.
-+ */
-+#define USER_PRIO(p)		((p) - MAX_RT_PRIO)
-+#define TASK_USER_PRIO(p)	USER_PRIO((p)->static_prio)
-+#define MAX_USER_PRIO		(USER_PRIO(MAX_PRIO))
-+#define SCHED_PRIO(p)		((p) + MAX_RT_PRIO)
-+#define STOP_PRIO		(MAX_RT_PRIO - 1)
-+
-+/*
-+ * Some helpers for converting to/from various scales. Use shifts to get
-+ * approximate multiples of ten for less overhead.
-+ */
-+#define JIFFIES_TO_NS(TIME)	((TIME) * (1000000000 / HZ))
-+#define JIFFY_NS		(1000000000 / HZ)
-+#define HALF_JIFFY_NS		(1000000000 / HZ / 2)
-+#define HALF_JIFFY_US		(1000000 / HZ / 2)
-+#define MS_TO_NS(TIME)		((TIME) << 20)
-+#define MS_TO_US(TIME)		((TIME) << 10)
-+#define NS_TO_MS(TIME)		((TIME) >> 20)
-+#define NS_TO_US(TIME)		((TIME) >> 10)
-+
-+#define RESCHED_US	(100) /* Reschedule if less than this many μs left */
-+
-+/*
-+ * This is the time all tasks within the same priority round robin.
-+ * Value is in ms and set to a minimum of 6ms. Scales with number of cpus.
-+ * Tunable via /proc interface.
-+ */
-+int rr_interval __read_mostly = 6;
-+
-+/*
-+ * sched_iso_cpu - sysctl which determines the cpu percentage SCHED_ISO tasks
-+ * are allowed to run five seconds as real time tasks. This is the total over
-+ * all online cpus.
-+ */
-+int sched_iso_cpu __read_mostly = 70;
-+
-+/*
-+ * The relative length of deadline for each priority(nice) level.
-+ */
-+static int prio_ratios[PRIO_RANGE] __read_mostly;
-+
-+/*
-+ * The quota handed out to tasks of all priority levels when refilling their
-+ * time_slice.
-+ */
-+static inline unsigned long timeslice(void)
-+{
-+	return MS_TO_US(rr_interval);
-+}
-+
-+/*
-+ * The global runqueue data that all CPUs work off. Data is protected either
-+ * by the global grq lock, or the discrete lock that precedes the data in this
-+ * struct.
-+ */
-+struct global_rq {
-+	raw_spinlock_t lock;
-+	unsigned long nr_running;
-+	unsigned long nr_uninterruptible;
-+	unsigned long long nr_switches;
-+	struct list_head queue[PRIO_LIMIT];
-+	DECLARE_BITMAP(prio_bitmap, PRIO_LIMIT + 1);
-+#ifdef CONFIG_SMP
-+	unsigned long qnr; /* queued not running */
-+	cpumask_t cpu_idle_map;
-+	int idle_cpus;
-+#endif
-+	u64 niffies; /* Nanosecond jiffies */
-+	unsigned long last_jiffy; /* Last jiffy we updated niffies */
-+
-+	raw_spinlock_t iso_lock;
-+	int iso_ticks;
-+	int iso_refractory;
-+};
-+
-+/* There can be only one */
-+static struct global_rq grq;
-+
-+/*
-+ * This is the main, per-CPU runqueue data structure.
-+ * This data should only be modified by the local cpu.
-+ */
-+struct rq {
-+#ifdef CONFIG_SMP
-+#ifdef CONFIG_NO_HZ
-+	u64 nohz_stamp;
-+	unsigned char in_nohz_recently;
-+#endif
-+#endif
-+
-+	struct task_struct *curr, *idle, *stop;
-+	struct mm_struct *prev_mm;
-+
-+	/* Stored data about rq->curr to work outside grq lock */
-+	u64 rq_deadline;
-+	unsigned int rq_policy;
-+	int rq_time_slice;
-+	u64 rq_last_ran;
-+	int rq_prio;
-+	int rq_running; /* There is a task running */
-+
-+	/* Accurate timekeeping data */
-+	u64 timekeep_clock;
-+	unsigned long user_pc, nice_pc, irq_pc, softirq_pc, system_pc,
-+		iowait_pc, idle_pc;
-+	atomic_t nr_iowait;
-+
-+#ifdef CONFIG_SMP
-+	int cpu;		/* cpu of this runqueue */
-+	int online;
-+
-+	struct root_domain *rd;
-+	struct sched_domain *sd;
-+	unsigned long *cpu_locality; /* CPU relative cache distance */
-+#ifdef CONFIG_SCHED_SMT
-+	int (*siblings_idle)(unsigned long cpu);
-+	/* See if all smt siblings are idle */
-+	cpumask_t smt_siblings;
-+#endif
-+#ifdef CONFIG_SCHED_MC
-+	int (*cache_idle)(unsigned long cpu);
-+	/* See if all cache siblings are idle */
-+	cpumask_t cache_siblings;
-+#endif
-+	u64 last_niffy; /* Last time this RQ updated grq.niffies */
-+#endif
-+#ifdef CONFIG_IRQ_TIME_ACCOUNTING
-+	u64 prev_irq_time;
-+#endif
-+	u64 clock, old_clock, last_tick;
-+	u64 clock_task;
-+	int dither;
-+
-+#ifdef CONFIG_SCHEDSTATS
-+
-+	/* latency stats */
-+	struct sched_info rq_sched_info;
-+	unsigned long long rq_cpu_time;
-+	/* could above be rq->cfs_rq.exec_clock + rq->rt_rq.rt_runtime ? */
-+
-+	/* sys_sched_yield() stats */
-+	unsigned int yld_count;
-+
-+	/* schedule() stats */
-+	unsigned int sched_switch;
-+	unsigned int sched_count;
-+	unsigned int sched_goidle;
-+
-+	/* try_to_wake_up() stats */
-+	unsigned int ttwu_count;
-+	unsigned int ttwu_local;
-+
-+	/* BKL stats */
-+	unsigned int bkl_count;
-+#endif
-+};
-+
-+static DEFINE_PER_CPU(struct rq, runqueues) ____cacheline_aligned_in_smp;
-+static DEFINE_MUTEX(sched_hotcpu_mutex);
-+
-+#ifdef CONFIG_SMP
-+/*
-+ * sched_domains_mutex serializes calls to arch_init_sched_domains,
-+ * detach_destroy_domains and partition_sched_domains.
-+ */
-+static DEFINE_MUTEX(sched_domains_mutex);
-+
-+/*
-+ * By default the system creates a single root-domain with all cpus as
-+ * members (mimicking the global state we have today).
-+ */
-+static struct root_domain def_root_domain;
-+
-+int __weak arch_sd_sibling_asym_packing(void)
-+{
-+       return 0*SD_ASYM_PACKING;
-+}
-+#endif
-+
-+/*
-+ * We add the notion of a root-domain which will be used to define per-domain
-+ * variables. Each exclusive cpuset essentially defines an island domain by
-+ * fully partitioning the member cpus from any other cpuset. Whenever a new
-+ * exclusive cpuset is created, we also create and attach a new root-domain
-+ * object.
-+ *
-+ */
-+struct root_domain {
-+	atomic_t refcount;
-+	cpumask_var_t span;
-+	cpumask_var_t online;
-+
-+	/*
-+	 * The "RT overload" flag: it gets set if a CPU has more than
-+	 * one runnable RT task.
-+	 */
-+	cpumask_var_t rto_mask;
-+	atomic_t rto_count;
-+#ifdef CONFIG_SMP
-+	struct cpupri cpupri;
-+#endif
-+};
-+
-+#define rcu_dereference_check_sched_domain(p) \
-+	rcu_dereference_check((p), \
-+			      rcu_read_lock_sched_held() || \
-+			      lockdep_is_held(&sched_domains_mutex))
-+
-+/*
-+ * The domain tree (rq->sd) is protected by RCU's quiescent state transition.
-+ * See detach_destroy_domains: synchronize_sched for details.
-+ *
-+ * The domain tree of any CPU may only be accessed from within
-+ * preempt-disabled sections.
-+ */
-+#define for_each_domain(cpu, __sd) \
-+	for (__sd = rcu_dereference_check_sched_domain(cpu_rq(cpu)->sd); __sd; __sd = __sd->parent)
-+
-+static inline void update_rq_clock(struct rq *rq);
-+
-+/*
-+ * Sanity check should sched_clock return bogus values. We make sure it does
-+ * not appear to go backwards, and use jiffies to determine the maximum and
-+ * minimum it could possibly have increased, and round down to the nearest
-+ * jiffy when it falls outside this.
-+ */
-+static inline void niffy_diff(s64 *niff_diff, int jiff_diff)
-+{
-+	unsigned long min_diff, max_diff;
-+
-+	if (jiff_diff > 1)
-+		min_diff = JIFFIES_TO_NS(jiff_diff - 1);
-+	else
-+		min_diff = 1;
-+	/*  Round up to the nearest tick for maximum */
-+	max_diff = JIFFIES_TO_NS(jiff_diff + 1);
-+
-+	if (unlikely(*niff_diff < min_diff || *niff_diff > max_diff))
-+		*niff_diff = min_diff;
-+}
-+
-+#ifdef CONFIG_SMP
-+#define cpu_rq(cpu)		(&per_cpu(runqueues, (cpu)))
-+#define this_rq()		(&__get_cpu_var(runqueues))
-+#define task_rq(p)		cpu_rq(task_cpu(p))
-+#define cpu_curr(cpu)		(cpu_rq(cpu)->curr)
-+static inline int cpu_of(struct rq *rq)
-+{
-+	return rq->cpu;
-+}
-+
-+/*
-+ * Niffies are a globally increasing nanosecond counter. Whenever a runqueue
-+ * clock is updated with the grq.lock held, it is an opportunity to update the
-+ * niffies value. Any CPU can update it by adding how much its clock has
-+ * increased since it last updated niffies, minus any added niffies by other
-+ * CPUs.
-+ */
-+static inline void update_clocks(struct rq *rq)
-+{
-+	s64 ndiff;
-+	long jdiff;
-+
-+	update_rq_clock(rq);
-+	ndiff = rq->clock - rq->old_clock;
-+	/* old_clock is only updated when we are updating niffies */
-+	rq->old_clock = rq->clock;
-+	ndiff -= grq.niffies - rq->last_niffy;
-+	jdiff = jiffies - grq.last_jiffy;
-+	niffy_diff(&ndiff, jdiff);
-+	grq.last_jiffy += jdiff;
-+	grq.niffies += ndiff;
-+	rq->last_niffy = grq.niffies;
-+}
-+#else /* CONFIG_SMP */
-+static struct rq *uprq;
-+#define cpu_rq(cpu)	(uprq)
-+#define this_rq()	(uprq)
-+#define task_rq(p)	(uprq)
-+#define cpu_curr(cpu)	((uprq)->curr)
-+static inline int cpu_of(struct rq *rq)
-+{
-+	return 0;
-+}
-+
-+static inline void update_clocks(struct rq *rq)
-+{
-+	s64 ndiff;
-+	long jdiff;
-+
-+	update_rq_clock(rq);
-+	ndiff = rq->clock - rq->old_clock;
-+	rq->old_clock = rq->clock;
-+	jdiff = jiffies - grq.last_jiffy;
-+	niffy_diff(&ndiff, jdiff);
-+	grq.last_jiffy += jdiff;
-+	grq.niffies += ndiff;
-+}
-+#endif
-+#define raw_rq()	(&__raw_get_cpu_var(runqueues))
-+
-+#include "sched_stats.h"
-+
-+#ifndef prepare_arch_switch
-+# define prepare_arch_switch(next)	do { } while (0)
-+#endif
-+#ifndef finish_arch_switch
-+# define finish_arch_switch(prev)	do { } while (0)
-+#endif
-+
-+/*
-+ * All common locking functions performed on grq.lock. rq->clock is local to
-+ * the CPU accessing it so it can be modified just with interrupts disabled
-+ * when we're not updating niffies.
-+ * Looking up task_rq must be done under grq.lock to be safe.
-+ */
-+static void update_rq_clock_task(struct rq *rq, s64 delta);
-+
-+static inline void update_rq_clock(struct rq *rq)
-+{
-+	s64 delta = sched_clock_cpu(cpu_of(rq)) - rq->clock;
-+
-+	rq->clock += delta;
-+	update_rq_clock_task(rq, delta);
-+}
-+
-+static inline int task_running(struct task_struct *p)
-+{
-+	return p->oncpu;
-+}
-+
-+static inline void grq_lock(void)
-+	__acquires(grq.lock)
-+{
-+	raw_spin_lock(&grq.lock);
-+}
-+
-+static inline void grq_unlock(void)
-+	__releases(grq.lock)
-+{
-+	raw_spin_unlock(&grq.lock);
-+}
-+
-+static inline void grq_lock_irq(void)
-+	__acquires(grq.lock)
-+{
-+	raw_spin_lock_irq(&grq.lock);
-+}
-+
-+static inline void time_lock_grq(struct rq *rq)
-+	__acquires(grq.lock)
-+{
-+	grq_lock();
-+	update_clocks(rq);
-+}
-+
-+static inline void grq_unlock_irq(void)
-+	__releases(grq.lock)
-+{
-+	raw_spin_unlock_irq(&grq.lock);
-+}
-+
-+static inline void grq_lock_irqsave(unsigned long *flags)
-+	__acquires(grq.lock)
-+{
-+	raw_spin_lock_irqsave(&grq.lock, *flags);
-+}
-+
-+static inline void grq_unlock_irqrestore(unsigned long *flags)
-+	__releases(grq.lock)
-+{
-+	raw_spin_unlock_irqrestore(&grq.lock, *flags);
-+}
-+
-+static inline struct rq
-+*task_grq_lock(struct task_struct *p, unsigned long *flags)
-+	__acquires(grq.lock)
-+{
-+	grq_lock_irqsave(flags);
-+	return task_rq(p);
-+}
-+
-+static inline struct rq
-+*time_task_grq_lock(struct task_struct *p, unsigned long *flags)
-+	__acquires(grq.lock)
-+{
-+	struct rq *rq = task_grq_lock(p, flags);
-+	update_clocks(rq);
-+	return rq;
-+}
-+
-+static inline struct rq *task_grq_lock_irq(struct task_struct *p)
-+	__acquires(grq.lock)
-+{
-+	grq_lock_irq();
-+	return task_rq(p);
-+}
-+
-+static inline void time_task_grq_lock_irq(struct task_struct *p)
-+	__acquires(grq.lock)
-+{
-+	struct rq *rq = task_grq_lock_irq(p);
-+	update_clocks(rq);
-+}
-+
-+static inline void task_grq_unlock_irq(void)
-+	__releases(grq.lock)
-+{
-+	grq_unlock_irq();
-+}
-+
-+static inline void task_grq_unlock(unsigned long *flags)
-+	__releases(grq.lock)
-+{
-+	grq_unlock_irqrestore(flags);
-+}
-+
-+/**
-+ * grunqueue_is_locked
-+ *
-+ * Returns true if the global runqueue is locked.
-+ * This interface allows printk to be called with the runqueue lock
-+ * held and know whether or not it is OK to wake up the klogd.
-+ */
-+inline int grunqueue_is_locked(void)
-+{
-+	return raw_spin_is_locked(&grq.lock);
-+}
-+
-+inline void grq_unlock_wait(void)
-+	__releases(grq.lock)
-+{
-+	smp_mb(); /* spin-unlock-wait is not a full memory barrier */
-+	raw_spin_unlock_wait(&grq.lock);
-+}
-+
-+static inline void time_grq_lock(struct rq *rq, unsigned long *flags)
-+	__acquires(grq.lock)
-+{
-+	local_irq_save(*flags);
-+	time_lock_grq(rq);
-+}
-+
-+static inline struct rq *__task_grq_lock(struct task_struct *p)
-+	__acquires(grq.lock)
-+{
-+	grq_lock();
-+	return task_rq(p);
-+}
-+
-+static inline void __task_grq_unlock(void)
-+	__releases(grq.lock)
-+{
-+	grq_unlock();
-+}
-+
-+/*
-+ * Look for any tasks *anywhere* that are running nice 0 or better. We do
-+ * this lockless for overhead reasons since the occasional wrong result
-+ * is harmless.
-+ */
-+int above_background_load(void)
-+{
-+	struct task_struct *cpu_curr;
-+	unsigned long cpu;
-+
-+	for_each_online_cpu(cpu) {
-+		cpu_curr = cpu_rq(cpu)->curr;
-+		if (unlikely(!cpu_curr))
-+			continue;
-+		if (PRIO_TO_NICE(cpu_curr->static_prio) < 1)
-+			return 1;
-+	}
-+	return 0;
-+}
-+
-+#ifndef __ARCH_WANT_UNLOCKED_CTXSW
-+static inline void prepare_lock_switch(struct rq *rq, struct task_struct *next)
-+{
-+}
-+
-+static inline void finish_lock_switch(struct rq *rq, struct task_struct *prev)
-+{
-+#ifdef CONFIG_DEBUG_SPINLOCK
-+	/* this is a valid case when another task releases the spinlock */
-+	grq.lock.owner = current;
-+#endif
-+	/*
-+	 * If we are tracking spinlock dependencies then we have to
-+	 * fix up the runqueue lock - which gets 'carried over' from
-+	 * prev into current:
-+	 */
-+	spin_acquire(&grq.lock.dep_map, 0, 0, _THIS_IP_);
-+
-+	grq_unlock_irq();
-+}
-+
-+#else /* __ARCH_WANT_UNLOCKED_CTXSW */
-+
-+static inline void prepare_lock_switch(struct rq *rq, struct task_struct *next)
-+{
-+#ifdef __ARCH_WANT_INTERRUPTS_ON_CTXSW
-+	grq_unlock_irq();
-+#else
-+	grq_unlock();
-+#endif
-+}
-+
-+static inline void finish_lock_switch(struct rq *rq, struct task_struct *prev)
-+{
-+	smp_wmb();
-+#ifndef __ARCH_WANT_INTERRUPTS_ON_CTXSW
-+	local_irq_enable();
-+#endif
-+}
-+#endif /* __ARCH_WANT_UNLOCKED_CTXSW */
-+
-+static inline int deadline_before(u64 deadline, u64 time)
-+{
-+	return (deadline < time);
-+}
-+
-+static inline int deadline_after(u64 deadline, u64 time)
-+{
-+	return (deadline > time);
-+}
-+
-+/*
-+ * A task that is queued but not running will be on the grq run list.
-+ * A task that is not running or queued will not be on the grq run list.
-+ * A task that is currently running will have ->oncpu set but not on the
-+ * grq run list.
-+ */
-+static inline int task_queued(struct task_struct *p)
-+{
-+	return (!list_empty(&p->run_list));
-+}
-+
-+/*
-+ * Removing from the global runqueue. Enter with grq locked.
-+ */
-+static void dequeue_task(struct task_struct *p)
-+{
-+	list_del_init(&p->run_list);
-+	if (list_empty(grq.queue + p->prio))
-+		__clear_bit(p->prio, grq.prio_bitmap);
-+}
-+
-+/*
-+ * To determine if it's safe for a task of SCHED_IDLEPRIO to actually run as
-+ * an idle task, we ensure none of the following conditions are met.
-+ */
-+static int idleprio_suitable(struct task_struct *p)
-+{
-+	return (!freezing(p) && !signal_pending(p) &&
-+		!(task_contributes_to_load(p)) && !(p->flags & (PF_EXITING)));
-+}
-+
-+/*
-+ * To determine if a task of SCHED_ISO can run in pseudo-realtime, we check
-+ * that the iso_refractory flag is not set.
-+ */
-+static int isoprio_suitable(void)
-+{
-+	return !grq.iso_refractory;
-+}
-+
-+/*
-+ * Adding to the global runqueue. Enter with grq locked.
-+ */
-+static void enqueue_task(struct task_struct *p)
-+{
-+	if (!rt_task(p)) {
-+		/* Check it hasn't gotten rt from PI */
-+		if ((idleprio_task(p) && idleprio_suitable(p)) ||
-+		   (iso_task(p) && isoprio_suitable()))
-+			p->prio = p->normal_prio;
-+		else
-+			p->prio = NORMAL_PRIO;
-+	}
-+	__set_bit(p->prio, grq.prio_bitmap);
-+	list_add_tail(&p->run_list, grq.queue + p->prio);
-+	sched_info_queued(p);
-+}
-+
-+/* Only idle task does this as a real time task*/
-+static inline void enqueue_task_head(struct task_struct *p)
-+{
-+	__set_bit(p->prio, grq.prio_bitmap);
-+	list_add(&p->run_list, grq.queue + p->prio);
-+	sched_info_queued(p);
-+}
-+
-+static inline void requeue_task(struct task_struct *p)
-+{
-+	sched_info_queued(p);
-+}
-+
-+/*
-+ * Returns the relative length of deadline all compared to the shortest
-+ * deadline which is that of nice -20.
-+ */
-+static inline int task_prio_ratio(struct task_struct *p)
-+{
-+	return prio_ratios[TASK_USER_PRIO(p)];
-+}
-+
-+/*
-+ * task_timeslice - all tasks of all priorities get the exact same timeslice
-+ * length. CPU distribution is handled by giving different deadlines to
-+ * tasks of different priorities. Use 128 as the base value for fast shifts.
-+ */
-+static inline int task_timeslice(struct task_struct *p)
-+{
-+	return (rr_interval * task_prio_ratio(p) / 128);
-+}
-+
-+#ifdef CONFIG_SMP
-+/*
-+ * qnr is the "queued but not running" count which is the total number of
-+ * tasks on the global runqueue list waiting for cpu time but not actually
-+ * currently running on a cpu.
-+ */
-+static inline void inc_qnr(void)
-+{
-+	grq.qnr++;
-+}
-+
-+static inline void dec_qnr(void)
-+{
-+	grq.qnr--;
-+}
-+
-+static inline int queued_notrunning(void)
-+{
-+	return grq.qnr;
-+}
-+
-+/*
-+ * The cpu_idle_map stores a bitmap of all the CPUs currently idle to
-+ * allow easy lookup of whether any suitable idle CPUs are available.
-+ * It's cheaper to maintain a binary yes/no if there are any idle CPUs on the
-+ * idle_cpus variable than to do a full bitmask check when we are busy.
-+ */
-+static inline void set_cpuidle_map(unsigned long cpu)
-+{
-+	if (likely(cpu_online(cpu))) {
-+		cpu_set(cpu, grq.cpu_idle_map);
-+		grq.idle_cpus = 1;
-+	}
-+}
-+
-+static inline void clear_cpuidle_map(unsigned long cpu)
-+{
-+	cpu_clear(cpu, grq.cpu_idle_map);
-+	if (cpus_empty(grq.cpu_idle_map))
-+		grq.idle_cpus = 0;
-+}
-+
-+static int suitable_idle_cpus(struct task_struct *p)
-+{
-+	if (!grq.idle_cpus)
-+		return 0;
-+	return (cpus_intersects(p->cpus_allowed, grq.cpu_idle_map));
-+}
-+
-+static void resched_task(struct task_struct *p);
-+
-+#define CPUIDLE_DIFF_THREAD	(1)
-+#define CPUIDLE_DIFF_CORE	(2)
-+#define CPUIDLE_CACHE_BUSY	(4)
-+#define CPUIDLE_DIFF_CPU	(8)
-+#define CPUIDLE_THREAD_BUSY	(16)
-+#define CPUIDLE_DIFF_NODE	(32)
-+
-+/*
-+ * The best idle CPU is chosen according to the CPUIDLE ranking above where the
-+ * lowest value would give the most suitable CPU to schedule p onto next. We
-+ * iterate from the last CPU upwards instead of using for_each_cpu_mask so as
-+ * to be able to break out immediately if the last CPU is idle. The order works
-+ * out to be the following:
-+ *
-+ * Same core, idle or busy cache, idle threads
-+ * Other core, same cache, idle or busy cache, idle threads.
-+ * Same node, other CPU, idle cache, idle threads.
-+ * Same node, other CPU, busy cache, idle threads.
-+ * Same core, busy threads.
-+ * Other core, same cache, busy threads.
-+ * Same node, other CPU, busy threads.
-+ * Other node, other CPU, idle cache, idle threads.
-+ * Other node, other CPU, busy cache, idle threads.
-+ * Other node, other CPU, busy threads.
-+ *
-+ * If p was the last task running on this rq, then regardless of where
-+ * it has been running since then, it is cache warm on this rq.
-+ */
-+static void resched_best_idle(struct task_struct *p)
-+{
-+	unsigned long cpu_tmp, best_cpu, best_ranking;
-+	cpumask_t tmpmask;
-+	struct rq *rq;
-+	int iterate;
-+
-+	cpus_and(tmpmask, p->cpus_allowed, grq.cpu_idle_map);
-+	iterate = cpus_weight(tmpmask);
-+	best_cpu = task_cpu(p);
-+	/*
-+	 * Start below the last CPU and work up with next_cpu as the last
-+	 * CPU might not be idle or affinity might not allow it.
-+	 */
-+	cpu_tmp = best_cpu - 1;
-+	rq = cpu_rq(best_cpu);
-+	best_ranking = ~0UL;
-+
-+	do {
-+		unsigned long ranking;
-+		struct rq *tmp_rq;
-+
-+		ranking = 0;
-+		cpu_tmp = next_cpu(cpu_tmp, tmpmask);
-+		if (cpu_tmp >= nr_cpu_ids) {
-+			cpu_tmp = -1;
-+			cpu_tmp = next_cpu(cpu_tmp, tmpmask);
-+		}
-+		tmp_rq = cpu_rq(cpu_tmp);
-+
-+#ifdef CONFIG_NUMA
-+		if (rq->cpu_locality[cpu_tmp] > 3)
-+			ranking |= CPUIDLE_DIFF_NODE;
-+		else
-+#endif
-+		if (rq->cpu_locality[cpu_tmp] > 2)
-+			ranking |= CPUIDLE_DIFF_CPU;
-+#ifdef CONFIG_SCHED_MC
-+		if (rq->cpu_locality[cpu_tmp] == 2)
-+			ranking |= CPUIDLE_DIFF_CORE;
-+		if (!(tmp_rq->cache_idle(cpu_tmp)))
-+			ranking |= CPUIDLE_CACHE_BUSY;
-+#endif
-+#ifdef CONFIG_SCHED_SMT
-+		if (rq->cpu_locality[cpu_tmp] == 1)
-+			ranking |= CPUIDLE_DIFF_THREAD;
-+		if (!(tmp_rq->siblings_idle(cpu_tmp)))
-+			ranking |= CPUIDLE_THREAD_BUSY;
-+#endif
-+		if (ranking < best_ranking) {
-+			best_cpu = cpu_tmp;
-+			if (ranking == 0)
-+				break;
-+			best_ranking = ranking;
-+		}
-+	} while (--iterate > 0);
-+
-+	resched_task(cpu_rq(best_cpu)->curr);
-+}
-+
-+static inline void resched_suitable_idle(struct task_struct *p)
-+{
-+	if (suitable_idle_cpus(p))
-+		resched_best_idle(p);
-+}
-+
-+/*
-+ * The cpu cache locality difference between CPUs is used to determine how far
-+ * to offset the virtual deadline. <2 difference in locality means that one
-+ * timeslice difference is allowed longer for the cpu local tasks. This is
-+ * enough in the common case when tasks are up to 2* number of CPUs to keep
-+ * tasks within their shared cache CPUs only. CPUs on different nodes or not
-+ * even in this domain (NUMA) have "4" difference, allowing 4 times longer
-+ * deadlines before being taken onto another cpu, allowing for 2* the double
-+ * seen by separate CPUs above.
-+ * Simple summary: Virtual deadlines are equal on shared cache CPUs, double
-+ * on separate CPUs and quadruple in separate NUMA nodes.
-+ */
-+static inline int
-+cache_distance(struct rq *task_rq, struct rq *rq, struct task_struct *p)
-+{
-+	int locality = rq->cpu_locality[cpu_of(task_rq)] - 2;
-+
-+	if (locality > 0)
-+		return task_timeslice(p) << locality;
-+	return 0;
-+}
-+#else /* CONFIG_SMP */
-+static inline void inc_qnr(void)
-+{
-+}
-+
-+static inline void dec_qnr(void)
-+{
-+}
-+
-+static inline int queued_notrunning(void)
-+{
-+	return grq.nr_running;
-+}
-+
-+static inline void set_cpuidle_map(unsigned long cpu)
-+{
-+}
-+
-+static inline void clear_cpuidle_map(unsigned long cpu)
-+{
-+}
-+
-+static inline int suitable_idle_cpus(struct task_struct *p)
-+{
-+	return uprq->curr == uprq->idle;
-+}
-+
-+static inline void resched_suitable_idle(struct task_struct *p)
-+{
-+}
-+
-+static inline int
-+cache_distance(struct rq *task_rq, struct rq *rq, struct task_struct *p)
-+{
-+	return 0;
-+}
-+#endif /* CONFIG_SMP */
-+
-+/*
-+ * activate_idle_task - move idle task to the _front_ of runqueue.
-+ */
-+static inline void activate_idle_task(struct task_struct *p)
-+{
-+	enqueue_task_head(p);
-+	grq.nr_running++;
-+	inc_qnr();
-+}
-+
-+static inline int normal_prio(struct task_struct *p)
-+{
-+	if (has_rt_policy(p))
-+		return MAX_RT_PRIO - 1 - p->rt_priority;
-+	if (idleprio_task(p))
-+		return IDLE_PRIO;
-+	if (iso_task(p))
-+		return ISO_PRIO;
-+	return NORMAL_PRIO;
-+}
-+
-+/*
-+ * Calculate the current priority, i.e. the priority
-+ * taken into account by the scheduler. This value might
-+ * be boosted by RT tasks as it will be RT if the task got
-+ * RT-boosted. If not then it returns p->normal_prio.
-+ */
-+static int effective_prio(struct task_struct *p)
-+{
-+	p->normal_prio = normal_prio(p);
-+	/*
-+	 * If we are RT tasks or we were boosted to RT priority,
-+	 * keep the priority unchanged. Otherwise, update priority
-+	 * to the normal priority:
-+	 */
-+	if (!rt_prio(p->prio))
-+		return p->normal_prio;
-+	return p->prio;
-+}
-+
-+/*
-+ * activate_task - move a task to the runqueue. Enter with grq locked.
-+ */
-+static void activate_task(struct task_struct *p, struct rq *rq)
-+{
-+	update_clocks(rq);
-+
-+	/*
-+	 * Sleep time is in units of nanosecs, so shift by 20 to get a
-+	 * milliseconds-range estimation of the amount of time that the task
-+	 * spent sleeping:
-+	 */
-+	if (unlikely(prof_on == SLEEP_PROFILING)) {
-+		if (p->state == TASK_UNINTERRUPTIBLE)
-+			profile_hits(SLEEP_PROFILING, (void *)get_wchan(p),
-+				     (rq->clock - p->last_ran) >> 20);
-+	}
-+
-+	p->prio = effective_prio(p);
-+	if (task_contributes_to_load(p))
-+		grq.nr_uninterruptible--;
-+	enqueue_task(p);
-+	grq.nr_running++;
-+	inc_qnr();
-+}
-+
-+/*
-+ * deactivate_task - If it's running, it's not on the grq and we can just
-+ * decrement the nr_running. Enter with grq locked.
-+ */
-+static inline void deactivate_task(struct task_struct *p)
-+{
-+	if (task_contributes_to_load(p))
-+		grq.nr_uninterruptible++;
-+	grq.nr_running--;
-+}
-+
-+#ifdef CONFIG_SMP
-+void set_task_cpu(struct task_struct *p, unsigned int cpu)
-+{
-+	trace_sched_migrate_task(p, cpu);
-+	if (task_cpu(p) != cpu)
-+		perf_sw_event(PERF_COUNT_SW_CPU_MIGRATIONS, 1, 1, NULL, 0);
-+
-+	/*
-+	 * After ->cpu is set up to a new value, task_grq_lock(p, ...) can be
-+	 * successfuly executed on another CPU. We must ensure that updates of
-+	 * per-task data have been completed by this moment.
-+	 */
-+	smp_wmb();
-+	task_thread_info(p)->cpu = cpu;
-+}
-+#endif
-+
-+/*
-+ * Move a task off the global queue and take it to a cpu for it will
-+ * become the running task.
-+ */
-+static inline void take_task(struct rq *rq, struct task_struct *p)
-+{
-+	set_task_cpu(p, cpu_of(rq));
-+	dequeue_task(p);
-+	dec_qnr();
-+}
-+
-+/*
-+ * Returns a descheduling task to the grq runqueue unless it is being
-+ * deactivated.
-+ */
-+static inline void return_task(struct task_struct *p, int deactivate)
-+{
-+	if (deactivate)
-+		deactivate_task(p);
-+	else {
-+		inc_qnr();
-+		enqueue_task(p);
-+	}
-+}
-+
-+/*
-+ * resched_task - mark a task 'to be rescheduled now'.
-+ *
-+ * On UP this means the setting of the need_resched flag, on SMP it
-+ * might also involve a cross-CPU call to trigger the scheduler on
-+ * the target CPU.
-+ */
-+#ifdef CONFIG_SMP
-+
-+#ifndef tsk_is_polling
-+#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
-+#endif
-+
-+static void resched_task(struct task_struct *p)
-+{
-+	int cpu;
-+
-+	assert_raw_spin_locked(&grq.lock);
-+
-+	if (unlikely(test_tsk_thread_flag(p, TIF_NEED_RESCHED)))
-+		return;
-+
-+	set_tsk_thread_flag(p, TIF_NEED_RESCHED);
-+
-+	cpu = task_cpu(p);
-+	if (cpu == smp_processor_id())
-+		return;
-+
-+	/* NEED_RESCHED must be visible before we test polling */
-+	smp_mb();
-+	if (!tsk_is_polling(p))
-+		smp_send_reschedule(cpu);
-+}
-+
-+#else
-+static inline void resched_task(struct task_struct *p)
-+{
-+	assert_raw_spin_locked(&grq.lock);
-+	set_tsk_need_resched(p);
-+}
-+#endif
-+
-+/**
-+ * task_curr - is this task currently executing on a CPU?
-+ * @p: the task in question.
-+ */
-+inline int task_curr(const struct task_struct *p)
-+{
-+	return cpu_curr(task_cpu(p)) == p;
-+}
-+
-+#ifdef CONFIG_SMP
-+struct migration_req {
-+	struct task_struct *task;
-+	int dest_cpu;
-+};
-+
-+/*
-+ * wait_task_inactive - wait for a thread to unschedule.
-+ *
-+ * If @match_state is nonzero, it's the @p->state value just checked and
-+ * not expected to change.  If it changes, i.e. @p might have woken up,
-+ * then return zero.  When we succeed in waiting for @p to be off its CPU,
-+ * we return a positive number (its total switch count).  If a second call
-+ * a short while later returns the same number, the caller can be sure that
-+ * @p has remained unscheduled the whole time.
-+ *
-+ * The caller must ensure that the task *will* unschedule sometime soon,
-+ * else this function might spin for a *long* time. This function can't
-+ * be called with interrupts off, or it may introduce deadlock with
-+ * smp_call_function() if an IPI is sent by the same process we are
-+ * waiting to become inactive.
-+ */
-+unsigned long wait_task_inactive(struct task_struct *p, long match_state)
-+{
-+	unsigned long flags;
-+	int running, on_rq;
-+	unsigned long ncsw;
-+	struct rq *rq;
-+
-+	for (;;) {
-+		/*
-+		 * We do the initial early heuristics without holding
-+		 * any task-queue locks at all. We'll only try to get
-+		 * the runqueue lock when things look like they will
-+		 * work out! In the unlikely event rq is dereferenced
-+		 * since we're lockless, grab it again.
-+		 */
-+#ifdef CONFIG_SMP
-+retry_rq:
-+		rq = task_rq(p);
-+		if (unlikely(!rq))
-+			goto retry_rq;
-+#else /* CONFIG_SMP */
-+		rq = task_rq(p);
-+#endif
-+		/*
-+		 * If the task is actively running on another CPU
-+		 * still, just relax and busy-wait without holding
-+		 * any locks.
-+		 *
-+		 * NOTE! Since we don't hold any locks, it's not
-+		 * even sure that "rq" stays as the right runqueue!
-+		 * But we don't care, since this will return false
-+		 * if the runqueue has changed and p is actually now
-+		 * running somewhere else!
-+		 */
-+		while (task_running(p) && p == rq->curr) {
-+			if (match_state && unlikely(p->state != match_state))
-+				return 0;
-+			cpu_relax();
-+		}
-+
-+		/*
-+		 * Ok, time to look more closely! We need the grq
-+		 * lock now, to be *sure*. If we're wrong, we'll
-+		 * just go back and repeat.
-+		 */
-+		rq = task_grq_lock(p, &flags);
-+		trace_sched_wait_task(p);
-+		running = task_running(p);
-+		on_rq = task_queued(p);
-+		ncsw = 0;
-+		if (!match_state || p->state == match_state)
-+			ncsw = p->nvcsw | LONG_MIN; /* sets MSB */
-+		task_grq_unlock(&flags);
-+
-+		/*
-+		 * If it changed from the expected state, bail out now.
-+		 */
-+		if (unlikely(!ncsw))
-+			break;
-+
-+		/*
-+		 * Was it really running after all now that we
-+		 * checked with the proper locks actually held?
-+		 *
-+		 * Oops. Go back and try again..
-+		 */
-+		if (unlikely(running)) {
-+			cpu_relax();
-+			continue;
-+		}
-+
-+		/*
-+		 * It's not enough that it's not actively running,
-+		 * it must be off the runqueue _entirely_, and not
-+		 * preempted!
-+		 *
-+		 * So if it was still runnable (but just not actively
-+		 * running right now), it's preempted, and we should
-+		 * yield - it could be a while.
-+		 */
-+		if (unlikely(on_rq)) {
-+			schedule_timeout_uninterruptible(1);
-+			continue;
-+		}
-+
-+		/*
-+		 * Ahh, all good. It wasn't running, and it wasn't
-+		 * runnable, which means that it will never become
-+		 * running in the future either. We're all done!
-+		 */
-+		break;
-+	}
-+
-+	return ncsw;
-+}
-+
-+/***
-+ * kick_process - kick a running thread to enter/exit the kernel
-+ * @p: the to-be-kicked thread
-+ *
-+ * Cause a process which is running on another CPU to enter
-+ * kernel-mode, without any delay. (to get signals handled.)
-+ *
-+ * NOTE: this function doesnt have to take the runqueue lock,
-+ * because all it wants to ensure is that the remote task enters
-+ * the kernel. If the IPI races and the task has been migrated
-+ * to another CPU then no harm is done and the purpose has been
-+ * achieved as well.
-+ */
-+void kick_process(struct task_struct *p)
-+{
-+	int cpu;
-+
-+	preempt_disable();
-+	cpu = task_cpu(p);
-+	if ((cpu != smp_processor_id()) && task_curr(p))
-+		smp_send_reschedule(cpu);
-+	preempt_enable();
-+}
-+EXPORT_SYMBOL_GPL(kick_process);
-+#endif
-+
-+#define rq_idle(rq)	((rq)->rq_prio == PRIO_LIMIT)
-+
-+/*
-+ * RT tasks preempt purely on priority. SCHED_NORMAL tasks preempt on the
-+ * basis of earlier deadlines. SCHED_IDLEPRIO don't preempt anything else or
-+ * between themselves, they cooperatively multitask. An idle rq scores as
-+ * prio PRIO_LIMIT so it is always preempted.
-+ */
-+static inline int
-+can_preempt(struct task_struct *p, int prio, u64 deadline,
-+	    unsigned int policy)
-+{
-+	/* Better static priority RT task or better policy preemption */
-+	if (p->prio < prio)
-+		return 1;
-+	if (p->prio > prio)
-+		return 0;
-+	/* SCHED_NORMAL, BATCH and ISO will preempt based on deadline */
-+	if (!deadline_before(p->deadline, deadline))
-+		return 0;
-+	return 1;
-+}
-+#ifdef CONFIG_SMP
-+#ifdef CONFIG_HOTPLUG_CPU
-+/*
-+ * Check to see if there is a task that is affined only to offline CPUs but
-+ * still wants runtime. This happens to kernel threads during suspend/halt and
-+ * disabling of CPUs.
-+ */
-+static inline int online_cpus(struct task_struct *p)
-+{
-+	return (likely(cpus_intersects(cpu_online_map, p->cpus_allowed)));
-+}
-+#else /* CONFIG_HOTPLUG_CPU */
-+/* All available CPUs are always online without hotplug. */
-+static inline int online_cpus(struct task_struct *p)
-+{
-+	return 1;
-+}
-+#endif
-+
-+/*
-+ * Check to see if p can run on cpu, and if not, whether there are any online
-+ * CPUs it can run on instead.
-+ */
-+static inline int needs_other_cpu(struct task_struct *p, int cpu)
-+{
-+	if (unlikely(!cpu_isset(cpu, p->cpus_allowed)))
-+		return 1;
-+	return 0;
-+}
-+
-+/*
-+ * latest_deadline and highest_prio_rq are initialised only to silence the
-+ * compiler. When all else is equal, still prefer this_rq.
-+ */
-+static void try_preempt(struct task_struct *p, struct rq *this_rq)
-+{
-+	struct rq *highest_prio_rq = this_rq;
-+	u64 latest_deadline;
-+	unsigned long cpu;
-+	int highest_prio;
-+	cpumask_t tmp;
-+
-+	if (suitable_idle_cpus(p)) {
-+		resched_best_idle(p);
-+		return;
-+	}
-+
-+	/* IDLEPRIO tasks never preempt anything */
-+	if (p->policy == SCHED_IDLEPRIO)
-+		return;
-+
-+	if (likely(online_cpus(p)))
-+		cpus_and(tmp, cpu_online_map, p->cpus_allowed);
-+	else
-+		return;
-+
-+	latest_deadline = 0;
-+	highest_prio = -1;
-+
-+	for_each_cpu_mask(cpu, tmp) {
-+		u64 offset_deadline;
-+		struct rq *rq;
-+		int rq_prio;
-+
-+		rq = cpu_rq(cpu);
-+		rq_prio = rq->rq_prio;
-+		if (rq_prio < highest_prio)
-+			continue;
-+
-+		offset_deadline = rq->rq_deadline -
-+				  cache_distance(this_rq, rq, p);
-+
-+		if (rq_prio > highest_prio || (rq_prio == highest_prio &&
-+		    deadline_after(offset_deadline, latest_deadline))) {
-+			latest_deadline = offset_deadline;
-+			highest_prio = rq_prio;
-+			highest_prio_rq = rq;
-+		}
-+	}
-+
-+	if (!can_preempt(p, highest_prio, highest_prio_rq->rq_deadline,
-+	    highest_prio_rq->rq_policy))
-+		return;
-+
-+	resched_task(highest_prio_rq->curr);
-+}
-+#else /* CONFIG_SMP */
-+static inline int needs_other_cpu(struct task_struct *p, int cpu)
-+{
-+	return 0;
-+}
-+
-+static void try_preempt(struct task_struct *p, struct rq *this_rq)
-+{
-+	if (p->policy == SCHED_IDLEPRIO)
-+		return;
-+	if (can_preempt(p, uprq->rq_prio, uprq->rq_deadline,
-+	    uprq->rq_policy))
-+		resched_task(uprq->curr);
-+}
-+#endif /* CONFIG_SMP */
-+
-+/**
-+ * task_oncpu_function_call - call a function on the cpu on which a task runs
-+ * @p:		the task to evaluate
-+ * @func:	the function to be called
-+ * @info:	the function call argument
-+ *
-+ * Calls the function @func when the task is currently running. This might
-+ * be on the current CPU, which just calls the function directly
-+ */
-+void task_oncpu_function_call(struct task_struct *p,
-+			      void (*func) (void *info), void *info)
-+{
-+	int cpu;
-+
-+	preempt_disable();
-+	cpu = task_cpu(p);
-+	if (task_curr(p))
-+		smp_call_function_single(cpu, func, info, 1);
-+	preempt_enable();
-+}
-+
-+static inline void ttwu_activate(struct task_struct *p, struct rq *rq,
-+				 bool is_sync)
-+{
-+	activate_task(p, rq);
-+
-+	/*
-+	 * Sync wakeups (i.e. those types of wakeups where the waker
-+	 * has indicated that it will leave the CPU in short order)
-+	 * don't trigger a preemption if there are no idle cpus,
-+	 * instead waiting for current to deschedule.
-+	 */
-+	if (!is_sync || suitable_idle_cpus(p))
-+		try_preempt(p, rq);
-+}
-+
-+static inline void ttwu_post_activation(struct task_struct *p, struct rq *rq,
-+					bool success)
-+{
-+	trace_sched_wakeup(p, success);
-+	p->state = TASK_RUNNING;
-+
-+	/*
-+	 * if a worker is waking up, notify workqueue. Note that on BFS, we
-+	 * don't really know what cpu it will be, so we fake it for
-+	 * wq_worker_waking_up :/
-+	 */
-+	if ((p->flags & PF_WQ_WORKER) && success)
-+		wq_worker_waking_up(p, cpu_of(rq));
-+}
-+
-+/***
-+ * try_to_wake_up - wake up a thread
-+ * @p: the thread to be awakened
-+ * @state: the mask of task states that can be woken
-+ * @wake_flags: wake modifier flags (WF_*)
-+ *
-+ * Put it on the run-queue if it's not already there. The "current"
-+ * thread is always on the run-queue (except when the actual
-+ * re-schedule is in progress), and as such you're allowed to do
-+ * the simpler "current->state = TASK_RUNNING" to mark yourself
-+ * runnable without the overhead of this.
-+ *
-+ * Returns %true if @p was woken up, %false if it was already running
-+ * or @state didn't match @p's state.
-+ */
-+static int try_to_wake_up(struct task_struct *p, unsigned int state,
-+			  int wake_flags)
-+{
-+	unsigned long flags;
-+	int success = 0;
-+	struct rq *rq;
-+
-+	get_cpu();
-+
-+	/* This barrier is undocumented, probably for p->state? くそ */
-+	smp_wmb();
-+
-+	/*
-+	 * No need to do time_lock_grq as we only need to update the rq clock
-+	 * if we activate the task
-+	 */
-+	rq = task_grq_lock(p, &flags);
-+
-+	/* state is a volatile long, どうして、分からない */
-+	if (!((unsigned int)p->state & state))
-+		goto out_unlock;
-+
-+	if (task_queued(p) || task_running(p))
-+		goto out_running;
-+
-+	ttwu_activate(p, rq, wake_flags & WF_SYNC);
-+	success = true;
-+
-+out_running:
-+	ttwu_post_activation(p, rq, success);
-+out_unlock:
-+	task_grq_unlock(&flags);
-+	put_cpu();
-+
-+	return success;
-+}
-+
-+/**
-+ * try_to_wake_up_local - try to wake up a local task with grq lock held
-+ * @p: the thread to be awakened
-+ *
-+ * Put @p on the run-queue if it's not already there.  The caller must
-+ * ensure that grq is locked and, @p is not the current task.
-+ * grq stays locked over invocation.
-+ */
-+static void try_to_wake_up_local(struct task_struct *p)
-+{
-+	struct rq *rq = task_rq(p);
-+	bool success = false;
-+
-+	WARN_ON(rq != this_rq());
-+	BUG_ON(p == current);
-+	lockdep_assert_held(&grq.lock);
-+
-+	if (!(p->state & TASK_NORMAL))
-+		return;
-+
-+	if (!task_queued(p)) {
-+		if (likely(!task_running(p))) {
-+			schedstat_inc(rq, ttwu_count);
-+			schedstat_inc(rq, ttwu_local);
-+		}
-+		ttwu_activate(p, rq, false);
-+		success = true;
-+	}
-+	ttwu_post_activation(p, rq, success);
-+}
-+
-+/**
-+ * wake_up_process - Wake up a specific process
-+ * @p: The process to be woken up.
-+ *
-+ * Attempt to wake up the nominated process and move it to the set of runnable
-+ * processes.  Returns 1 if the process was woken up, 0 if it was already
-+ * running.
-+ *
-+ * It may be assumed that this function implies a write memory barrier before
-+ * changing the task state if and only if any tasks are woken up.
-+ */
-+int wake_up_process(struct task_struct *p)
-+{
-+	return try_to_wake_up(p, TASK_ALL, 0);
-+}
-+EXPORT_SYMBOL(wake_up_process);
-+
-+int wake_up_state(struct task_struct *p, unsigned int state)
-+{
-+	return try_to_wake_up(p, state, 0);
-+}
-+
-+static void time_slice_expired(struct task_struct *p);
-+
-+/*
-+ * Perform scheduler related setup for a newly forked process p.
-+ * p is forked by current.
-+ */
-+void sched_fork(struct task_struct *p, int clone_flags)
-+{
-+	struct task_struct *curr;
-+	int cpu = get_cpu();
-+	struct rq *rq;
-+
-+#ifdef CONFIG_PREEMPT_NOTIFIERS
-+	INIT_HLIST_HEAD(&p->preempt_notifiers);
-+#endif
-+	/*
-+	 * We mark the process as running here. This guarantees that
-+	 * nobody will actually run it, and a signal or other external
-+	 * event cannot wake it up and insert it on the runqueue either.
-+	 */
-+	p->state = TASK_RUNNING;
-+	set_task_cpu(p, cpu);
-+
-+	/* Should be reset in fork.c but done here for ease of bfs patching */
-+	p->sched_time = p->stime_pc = p->utime_pc = 0;
-+
-+	/*
-+	 * Revert to default priority/policy on fork if requested.
-+	 */
-+	if (unlikely(p->sched_reset_on_fork)) {
-+		if (p->policy == SCHED_FIFO || p->policy == SCHED_RR) {
-+			p->policy = SCHED_NORMAL;
-+			p->normal_prio = normal_prio(p);
-+		}
-+
-+		if (PRIO_TO_NICE(p->static_prio) < 0) {
-+			p->static_prio = NICE_TO_PRIO(0);
-+			p->normal_prio = p->static_prio;
-+		}
-+
-+		/*
-+		 * We don't need the reset flag anymore after the fork. It has
-+		 * fulfilled its duty:
-+		 */
-+		p->sched_reset_on_fork = 0;
-+	}
-+
-+	curr = current;
-+	/*
-+	 * Make sure we do not leak PI boosting priority to the child.
-+	 */
-+	p->prio = curr->normal_prio;
-+
-+	INIT_LIST_HEAD(&p->run_list);
-+#if defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT)
-+	if (unlikely(sched_info_on()))
-+		memset(&p->sched_info, 0, sizeof(p->sched_info));
-+#endif
-+
-+	p->oncpu = 0;
-+
-+#ifdef CONFIG_PREEMPT
-+	/* Want to start with kernel preemption disabled. */
-+	task_thread_info(p)->preempt_count = 1;
-+#endif
-+	if (unlikely(p->policy == SCHED_FIFO))
-+		goto out;
-+	/*
-+	 * Share the timeslice between parent and child, thus the
-+	 * total amount of pending timeslices in the system doesn't change,
-+	 * resulting in more scheduling fairness. If it's negative, it won't
-+	 * matter since that's the same as being 0. current's time_slice is
-+	 * actually in rq_time_slice when it's running, as is its last_ran
-+	 * value. rq->rq_deadline is only modified within schedule() so it
-+	 * is always equal to current->deadline.
-+	 */
-+	rq = task_grq_lock_irq(curr);
-+	if (likely(rq->rq_time_slice >= RESCHED_US * 2)) {
-+		rq->rq_time_slice /= 2;
-+		p->time_slice = rq->rq_time_slice;
-+	} else {
-+		/*
-+		 * Forking task has run out of timeslice. Reschedule it and
-+		 * start its child with a new time slice and deadline. The
-+		 * child will end up running first because its deadline will
-+		 * be slightly earlier.
-+		 */
-+		rq->rq_time_slice = 0;
-+		set_tsk_need_resched(curr);
-+		time_slice_expired(p);
-+	}
-+	p->last_ran = rq->rq_last_ran;
-+	task_grq_unlock_irq();
-+out:
-+	put_cpu();
-+}
-+
-+/*
-+ * wake_up_new_task - wake up a newly created task for the first time.
-+ *
-+ * This function will do some initial scheduler statistics housekeeping
-+ * that must be done for every newly created context, then puts the task
-+ * on the runqueue and wakes it.
-+ */
-+void wake_up_new_task(struct task_struct *p, unsigned long clone_flags)
-+{
-+	struct task_struct *parent;
-+	unsigned long flags;
-+	struct rq *rq;
-+
-+	rq = task_grq_lock(p, &flags);
-+	p->state = TASK_RUNNING;
-+	parent = p->parent;
-+	/* Unnecessary but small chance that the parent changed CPU */
-+	set_task_cpu(p, task_cpu(parent));
-+	activate_task(p, rq);
-+	trace_sched_wakeup_new(p, 1);
-+	if (!(clone_flags & CLONE_VM) && rq->curr == parent &&
-+	    !suitable_idle_cpus(p)) {
-+		/*
-+		 * The VM isn't cloned, so we're in a good position to
-+		 * do child-runs-first in anticipation of an exec. This
-+		 * usually avoids a lot of COW overhead.
-+		 */
-+		resched_task(parent);
-+	} else
-+		try_preempt(p, rq);
-+	task_grq_unlock(&flags);
-+}
-+
-+#ifdef CONFIG_PREEMPT_NOTIFIERS
-+
-+/**
-+ * preempt_notifier_register - tell me when current is being preempted & rescheduled
-+ * @notifier: notifier struct to register
-+ */
-+void preempt_notifier_register(struct preempt_notifier *notifier)
-+{
-+	hlist_add_head(&notifier->link, &current->preempt_notifiers);
-+}
-+EXPORT_SYMBOL_GPL(preempt_notifier_register);
-+
-+/**
-+ * preempt_notifier_unregister - no longer interested in preemption notifications
-+ * @notifier: notifier struct to unregister
-+ *
-+ * This is safe to call from within a preemption notifier.
-+ */
-+void preempt_notifier_unregister(struct preempt_notifier *notifier)
-+{
-+	hlist_del(&notifier->link);
-+}
-+EXPORT_SYMBOL_GPL(preempt_notifier_unregister);
-+
-+static void fire_sched_in_preempt_notifiers(struct task_struct *curr)
-+{
-+	struct preempt_notifier *notifier;
-+	struct hlist_node *node;
-+
-+	hlist_for_each_entry(notifier, node, &curr->preempt_notifiers, link)
-+		notifier->ops->sched_in(notifier, raw_smp_processor_id());
-+}
-+
-+static void
-+fire_sched_out_preempt_notifiers(struct task_struct *curr,
-+				 struct task_struct *next)
-+{
-+	struct preempt_notifier *notifier;
-+	struct hlist_node *node;
-+
-+	hlist_for_each_entry(notifier, node, &curr->preempt_notifiers, link)
-+		notifier->ops->sched_out(notifier, next);
-+}
-+
-+#else /* !CONFIG_PREEMPT_NOTIFIERS */
-+
-+static void fire_sched_in_preempt_notifiers(struct task_struct *curr)
-+{
-+}
-+
-+static void
-+fire_sched_out_preempt_notifiers(struct task_struct *curr,
-+				 struct task_struct *next)
-+{
-+}
-+
-+#endif /* CONFIG_PREEMPT_NOTIFIERS */
-+
-+/**
-+ * prepare_task_switch - prepare to switch tasks
-+ * @rq: the runqueue preparing to switch
-+ * @next: the task we are going to switch to.
-+ *
-+ * This is called with the rq lock held and interrupts off. It must
-+ * be paired with a subsequent finish_task_switch after the context
-+ * switch.
-+ *
-+ * prepare_task_switch sets up locking and calls architecture specific
-+ * hooks.
-+ */
-+static inline void
-+prepare_task_switch(struct rq *rq, struct task_struct *prev,
-+		    struct task_struct *next)
-+{
-+	fire_sched_out_preempt_notifiers(prev, next);
-+	prepare_lock_switch(rq, next);
-+	prepare_arch_switch(next);
-+}
-+
-+/**
-+ * finish_task_switch - clean up after a task-switch
-+ * @rq: runqueue associated with task-switch
-+ * @prev: the thread we just switched away from.
-+ *
-+ * finish_task_switch must be called after the context switch, paired
-+ * with a prepare_task_switch call before the context switch.
-+ * finish_task_switch will reconcile locking set up by prepare_task_switch,
-+ * and do any other architecture-specific cleanup actions.
-+ *
-+ * Note that we may have delayed dropping an mm in context_switch(). If
-+ * so, we finish that here outside of the runqueue lock.  (Doing it
-+ * with the lock held can cause deadlocks; see schedule() for
-+ * details.)
-+ */
-+static inline void finish_task_switch(struct rq *rq, struct task_struct *prev)
-+	__releases(grq.lock)
-+{
-+	struct mm_struct *mm = rq->prev_mm;
-+	long prev_state;
-+
-+	rq->prev_mm = NULL;
-+
-+	/*
-+	 * A task struct has one reference for the use as "current".
-+	 * If a task dies, then it sets TASK_DEAD in tsk->state and calls
-+	 * schedule one last time. The schedule call will never return, and
-+	 * the scheduled task must drop that reference.
-+	 * The test for TASK_DEAD must occur while the runqueue locks are
-+	 * still held, otherwise prev could be scheduled on another cpu, die
-+	 * there before we look at prev->state, and then the reference would
-+	 * be dropped twice.
-+	 *		Manfred Spraul <manfred@colorfullife.com>
-+	 */
-+	prev_state = prev->state;
-+	finish_arch_switch(prev);
-+#ifdef __ARCH_WANT_INTERRUPTS_ON_CTXSW
-+	local_irq_disable();
-+#endif /* __ARCH_WANT_INTERRUPTS_ON_CTXSW */
-+	perf_event_task_sched_in(current);
-+#ifdef __ARCH_WANT_INTERRUPTS_ON_CTXSW
-+	local_irq_enable();
-+#endif /* __ARCH_WANT_INTERRUPTS_ON_CTXSW */
-+	finish_lock_switch(rq, prev);
-+
-+	fire_sched_in_preempt_notifiers(current);
-+	if (mm)
-+		mmdrop(mm);
-+	if (unlikely(prev_state == TASK_DEAD)) {
-+		/*
-+		 * Remove function-return probe instances associated with this
-+		 * task and put them back on the free list.
-+		 */
-+		kprobe_flush_task(prev);
-+		put_task_struct(prev);
-+	}
-+}
-+
-+/**
-+ * schedule_tail - first thing a freshly forked thread must call.
-+ * @prev: the thread we just switched away from.
-+ */
-+asmlinkage void schedule_tail(struct task_struct *prev)
-+	__releases(grq.lock)
-+{
-+	struct rq *rq = this_rq();
-+
-+	finish_task_switch(rq, prev);
-+#ifdef __ARCH_WANT_UNLOCKED_CTXSW
-+	/* In this case, finish_task_switch does not reenable preemption */
-+	preempt_enable();
-+#endif
-+	if (current->set_child_tid)
-+		put_user(current->pid, current->set_child_tid);
-+}
-+
-+/*
-+ * context_switch - switch to the new MM and the new
-+ * thread's register state.
-+ */
-+static inline void
-+context_switch(struct rq *rq, struct task_struct *prev,
-+	       struct task_struct *next)
-+{
-+	struct mm_struct *mm, *oldmm;
-+
-+	prepare_task_switch(rq, prev, next);
-+	trace_sched_switch(prev, next);
-+	mm = next->mm;
-+	oldmm = prev->active_mm;
-+	/*
-+	 * For paravirt, this is coupled with an exit in switch_to to
-+	 * combine the page table reload and the switch backend into
-+	 * one hypercall.
-+	 */
-+	arch_start_context_switch(prev);
-+
-+	if (!mm) {
-+		next->active_mm = oldmm;
-+		atomic_inc(&oldmm->mm_count);
-+		enter_lazy_tlb(oldmm, next);
-+	} else
-+		switch_mm(oldmm, mm, next);
-+
-+	if (!prev->mm) {
-+		prev->active_mm = NULL;
-+		rq->prev_mm = oldmm;
-+	}
-+	/*
-+	 * Since the runqueue lock will be released by the next
-+	 * task (which is an invalid locking op but in the case
-+	 * of the scheduler it's an obvious special-case), so we
-+	 * do an early lockdep release here:
-+	 */
-+#ifndef __ARCH_WANT_UNLOCKED_CTXSW
-+	spin_release(&grq.lock.dep_map, 1, _THIS_IP_);
-+#endif
-+
-+	/* Here we just switch the register state and the stack. */
-+	switch_to(prev, next, prev);
-+
-+	barrier();
-+	/*
-+	 * this_rq must be evaluated again because prev may have moved
-+	 * CPUs since it called schedule(), thus the 'rq' on its stack
-+	 * frame will be invalid.
-+	 */
-+	finish_task_switch(this_rq(), prev);
-+}
-+
-+/*
-+ * nr_running, nr_uninterruptible and nr_context_switches:
-+ *
-+ * externally visible scheduler statistics: current number of runnable
-+ * threads, current number of uninterruptible-sleeping threads, total
-+ * number of context switches performed since bootup. All are measured
-+ * without grabbing the grq lock but the occasional inaccurate result
-+ * doesn't matter so long as it's positive.
-+ */
-+unsigned long nr_running(void)
-+{
-+	long nr = grq.nr_running;
-+
-+	if (unlikely(nr < 0))
-+		nr = 0;
-+	return (unsigned long)nr;
-+}
-+
-+unsigned long nr_uninterruptible(void)
-+{
-+	long nu = grq.nr_uninterruptible;
-+
-+	if (unlikely(nu < 0))
-+		nu = 0;
-+	return nu;
-+}
-+
-+unsigned long long nr_context_switches(void)
-+{
-+	long long ns = grq.nr_switches;
-+
-+	/* This is of course impossible */
-+	if (unlikely(ns < 0))
-+		ns = 1;
-+	return (long long)ns;
-+}
-+
-+unsigned long nr_iowait(void)
-+{
-+	unsigned long i, sum = 0;
-+
-+	for_each_possible_cpu(i)
-+		sum += atomic_read(&cpu_rq(i)->nr_iowait);
-+
-+	return sum;
-+}
-+
-+unsigned long nr_iowait_cpu(int cpu)
-+{
-+	struct rq *this = cpu_rq(cpu);
-+	return atomic_read(&this->nr_iowait);
-+}
-+
-+unsigned long nr_active(void)
-+{
-+	return nr_running() + nr_uninterruptible();
-+}
-+
-+/* Beyond a task running on this CPU, load is equal everywhere on BFS */
-+unsigned long this_cpu_load(void)
-+{
-+	return this_rq()->rq_running +
-+		(queued_notrunning() + nr_uninterruptible()) /
-+		(1 + num_online_cpus());
-+}
-+
-+/* Variables and functions for calc_load */
-+static unsigned long calc_load_update;
-+unsigned long avenrun[3];
-+EXPORT_SYMBOL(avenrun);
-+
-+/**
-+ * get_avenrun - get the load average array
-+ * @loads:	pointer to dest load array
-+ * @offset:	offset to add
-+ * @shift:	shift count to shift the result left
-+ *
-+ * These values are estimates at best, so no need for locking.
-+ */
-+void get_avenrun(unsigned long *loads, unsigned long offset, int shift)
-+{
-+	loads[0] = (avenrun[0] + offset) << shift;
-+	loads[1] = (avenrun[1] + offset) << shift;
-+	loads[2] = (avenrun[2] + offset) << shift;
-+}
-+
-+static unsigned long
-+calc_load(unsigned long load, unsigned long exp, unsigned long active)
-+{
-+	load *= exp;
-+	load += active * (FIXED_1 - exp);
-+	return load >> FSHIFT;
-+}
-+
-+/*
-+ * calc_load - update the avenrun load estimates every LOAD_FREQ seconds.
-+ */
-+void calc_global_load(unsigned long ticks)
-+{
-+	long active;
-+
-+	if (time_before(jiffies, calc_load_update))
-+		return;
-+	active = nr_active() * FIXED_1;
-+
-+	avenrun[0] = calc_load(avenrun[0], EXP_1, active);
-+	avenrun[1] = calc_load(avenrun[1], EXP_5, active);
-+	avenrun[2] = calc_load(avenrun[2], EXP_15, active);
-+
-+	calc_load_update = jiffies + LOAD_FREQ;
-+}
-+
-+DEFINE_PER_CPU(struct kernel_stat, kstat);
-+
-+EXPORT_PER_CPU_SYMBOL(kstat);
-+
-+#ifdef CONFIG_IRQ_TIME_ACCOUNTING
-+
-+/*
-+ * There are no locks covering percpu hardirq/softirq time.
-+ * They are only modified in account_system_vtime, on corresponding CPU
-+ * with interrupts disabled. So, writes are safe.
-+ * They are read and saved off onto struct rq in update_rq_clock().
-+ * This may result in other CPU reading this CPU's irq time and can
-+ * race with irq/account_system_vtime on this CPU. We would either get old
-+ * or new value with a side effect of accounting a slice of irq time to wrong
-+ * task when irq is in progress while we read rq->clock. That is a worthy
-+ * compromise in place of having locks on each irq in account_system_time.
-+ */
-+static DEFINE_PER_CPU(u64, cpu_hardirq_time);
-+static DEFINE_PER_CPU(u64, cpu_softirq_time);
-+
-+static DEFINE_PER_CPU(u64, irq_start_time);
-+static int sched_clock_irqtime;
-+
-+void enable_sched_clock_irqtime(void)
-+{
-+	sched_clock_irqtime = 1;
-+}
-+
-+void disable_sched_clock_irqtime(void)
-+{
-+	sched_clock_irqtime = 0;
-+}
-+
-+#ifndef CONFIG_64BIT
-+static DEFINE_PER_CPU(seqcount_t, irq_time_seq);
-+
-+static inline void irq_time_write_begin(void)
-+{
-+	__this_cpu_inc(irq_time_seq.sequence);
-+	smp_wmb();
-+}
-+
-+static inline void irq_time_write_end(void)
-+{
-+	smp_wmb();
-+	__this_cpu_inc(irq_time_seq.sequence);
-+}
-+
-+static inline u64 irq_time_read(int cpu)
-+{
-+	u64 irq_time;
-+	unsigned seq;
-+
-+	do {
-+		seq = read_seqcount_begin(&per_cpu(irq_time_seq, cpu));
-+		irq_time = per_cpu(cpu_softirq_time, cpu) +
-+			   per_cpu(cpu_hardirq_time, cpu);
-+	} while (read_seqcount_retry(&per_cpu(irq_time_seq, cpu), seq));
-+
-+	return irq_time;
-+}
-+#else /* CONFIG_64BIT */
-+static inline void irq_time_write_begin(void)
-+{
-+}
-+
-+static inline void irq_time_write_end(void)
-+{
-+}
-+
-+static inline u64 irq_time_read(int cpu)
-+{
-+	return per_cpu(cpu_softirq_time, cpu) + per_cpu(cpu_hardirq_time, cpu);
-+}
-+#endif /* CONFIG_64BIT */
-+
-+/*
-+ * Called before incrementing preempt_count on {soft,}irq_enter
-+ * and before decrementing preempt_count on {soft,}irq_exit.
-+ */
-+void account_system_vtime(struct task_struct *curr)
-+{
-+	unsigned long flags;
-+	s64 delta;
-+	int cpu;
-+
-+	if (!sched_clock_irqtime)
-+		return;
-+
-+	local_irq_save(flags);
-+
-+	cpu = smp_processor_id();
-+	delta = sched_clock_cpu(cpu) - __this_cpu_read(irq_start_time);
-+	__this_cpu_add(irq_start_time, delta);
-+
-+	irq_time_write_begin();
-+	/*
-+	 * We do not account for softirq time from ksoftirqd here.
-+	 * We want to continue accounting softirq time to ksoftirqd thread
-+	 * in that case, so as not to confuse scheduler with a special task
-+	 * that do not consume any time, but still wants to run.
-+	 */
-+	if (hardirq_count())
-+		__this_cpu_add(cpu_hardirq_time, delta);
-+	else if (in_serving_softirq() && !(curr->flags & PF_KSOFTIRQD))
-+		__this_cpu_add(cpu_softirq_time, delta);
-+
-+	irq_time_write_end();
-+	local_irq_restore(flags);
-+}
-+EXPORT_SYMBOL_GPL(account_system_vtime);
-+
-+static void update_rq_clock_task(struct rq *rq, s64 delta)
-+{
-+	s64 irq_delta;
-+
-+	irq_delta = irq_time_read(cpu_of(rq)) - rq->prev_irq_time;
-+
-+	/*
-+	 * Since irq_time is only updated on {soft,}irq_exit, we might run into
-+	 * this case when a previous update_rq_clock() happened inside a
-+	 * {soft,}irq region.
-+	 *
-+	 * When this happens, we stop ->clock_task and only update the
-+	 * prev_irq_time stamp to account for the part that fit, so that a next
-+	 * update will consume the rest. This ensures ->clock_task is
-+	 * monotonic.
-+	 *
-+	 * It does however cause some slight miss-attribution of {soft,}irq
-+	 * time, a more accurate solution would be to update the irq_time using
-+	 * the current rq->clock timestamp, except that would require using
-+	 * atomic ops.
-+	 */
-+	if (irq_delta > delta)
-+		irq_delta = delta;
-+
-+	rq->prev_irq_time += irq_delta;
-+	delta -= irq_delta;
-+	rq->clock_task += delta;
-+}
-+
-+#else /* CONFIG_IRQ_TIME_ACCOUNTING */
-+
-+static void update_rq_clock_task(struct rq *rq, s64 delta)
-+{
-+	rq->clock_task += delta;
-+}
-+
-+#endif /* CONFIG_IRQ_TIME_ACCOUNTING */
-+
-+/*
-+ * On each tick, see what percentage of that tick was attributed to each
-+ * component and add the percentage to the _pc values. Once a _pc value has
-+ * accumulated one tick's worth, account for that. This means the total
-+ * percentage of load components will always be 100 per tick.
-+ */
-+static void pc_idle_time(struct rq *rq, unsigned long pc)
-+{
-+	struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+	cputime64_t tmp = cputime_to_cputime64(cputime_one_jiffy);
-+
-+	if (atomic_read(&rq->nr_iowait) > 0) {
-+		rq->iowait_pc += pc;
-+		if (rq->iowait_pc >= 100) {
-+			rq->iowait_pc %= 100;
-+			cpustat->iowait = cputime64_add(cpustat->iowait, tmp);
-+		}
-+	} else {
-+		rq->idle_pc += pc;
-+		if (rq->idle_pc >= 100) {
-+			rq->idle_pc %= 100;
-+			cpustat->idle = cputime64_add(cpustat->idle, tmp);
-+		}
-+	}
-+}
-+
-+static void
-+pc_system_time(struct rq *rq, struct task_struct *p, int hardirq_offset,
-+	       unsigned long pc, unsigned long ns)
-+{
-+	struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+	cputime_t one_jiffy_scaled = cputime_to_scaled(cputime_one_jiffy);
-+	cputime64_t tmp = cputime_to_cputime64(cputime_one_jiffy);
-+
-+	p->stime_pc += pc;
-+	if (p->stime_pc >= 100) {
-+		p->stime_pc -= 100;
-+		p->stime = cputime_add(p->stime, cputime_one_jiffy);
-+		p->stimescaled = cputime_add(p->stimescaled, one_jiffy_scaled);
-+		account_group_system_time(p, cputime_one_jiffy);
-+		acct_update_integrals(p);
-+	}
-+	p->sched_time += ns;
-+
-+	if (hardirq_count() - hardirq_offset) {
-+		rq->irq_pc += pc;
-+		if (rq->irq_pc >= 100) {
-+			rq->irq_pc %= 100;
-+			cpustat->irq = cputime64_add(cpustat->irq, tmp);
-+		}
-+	} else if (in_serving_softirq()) {
-+		rq->softirq_pc += pc;
-+		if (rq->softirq_pc >= 100) {
-+			rq->softirq_pc %= 100;
-+			cpustat->softirq = cputime64_add(cpustat->softirq, tmp);
-+		}
-+	} else {
-+		rq->system_pc += pc;
-+		if (rq->system_pc >= 100) {
-+			rq->system_pc %= 100;
-+			cpustat->system = cputime64_add(cpustat->system, tmp);
-+		}
-+	}
-+}
-+
-+static void pc_user_time(struct rq *rq, struct task_struct *p,
-+			 unsigned long pc, unsigned long ns)
-+{
-+	struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+	cputime_t one_jiffy_scaled = cputime_to_scaled(cputime_one_jiffy);
-+	cputime64_t tmp = cputime_to_cputime64(cputime_one_jiffy);
-+
-+	p->utime_pc += pc;
-+	if (p->utime_pc >= 100) {
-+		p->utime_pc -= 100;
-+		p->utime = cputime_add(p->utime, cputime_one_jiffy);
-+		p->utimescaled = cputime_add(p->utimescaled, one_jiffy_scaled);
-+		account_group_user_time(p, cputime_one_jiffy);
-+		acct_update_integrals(p);
-+	}
-+	p->sched_time += ns;
-+
-+	if (TASK_NICE(p) > 0 || idleprio_task(p)) {
-+		rq->nice_pc += pc;
-+		if (rq->nice_pc >= 100) {
-+			rq->nice_pc %= 100;
-+			cpustat->nice = cputime64_add(cpustat->nice, tmp);
-+		}
-+	} else {
-+		rq->user_pc += pc;
-+		if (rq->user_pc >= 100) {
-+			rq->user_pc %= 100;
-+			cpustat->user = cputime64_add(cpustat->user, tmp);
-+		}
-+	}
-+}
-+
-+/* Convert nanoseconds to percentage of one tick. */
-+#define NS_TO_PC(NS)	(NS * 100 / JIFFY_NS)
-+
-+/*
-+ * This is called on clock ticks and on context switches.
-+ * Bank in p->sched_time the ns elapsed since the last tick or switch.
-+ * CPU scheduler quota accounting is also performed here in microseconds.
-+ */
-+static void
-+update_cpu_clock(struct rq *rq, struct task_struct *p, int tick)
-+{
-+	long account_ns = rq->clock - rq->timekeep_clock;
-+	struct task_struct *idle = rq->idle;
-+	unsigned long account_pc;
-+
-+	if (unlikely(account_ns < 0))
-+		account_ns = 0;
-+
-+	account_pc = NS_TO_PC(account_ns);
-+
-+	if (tick) {
-+		int user_tick = user_mode(get_irq_regs());
-+
-+		/* Accurate tick timekeeping */
-+		if (user_tick)
-+			pc_user_time(rq, p, account_pc, account_ns);
-+		else if (p != idle || (irq_count() != HARDIRQ_OFFSET))
-+			pc_system_time(rq, p, HARDIRQ_OFFSET,
-+				       account_pc, account_ns);
-+		else
-+			pc_idle_time(rq, account_pc);
-+	} else {
-+		/* Accurate subtick timekeeping */
-+		if (p == idle)
-+			pc_idle_time(rq, account_pc);
-+		else
-+			pc_user_time(rq, p, account_pc, account_ns);
-+	}
-+
-+	/* time_slice accounting is done in usecs to avoid overflow on 32bit */
-+	if (rq->rq_policy != SCHED_FIFO && p != idle) {
-+		s64 time_diff = rq->clock - rq->rq_last_ran;
-+
-+		niffy_diff(&time_diff, 1);
-+		rq->rq_time_slice -= NS_TO_US(time_diff);
-+	}
-+	rq->rq_last_ran = rq->timekeep_clock = rq->clock;
-+}
-+
-+/*
-+ * Return any ns on the sched_clock that have not yet been accounted in
-+ * @p in case that task is currently running.
-+ *
-+ * Called with task_grq_lock() held.
-+ */
-+static u64 do_task_delta_exec(struct task_struct *p, struct rq *rq)
-+{
-+	u64 ns = 0;
-+
-+	if (p == rq->curr) {
-+		update_clocks(rq);
-+		ns = rq->clock_task - rq->rq_last_ran;
-+		if (unlikely((s64)ns < 0))
-+			ns = 0;
-+	}
-+
-+	return ns;
-+}
-+
-+unsigned long long task_delta_exec(struct task_struct *p)
-+{
-+	unsigned long flags;
-+	struct rq *rq;
-+	u64 ns;
-+
-+	rq = task_grq_lock(p, &flags);
-+	ns = do_task_delta_exec(p, rq);
-+	task_grq_unlock(&flags);
-+
-+	return ns;
-+}
-+
-+/*
-+ * Return accounted runtime for the task.
-+ * In case the task is currently running, return the runtime plus current's
-+ * pending runtime that have not been accounted yet.
-+ */
-+unsigned long long task_sched_runtime(struct task_struct *p)
-+{
-+	unsigned long flags;
-+	struct rq *rq;
-+	u64 ns;
-+
-+	rq = task_grq_lock(p, &flags);
-+	ns = p->sched_time + do_task_delta_exec(p, rq);
-+	task_grq_unlock(&flags);
-+
-+	return ns;
-+}
-+
-+/*
-+ * Return sum_exec_runtime for the thread group.
-+ * In case the task is currently running, return the sum plus current's
-+ * pending runtime that have not been accounted yet.
-+ *
-+ * Note that the thread group might have other running tasks as well,
-+ * so the return value not includes other pending runtime that other
-+ * running tasks might have.
-+ */
-+unsigned long long thread_group_sched_runtime(struct task_struct *p)
-+{
-+	struct task_cputime totals;
-+	unsigned long flags;
-+	struct rq *rq;
-+	u64 ns;
-+
-+	rq = task_grq_lock(p, &flags);
-+	thread_group_cputime(p, &totals);
-+	ns = totals.sum_exec_runtime + do_task_delta_exec(p, rq);
-+	task_grq_unlock(&flags);
-+
-+	return ns;
-+}
-+
-+/* Compatibility crap for removal */
-+void account_user_time(struct task_struct *p, cputime_t cputime,
-+		       cputime_t cputime_scaled)
-+{
-+}
-+
-+void account_idle_time(cputime_t cputime)
-+{
-+}
-+
-+/*
-+ * Account guest cpu time to a process.
-+ * @p: the process that the cpu time gets accounted to
-+ * @cputime: the cpu time spent in virtual machine since the last update
-+ * @cputime_scaled: cputime scaled by cpu frequency
-+ */
-+static void account_guest_time(struct task_struct *p, cputime_t cputime,
-+			       cputime_t cputime_scaled)
-+{
-+	cputime64_t tmp;
-+	struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+
-+	tmp = cputime_to_cputime64(cputime);
-+
-+	/* Add guest time to process. */
-+	p->utime = cputime_add(p->utime, cputime);
-+	p->utimescaled = cputime_add(p->utimescaled, cputime_scaled);
-+	account_group_user_time(p, cputime);
-+	p->gtime = cputime_add(p->gtime, cputime);
-+
-+	/* Add guest time to cpustat. */
-+	if (TASK_NICE(p) > 0) {
-+		cpustat->nice = cputime64_add(cpustat->nice, tmp);
-+		cpustat->guest_nice = cputime64_add(cpustat->guest_nice, tmp);
-+	} else {
-+		cpustat->user = cputime64_add(cpustat->user, tmp);
-+		cpustat->guest = cputime64_add(cpustat->guest, tmp);
-+	}
-+}
-+
-+/*
-+ * Account system cpu time to a process.
-+ * @p: the process that the cpu time gets accounted to
-+ * @hardirq_offset: the offset to subtract from hardirq_count()
-+ * @cputime: the cpu time spent in kernel space since the last update
-+ * @cputime_scaled: cputime scaled by cpu frequency
-+ * This is for guest only now.
-+ */
-+void account_system_time(struct task_struct *p, int hardirq_offset,
-+			 cputime_t cputime, cputime_t cputime_scaled)
-+{
-+
-+	if ((p->flags & PF_VCPU) && (irq_count() - hardirq_offset == 0))
-+		account_guest_time(p, cputime, cputime_scaled);
-+}
-+
-+/*
-+ * Account for involuntary wait time.
-+ * @steal: the cpu time spent in involuntary wait
-+ */
-+void account_steal_time(cputime_t cputime)
-+{
-+	struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+	cputime64_t cputime64 = cputime_to_cputime64(cputime);
-+
-+	cpustat->steal = cputime64_add(cpustat->steal, cputime64);
-+}
-+
-+/*
-+ * Account for idle time.
-+ * @cputime: the cpu time spent in idle wait
-+ */
-+static void account_idle_times(cputime_t cputime)
-+{
-+	struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
-+	cputime64_t cputime64 = cputime_to_cputime64(cputime);
-+	struct rq *rq = this_rq();
-+
-+	if (atomic_read(&rq->nr_iowait) > 0)
-+		cpustat->iowait = cputime64_add(cpustat->iowait, cputime64);
-+	else
-+		cpustat->idle = cputime64_add(cpustat->idle, cputime64);
-+}
-+
-+#ifndef CONFIG_VIRT_CPU_ACCOUNTING
-+
-+void account_process_tick(struct task_struct *p, int user_tick)
-+{
-+}
-+
-+/*
-+ * Account multiple ticks of steal time.
-+ * @p: the process from which the cpu time has been stolen
-+ * @ticks: number of stolen ticks
-+ */
-+void account_steal_ticks(unsigned long ticks)
-+{
-+	account_steal_time(jiffies_to_cputime(ticks));
-+}
-+
-+/*
-+ * Account multiple ticks of idle time.
-+ * @ticks: number of stolen ticks
-+ */
-+void account_idle_ticks(unsigned long ticks)
-+{
-+	account_idle_times(jiffies_to_cputime(ticks));
-+}
-+#endif
-+
-+static inline void grq_iso_lock(void)
-+	__acquires(grq.iso_lock)
-+{
-+	raw_spin_lock(&grq.iso_lock);
-+}
-+
-+static inline void grq_iso_unlock(void)
-+	__releases(grq.iso_lock)
-+{
-+	raw_spin_unlock(&grq.iso_lock);
-+}
-+
-+/*
-+ * Functions to test for when SCHED_ISO tasks have used their allocated
-+ * quota as real time scheduling and convert them back to SCHED_NORMAL.
-+ * Where possible, the data is tested lockless, to avoid grabbing iso_lock
-+ * because the occasional inaccurate result won't matter. However the
-+ * tick data is only ever modified under lock. iso_refractory is only simply
-+ * set to 0 or 1 so it's not worth grabbing the lock yet again for that.
-+ */
-+static void set_iso_refractory(void)
-+{
-+	grq.iso_refractory = 1;
-+}
-+
-+static void clear_iso_refractory(void)
-+{
-+	grq.iso_refractory = 0;
-+}
-+
-+/*
-+ * Test if SCHED_ISO tasks have run longer than their alloted period as RT
-+ * tasks and set the refractory flag if necessary. There is 10% hysteresis
-+ * for unsetting the flag. 115/128 is ~90/100 as a fast shift instead of a
-+ * slow division.
-+ */
-+static unsigned int test_ret_isorefractory(struct rq *rq)
-+{
-+	if (likely(!grq.iso_refractory)) {
-+		if (grq.iso_ticks > ISO_PERIOD * sched_iso_cpu)
-+			set_iso_refractory();
-+	} else {
-+		if (grq.iso_ticks < ISO_PERIOD * (sched_iso_cpu * 115 / 128))
-+			clear_iso_refractory();
-+	}
-+	return grq.iso_refractory;
-+}
-+
-+static void iso_tick(void)
-+{
-+	grq_iso_lock();
-+	grq.iso_ticks += 100;
-+	grq_iso_unlock();
-+}
-+
-+/* No SCHED_ISO task was running so decrease rq->iso_ticks */
-+static inline void no_iso_tick(void)
-+{
-+	if (grq.iso_ticks) {
-+		grq_iso_lock();
-+		grq.iso_ticks -= grq.iso_ticks / ISO_PERIOD + 1;
-+		if (unlikely(grq.iso_refractory && grq.iso_ticks <
-+		    ISO_PERIOD * (sched_iso_cpu * 115 / 128)))
-+			clear_iso_refractory();
-+		grq_iso_unlock();
-+	}
-+}
-+
-+static int rq_running_iso(struct rq *rq)
-+{
-+	return rq->rq_prio == ISO_PRIO;
-+}
-+
-+/* This manages tasks that have run out of timeslice during a scheduler_tick */
-+static void task_running_tick(struct rq *rq)
-+{
-+	struct task_struct *p;
-+
-+	/*
-+	 * If a SCHED_ISO task is running we increment the iso_ticks. In
-+	 * order to prevent SCHED_ISO tasks from causing starvation in the
-+	 * presence of true RT tasks we account those as iso_ticks as well.
-+	 */
-+	if ((rt_queue(rq) || (iso_queue(rq) && !grq.iso_refractory))) {
-+		if (grq.iso_ticks <= (ISO_PERIOD * 100) - 100)
-+			iso_tick();
-+	} else
-+		no_iso_tick();
-+
-+	if (iso_queue(rq)) {
-+		if (unlikely(test_ret_isorefractory(rq))) {
-+			if (rq_running_iso(rq)) {
-+				/*
-+				 * SCHED_ISO task is running as RT and limit
-+				 * has been hit. Force it to reschedule as
-+				 * SCHED_NORMAL by zeroing its time_slice
-+				 */
-+				rq->rq_time_slice = 0;
-+			}
-+		}
-+	}
-+
-+	/* SCHED_FIFO tasks never run out of timeslice. */
-+	if (rq->rq_policy == SCHED_FIFO)
-+		return;
-+	/*
-+	 * Tasks that were scheduled in the first half of a tick are not
-+	 * allowed to run into the 2nd half of the next tick if they will
-+	 * run out of time slice in the interim. Otherwise, if they have
-+	 * less than RESCHED_US μs of time slice left they will be rescheduled.
-+	 */
-+	if (rq->dither) {
-+		if (rq->rq_time_slice > HALF_JIFFY_US)
-+			return;
-+		else
-+			rq->rq_time_slice = 0;
-+	} else if (rq->rq_time_slice >= RESCHED_US)
-+			return;
-+
-+	/* p->time_slice < RESCHED_US. We only modify task_struct under grq lock */
-+	p = rq->curr;
-+	requeue_task(p);
-+	grq_lock();
-+	set_tsk_need_resched(p);
-+	grq_unlock();
-+}
-+
-+void wake_up_idle_cpu(int cpu);
-+
-+/*
-+ * This function gets called by the timer code, with HZ frequency.
-+ * We call it with interrupts disabled. The data modified is all
-+ * local to struct rq so we don't need to grab grq lock.
-+ */
-+void scheduler_tick(void)
-+{
-+	int cpu __maybe_unused = smp_processor_id();
-+	struct rq *rq = cpu_rq(cpu);
-+
-+	sched_clock_tick();
-+	/* grq lock not grabbed, so only update rq clock */
-+	update_rq_clock(rq);
-+	update_cpu_clock(rq, rq->curr, 1);
-+	if (!rq_idle(rq))
-+		task_running_tick(rq);
-+	else
-+		no_iso_tick();
-+	rq->last_tick = rq->clock;
-+	perf_event_task_tick();
-+}
-+
-+notrace unsigned long get_parent_ip(unsigned long addr)
-+{
-+	if (in_lock_functions(addr)) {
-+		addr = CALLER_ADDR2;
-+		if (in_lock_functions(addr))
-+			addr = CALLER_ADDR3;
-+	}
-+	return addr;
-+}
-+
-+#if defined(CONFIG_PREEMPT) && (defined(CONFIG_DEBUG_PREEMPT) || \
-+				defined(CONFIG_PREEMPT_TRACER))
-+void __kprobes add_preempt_count(int val)
-+{
-+#ifdef CONFIG_DEBUG_PREEMPT
-+	/*
-+	 * Underflow?
-+	 */
-+	if (DEBUG_LOCKS_WARN_ON((preempt_count() < 0)))
-+		return;
-+#endif
-+	preempt_count() += val;
-+#ifdef CONFIG_DEBUG_PREEMPT
-+	/*
-+	 * Spinlock count overflowing soon?
-+	 */
-+	DEBUG_LOCKS_WARN_ON((preempt_count() & PREEMPT_MASK) >=
-+				PREEMPT_MASK - 10);
-+#endif
-+	if (preempt_count() == val)
-+		trace_preempt_off(CALLER_ADDR0, get_parent_ip(CALLER_ADDR1));
-+}
-+EXPORT_SYMBOL(add_preempt_count);
-+
-+void __kprobes sub_preempt_count(int val)
-+{
-+#ifdef CONFIG_DEBUG_PREEMPT
-+	/*
-+	 * Underflow?
-+	 */
-+	if (DEBUG_LOCKS_WARN_ON(val > preempt_count()))
-+		return;
-+	/*
-+	 * Is the spinlock portion underflowing?
-+	 */
-+	if (DEBUG_LOCKS_WARN_ON((val < PREEMPT_MASK) &&
-+			!(preempt_count() & PREEMPT_MASK)))
-+		return;
-+#endif
-+
-+	if (preempt_count() == val)
-+		trace_preempt_on(CALLER_ADDR0, get_parent_ip(CALLER_ADDR1));
-+	preempt_count() -= val;
-+}
-+EXPORT_SYMBOL(sub_preempt_count);
-+#endif
-+
-+/*
-+ * Deadline is "now" in niffies + (offset by priority). Setting the deadline
-+ * is the key to everything. It distributes cpu fairly amongst tasks of the
-+ * same nice value, it proportions cpu according to nice level, it means the
-+ * task that last woke up the longest ago has the earliest deadline, thus
-+ * ensuring that interactive tasks get low latency on wake up. The CPU
-+ * proportion works out to the square of the virtual deadline difference, so
-+ * this equation will give nice 19 3% CPU compared to nice 0.
-+ */
-+static inline u64 prio_deadline_diff(int user_prio)
-+{
-+	return (prio_ratios[user_prio] * rr_interval * (MS_TO_NS(1) / 128));
-+}
-+
-+static inline u64 task_deadline_diff(struct task_struct *p)
-+{
-+	return prio_deadline_diff(TASK_USER_PRIO(p));
-+}
-+
-+static inline u64 static_deadline_diff(int static_prio)
-+{
-+	return prio_deadline_diff(USER_PRIO(static_prio));
-+}
-+
-+static inline int ms_longest_deadline_diff(void)
-+{
-+	return NS_TO_MS(prio_deadline_diff(39));
-+}
-+
-+/*
-+ * The time_slice is only refilled when it is empty and that is when we set a
-+ * new deadline.
-+ */
-+static void time_slice_expired(struct task_struct *p)
-+{
-+	p->time_slice = timeslice();
-+	p->deadline = grq.niffies + task_deadline_diff(p);
-+}
-+
-+/*
-+ * Timeslices below RESCHED_US are considered as good as expired as there's no
-+ * point rescheduling when there's so little time left. SCHED_BATCH tasks
-+ * have been flagged be not latency sensitive and likely to be fully CPU
-+ * bound so every time they're rescheduled they have their time_slice
-+ * refilled, but get a new later deadline to have little effect on
-+ * SCHED_NORMAL tasks.
-+
-+ */
-+static inline void check_deadline(struct task_struct *p)
-+{
-+	if (p->time_slice < RESCHED_US || batch_task(p))
-+		time_slice_expired(p);
-+}
-+
-+/*
-+ * O(n) lookup of all tasks in the global runqueue. The real brainfuck
-+ * of lock contention and O(n). It's not really O(n) as only the queued,
-+ * but not running tasks are scanned, and is O(n) queued in the worst case
-+ * scenario only because the right task can be found before scanning all of
-+ * them.
-+ * Tasks are selected in this order:
-+ * Real time tasks are selected purely by their static priority and in the
-+ * order they were queued, so the lowest value idx, and the first queued task
-+ * of that priority value is chosen.
-+ * If no real time tasks are found, the SCHED_ISO priority is checked, and
-+ * all SCHED_ISO tasks have the same priority value, so they're selected by
-+ * the earliest deadline value.
-+ * If no SCHED_ISO tasks are found, SCHED_NORMAL tasks are selected by the
-+ * earliest deadline.
-+ * Finally if no SCHED_NORMAL tasks are found, SCHED_IDLEPRIO tasks are
-+ * selected by the earliest deadline.
-+ */
-+static inline struct
-+task_struct *earliest_deadline_task(struct rq *rq, struct task_struct *idle)
-+{
-+	u64 dl, earliest_deadline = 0; /* Initialise to silence compiler */
-+	struct task_struct *p, *edt = idle;
-+	unsigned int cpu = cpu_of(rq);
-+	struct list_head *queue;
-+	int idx = 0;
-+
-+retry:
-+	idx = find_next_bit(grq.prio_bitmap, PRIO_LIMIT, idx);
-+	if (idx >= PRIO_LIMIT)
-+		goto out;
-+	queue = grq.queue + idx;
-+	list_for_each_entry(p, queue, run_list) {
-+		/* Make sure cpu affinity is ok */
-+		if (needs_other_cpu(p, cpu))
-+			continue;
-+		if (idx < MAX_RT_PRIO) {
-+			/* We found an rt task */
-+			edt = p;
-+			goto out_take;
-+		}
-+
-+		dl = p->deadline + cache_distance(task_rq(p), rq, p);
-+
-+		/*
-+		 * No rt tasks. Find the earliest deadline task. Now we're in
-+		 * O(n) territory. This is what we silenced the compiler for:
-+		 * edt will always start as idle.
-+		 */
-+		if (edt == idle ||
-+		    deadline_before(dl, earliest_deadline)) {
-+			earliest_deadline = dl;
-+			edt = p;
-+		}
-+	}
-+	if (edt == idle) {
-+		if (++idx < PRIO_LIMIT)
-+			goto retry;
-+		goto out;
-+	}
-+out_take:
-+	take_task(rq, edt);
-+out:
-+	return edt;
-+}
-+
-+/*
-+ * Print scheduling while atomic bug:
-+ */
-+static noinline void __schedule_bug(struct task_struct *prev)
-+{
-+	struct pt_regs *regs = get_irq_regs();
-+
-+	printk(KERN_ERR "BUG: scheduling while atomic: %s/%d/0x%08x\n",
-+		prev->comm, prev->pid, preempt_count());
-+
-+	debug_show_held_locks(prev);
-+	print_modules();
-+	if (irqs_disabled())
-+		print_irqtrace_events(prev);
-+
-+	if (regs)
-+		show_regs(regs);
-+	else
-+		dump_stack();
-+}
-+
-+/*
-+ * Various schedule()-time debugging checks and statistics:
-+ */
-+static inline void schedule_debug(struct task_struct *prev)
-+{
-+	/*
-+	 * Test if we are atomic. Since do_exit() needs to call into
-+	 * schedule() atomically, we ignore that path for now.
-+	 * Otherwise, whine if we are scheduling when we should not be.
-+	 */
-+	if (unlikely(in_atomic_preempt_off() && !prev->exit_state))
-+		__schedule_bug(prev);
-+
-+	profile_hit(SCHED_PROFILING, __builtin_return_address(0));
-+
-+	schedstat_inc(this_rq(), sched_count);
-+#ifdef CONFIG_SCHEDSTATS
-+	if (unlikely(prev->lock_depth >= 0)) {
-+		schedstat_inc(this_rq(), bkl_count);
-+		schedstat_inc(prev, sched_info.bkl_count);
-+	}
-+#endif
-+}
-+
-+/*
-+ * The currently running task's information is all stored in rq local data
-+ * which is only modified by the local CPU, thereby allowing the data to be
-+ * changed without grabbing the grq lock.
-+ */
-+static inline void set_rq_task(struct rq *rq, struct task_struct *p)
-+{
-+	rq->rq_time_slice = p->time_slice;
-+	rq->rq_deadline = p->deadline;
-+	rq->rq_last_ran = p->last_ran;
-+	rq->rq_policy = p->policy;
-+	rq->rq_prio = p->prio;
-+	if (p != rq->idle)
-+		rq->rq_running = 1;
-+	else
-+		rq->rq_running = 0;
-+}
-+
-+static void reset_rq_task(struct rq *rq, struct task_struct *p)
-+{
-+	rq->rq_policy = p->policy;
-+	rq->rq_prio = p->prio;
-+}
-+
-+/*
-+ * schedule() is the main scheduler function.
-+ */
-+asmlinkage void __sched schedule(void)
-+{
-+	struct task_struct *prev, *next, *idle;
-+	unsigned long *switch_count;
-+	int deactivate, cpu;
-+	struct rq *rq;
-+
-+need_resched:
-+	preempt_disable();
-+
-+	cpu = smp_processor_id();
-+	rq = cpu_rq(cpu);
-+	idle = rq->idle;
-+	rcu_note_context_switch(cpu);
-+	prev = rq->curr;
-+
-+	release_kernel_lock(prev);
-+need_resched_nonpreemptible:
-+
-+	deactivate = 0;
-+	schedule_debug(prev);
-+
-+	grq_lock_irq();
-+	update_clocks(rq);
-+	update_cpu_clock(rq, prev, 0);
-+	if (rq->clock - rq->last_tick > HALF_JIFFY_NS)
-+		rq->dither = 0;
-+	else
-+		rq->dither = 1;
-+
-+	clear_tsk_need_resched(prev);
-+
-+	switch_count = &prev->nivcsw;
-+	if (prev->state && !(preempt_count() & PREEMPT_ACTIVE)) {
-+		if (unlikely(signal_pending_state(prev->state, prev))) {
-+			prev->state = TASK_RUNNING;
-+		} else {
-+			deactivate = 1;
-+			/*
-+			 * If a worker is going to sleep, notify and
-+			 * ask workqueue whether it wants to wake up a
-+			 * task to maintain concurrency.  If so, wake
-+			 * up the task.
-+			 */
-+			if (prev->flags & PF_WQ_WORKER) {
-+				struct task_struct *to_wakeup;
-+
-+				to_wakeup = wq_worker_sleeping(prev, cpu);
-+				if (to_wakeup) {
-+					/* This shouldn't happen, but does */
-+					if (unlikely(to_wakeup == prev))
-+						deactivate = 0;
-+					else
-+						try_to_wake_up_local(to_wakeup);
-+				}
-+			}
-+		}
-+		switch_count = &prev->nvcsw;
-+	}
-+
-+	if (prev != idle) {
-+		/* Update all the information stored on struct rq */
-+		prev->time_slice = rq->rq_time_slice;
-+		prev->deadline = rq->rq_deadline;
-+		check_deadline(prev);
-+		prev->last_ran = rq->clock;
-+
-+		/* Task changed affinity off this CPU */
-+		if (needs_other_cpu(prev, cpu))
-+			resched_suitable_idle(prev);
-+		else if (!deactivate) {
-+			if (!queued_notrunning()) {
-+				/*
-+				* We now know prev is the only thing that is
-+				* awaiting CPU so we can bypass rechecking for
-+				* the earliest deadline task and just run it
-+				* again.
-+				*/
-+				grq_unlock_irq();
-+				goto rerun_prev_unlocked;
-+			} else {
-+				/*
-+				 * If prev got kicked off by a task that has to
-+				 * run on this CPU for affinity reasons then
-+				 * there may be an idle CPU it can go to.
-+				 */
-+				resched_suitable_idle(prev);
-+			}
-+		}
-+		return_task(prev, deactivate);
-+	}
-+
-+	if (unlikely(!queued_notrunning())) {
-+		/*
-+		 * This CPU is now truly idle as opposed to when idle is
-+		 * scheduled as a high priority task in its own right.
-+		 */
-+		next = idle;
-+		schedstat_inc(rq, sched_goidle);
-+		set_cpuidle_map(cpu);
-+	} else {
-+		next = earliest_deadline_task(rq, idle);
-+		prefetch(next);
-+		prefetch_stack(next);
-+		clear_cpuidle_map(cpu);
-+	}
-+
-+	if (likely(prev != next)) {
-+		sched_info_switch(prev, next);
-+		perf_event_task_sched_out(prev, next);
-+
-+		set_rq_task(rq, next);
-+		grq.nr_switches++;
-+		prev->oncpu = 0;
-+		next->oncpu = 1;
-+		rq->curr = next;
-+		++*switch_count;
-+
-+		context_switch(rq, prev, next); /* unlocks the grq */
-+		/*
-+		 * The context switch have flipped the stack from under us
-+		 * and restored the local variables which were saved when
-+		 * this task called schedule() in the past. prev == current
-+		 * is still correct, but it can be moved to another cpu/rq.
-+		 */
-+		cpu = smp_processor_id();
-+		rq = cpu_rq(cpu);
-+		idle = rq->idle;
-+	} else
-+		grq_unlock_irq();
-+
-+rerun_prev_unlocked:
-+	if (unlikely(reacquire_kernel_lock(prev)))
-+		goto need_resched_nonpreemptible;
-+
-+	preempt_enable_no_resched();
-+	if (need_resched())
-+		goto need_resched;
-+}
-+EXPORT_SYMBOL(schedule);
-+
-+#ifdef CONFIG_SMP
-+int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner)
-+{
-+	unsigned int cpu;
-+	struct rq *rq;
-+
-+#ifdef CONFIG_DEBUG_PAGEALLOC
-+	/*
-+	 * Need to access the cpu field knowing that
-+	 * DEBUG_PAGEALLOC could have unmapped it if
-+	 * the mutex owner just released it and exited.
-+	 */
-+	if (probe_kernel_address(&owner->cpu, cpu))
-+		return 0;
-+#else
-+	cpu = owner->cpu;
-+#endif
-+
-+	/*
-+	 * Even if the access succeeded (likely case),
-+	 * the cpu field may no longer be valid.
-+	 */
-+	if (cpu >= nr_cpumask_bits)
-+		return 0;
-+
-+	/*
-+	 * We need to validate that we can do a
-+	 * get_cpu() and that we have the percpu area.
-+	 */
-+	if (!cpu_online(cpu))
-+		return 0;
-+
-+	rq = cpu_rq(cpu);
-+
-+	for (;;) {
-+		/*
-+		 * Owner changed, break to re-assess state.
-+		 */
-+		if (lock->owner != owner)
-+			break;
-+
-+		/*
-+		 * Is that owner really running on that cpu?
-+		 */
-+		if (task_thread_info(rq->curr) != owner || need_resched())
-+			return 0;
-+
-+		cpu_relax();
-+	}
-+
-+	return 1;
-+}
-+#endif
-+
-+#ifdef CONFIG_PREEMPT
-+/*
-+ * this is the entry point to schedule() from in-kernel preemption
-+ * off of preempt_enable. Kernel preemptions off return from interrupt
-+ * occur there and call schedule directly.
-+ */
-+asmlinkage void __sched notrace preempt_schedule(void)
-+{
-+	struct thread_info *ti = current_thread_info();
-+
-+	/*
-+	 * If there is a non-zero preempt_count or interrupts are disabled,
-+	 * we do not want to preempt the current task. Just return..
-+	 */
-+	if (likely(ti->preempt_count || irqs_disabled()))
-+		return;
-+
-+	do {
-+		add_preempt_count_notrace(PREEMPT_ACTIVE);
-+		schedule();
-+		sub_preempt_count_notrace(PREEMPT_ACTIVE);
-+
-+		/*
-+		 * Check again in case we missed a preemption opportunity
-+		 * between schedule and now.
-+		 */
-+		barrier();
-+	} while (need_resched());
-+}
-+EXPORT_SYMBOL(preempt_schedule);
-+
-+/*
-+ * this is the entry point to schedule() from kernel preemption
-+ * off of irq context.
-+ * Note, that this is called and return with irqs disabled. This will
-+ * protect us against recursive calling from irq.
-+ */
-+asmlinkage void __sched preempt_schedule_irq(void)
-+{
-+	struct thread_info *ti = current_thread_info();
-+
-+	/* Catch callers which need to be fixed */
-+	BUG_ON(ti->preempt_count || !irqs_disabled());
-+
-+	do {
-+		add_preempt_count(PREEMPT_ACTIVE);
-+		local_irq_enable();
-+		schedule();
-+		local_irq_disable();
-+		sub_preempt_count(PREEMPT_ACTIVE);
-+
-+		/*
-+		 * Check again in case we missed a preemption opportunity
-+		 * between schedule and now.
-+		 */
-+		barrier();
-+	} while (need_resched());
-+}
-+
-+#endif /* CONFIG_PREEMPT */
-+
-+int default_wake_function(wait_queue_t *curr, unsigned mode, int wake_flags,
-+			  void *key)
-+{
-+	return try_to_wake_up(curr->private, mode, wake_flags);
-+}
-+EXPORT_SYMBOL(default_wake_function);
-+
-+/*
-+ * The core wakeup function.  Non-exclusive wakeups (nr_exclusive == 0) just
-+ * wake everything up.  If it's an exclusive wakeup (nr_exclusive == small +ve
-+ * number) then we wake all the non-exclusive tasks and one exclusive task.
-+ *
-+ * There are circumstances in which we can try to wake a task which has already
-+ * started to run but is not in state TASK_RUNNING.  try_to_wake_up() returns
-+ * zero in this (rare) case, and we handle it by continuing to scan the queue.
-+ */
-+static void __wake_up_common(wait_queue_head_t *q, unsigned int mode,
-+			int nr_exclusive, int wake_flags, void *key)
-+{
-+	struct list_head *tmp, *next;
-+
-+	list_for_each_safe(tmp, next, &q->task_list) {
-+		wait_queue_t *curr = list_entry(tmp, wait_queue_t, task_list);
-+		unsigned int flags = curr->flags;
-+
-+		if (curr->func(curr, mode, wake_flags, key) &&
-+				(flags & WQ_FLAG_EXCLUSIVE) && !--nr_exclusive)
-+			break;
-+	}
-+}
-+
-+/**
-+ * __wake_up - wake up threads blocked on a waitqueue.
-+ * @q: the waitqueue
-+ * @mode: which threads
-+ * @nr_exclusive: how many wake-one or wake-many threads to wake up
-+ * @key: is directly passed to the wakeup function
-+ *
-+ * It may be assumed that this function implies a write memory barrier before
-+ * changing the task state if and only if any tasks are woken up.
-+ */
-+void __wake_up(wait_queue_head_t *q, unsigned int mode,
-+			int nr_exclusive, void *key)
-+{
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&q->lock, flags);
-+	__wake_up_common(q, mode, nr_exclusive, 0, key);
-+	spin_unlock_irqrestore(&q->lock, flags);
-+}
-+EXPORT_SYMBOL(__wake_up);
-+
-+/*
-+ * Same as __wake_up but called with the spinlock in wait_queue_head_t held.
-+ */
-+void __wake_up_locked(wait_queue_head_t *q, unsigned int mode)
-+{
-+	__wake_up_common(q, mode, 1, 0, NULL);
-+}
-+EXPORT_SYMBOL_GPL(__wake_up_locked);
-+
-+void __wake_up_locked_key(wait_queue_head_t *q, unsigned int mode, void *key)
-+{
-+	__wake_up_common(q, mode, 1, 0, key);
-+}
-+
-+/**
-+ * __wake_up_sync_key - wake up threads blocked on a waitqueue.
-+ * @q: the waitqueue
-+ * @mode: which threads
-+ * @nr_exclusive: how many wake-one or wake-many threads to wake up
-+ * @key: opaque value to be passed to wakeup targets
-+ *
-+ * The sync wakeup differs that the waker knows that it will schedule
-+ * away soon, so while the target thread will be woken up, it will not
-+ * be migrated to another CPU - ie. the two threads are 'synchronised'
-+ * with each other. This can prevent needless bouncing between CPUs.
-+ *
-+ * On UP it can prevent extra preemption.
-+ *
-+ * It may be assumed that this function implies a write memory barrier before
-+ * changing the task state if and only if any tasks are woken up.
-+ */
-+void __wake_up_sync_key(wait_queue_head_t *q, unsigned int mode,
-+			int nr_exclusive, void *key)
-+{
-+	unsigned long flags;
-+	int wake_flags = WF_SYNC;
-+
-+	if (unlikely(!q))
-+		return;
-+
-+	if (unlikely(!nr_exclusive))
-+		wake_flags = 0;
-+
-+	spin_lock_irqsave(&q->lock, flags);
-+	__wake_up_common(q, mode, nr_exclusive, wake_flags, key);
-+	spin_unlock_irqrestore(&q->lock, flags);
-+}
-+EXPORT_SYMBOL_GPL(__wake_up_sync_key);
-+
-+/**
-+ * __wake_up_sync - wake up threads blocked on a waitqueue.
-+ * @q: the waitqueue
-+ * @mode: which threads
-+ * @nr_exclusive: how many wake-one or wake-many threads to wake up
-+ *
-+ * The sync wakeup differs that the waker knows that it will schedule
-+ * away soon, so while the target thread will be woken up, it will not
-+ * be migrated to another CPU - ie. the two threads are 'synchronised'
-+ * with each other. This can prevent needless bouncing between CPUs.
-+ *
-+ * On UP it can prevent extra preemption.
-+ */
-+void __wake_up_sync(wait_queue_head_t *q, unsigned int mode, int nr_exclusive)
-+{
-+	unsigned long flags;
-+	int sync = 1;
-+
-+	if (unlikely(!q))
-+		return;
-+
-+	if (unlikely(!nr_exclusive))
-+		sync = 0;
-+
-+	spin_lock_irqsave(&q->lock, flags);
-+	__wake_up_common(q, mode, nr_exclusive, sync, NULL);
-+	spin_unlock_irqrestore(&q->lock, flags);
-+}
-+EXPORT_SYMBOL_GPL(__wake_up_sync);	/* For internal use only */
-+
-+/**
-+ * complete: - signals a single thread waiting on this completion
-+ * @x:  holds the state of this particular completion
-+ *
-+ * This will wake up a single thread waiting on this completion. Threads will be
-+ * awakened in the same order in which they were queued.
-+ *
-+ * See also complete_all(), wait_for_completion() and related routines.
-+ *
-+ * It may be assumed that this function implies a write memory barrier before
-+ * changing the task state if and only if any tasks are woken up.
-+ */
-+void complete(struct completion *x)
-+{
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&x->wait.lock, flags);
-+	x->done++;
-+	__wake_up_common(&x->wait, TASK_NORMAL, 1, 0, NULL);
-+	spin_unlock_irqrestore(&x->wait.lock, flags);
-+}
-+EXPORT_SYMBOL(complete);
-+
-+/**
-+ * complete_all: - signals all threads waiting on this completion
-+ * @x:  holds the state of this particular completion
-+ *
-+ * This will wake up all threads waiting on this particular completion event.
-+ *
-+ * It may be assumed that this function implies a write memory barrier before
-+ * changing the task state if and only if any tasks are woken up.
-+ */
-+void complete_all(struct completion *x)
-+{
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&x->wait.lock, flags);
-+	x->done += UINT_MAX/2;
-+	__wake_up_common(&x->wait, TASK_NORMAL, 0, 0, NULL);
-+	spin_unlock_irqrestore(&x->wait.lock, flags);
-+}
-+EXPORT_SYMBOL(complete_all);
-+
-+static inline long __sched
-+do_wait_for_common(struct completion *x, long timeout, int state)
-+{
-+	if (!x->done) {
-+		DECLARE_WAITQUEUE(wait, current);
-+
-+		__add_wait_queue_tail_exclusive(&x->wait, &wait);
-+		do {
-+			if (signal_pending_state(state, current)) {
-+				timeout = -ERESTARTSYS;
-+				break;
-+			}
-+			__set_current_state(state);
-+			spin_unlock_irq(&x->wait.lock);
-+			timeout = schedule_timeout(timeout);
-+			spin_lock_irq(&x->wait.lock);
-+		} while (!x->done && timeout);
-+		__remove_wait_queue(&x->wait, &wait);
-+		if (!x->done)
-+			return timeout;
-+	}
-+	x->done--;
-+	return timeout ?: 1;
-+}
-+
-+static long __sched
-+wait_for_common(struct completion *x, long timeout, int state)
-+{
-+	might_sleep();
-+
-+	spin_lock_irq(&x->wait.lock);
-+	timeout = do_wait_for_common(x, timeout, state);
-+	spin_unlock_irq(&x->wait.lock);
-+	return timeout;
-+}
-+
-+/**
-+ * wait_for_completion: - waits for completion of a task
-+ * @x:  holds the state of this particular completion
-+ *
-+ * This waits to be signaled for completion of a specific task. It is NOT
-+ * interruptible and there is no timeout.
-+ *
-+ * See also similar routines (i.e. wait_for_completion_timeout()) with timeout
-+ * and interrupt capability. Also see complete().
-+ */
-+void __sched wait_for_completion(struct completion *x)
-+{
-+	wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_UNINTERRUPTIBLE);
-+}
-+EXPORT_SYMBOL(wait_for_completion);
-+
-+/**
-+ * wait_for_completion_timeout: - waits for completion of a task (w/timeout)
-+ * @x:  holds the state of this particular completion
-+ * @timeout:  timeout value in jiffies
-+ *
-+ * This waits for either a completion of a specific task to be signaled or for a
-+ * specified timeout to expire. The timeout is in jiffies. It is not
-+ * interruptible.
-+ */
-+unsigned long __sched
-+wait_for_completion_timeout(struct completion *x, unsigned long timeout)
-+{
-+	return wait_for_common(x, timeout, TASK_UNINTERRUPTIBLE);
-+}
-+EXPORT_SYMBOL(wait_for_completion_timeout);
-+
-+/**
-+ * wait_for_completion_interruptible: - waits for completion of a task (w/intr)
-+ * @x:  holds the state of this particular completion
-+ *
-+ * This waits for completion of a specific task to be signaled. It is
-+ * interruptible.
-+ */
-+int __sched wait_for_completion_interruptible(struct completion *x)
-+{
-+	long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_INTERRUPTIBLE);
-+	if (t == -ERESTARTSYS)
-+		return t;
-+	return 0;
-+}
-+EXPORT_SYMBOL(wait_for_completion_interruptible);
-+
-+/**
-+ * wait_for_completion_interruptible_timeout: - waits for completion (w/(to,intr))
-+ * @x:  holds the state of this particular completion
-+ * @timeout:  timeout value in jiffies
-+ *
-+ * This waits for either a completion of a specific task to be signaled or for a
-+ * specified timeout to expire. It is interruptible. The timeout is in jiffies.
-+ */
-+unsigned long __sched
-+wait_for_completion_interruptible_timeout(struct completion *x,
-+					  unsigned long timeout)
-+{
-+	return wait_for_common(x, timeout, TASK_INTERRUPTIBLE);
-+}
-+EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
-+
-+/**
-+ * wait_for_completion_killable: - waits for completion of a task (killable)
-+ * @x:  holds the state of this particular completion
-+ *
-+ * This waits to be signaled for completion of a specific task. It can be
-+ * interrupted by a kill signal.
-+ */
-+int __sched wait_for_completion_killable(struct completion *x)
-+{
-+	long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
-+	if (t == -ERESTARTSYS)
-+		return t;
-+	return 0;
-+}
-+EXPORT_SYMBOL(wait_for_completion_killable);
-+
-+/**
-+ * wait_for_completion_killable_timeout: - waits for completion of a task (w/(to,killable))
-+ * @x:  holds the state of this particular completion
-+ * @timeout:  timeout value in jiffies
-+ *
-+ * This waits for either a completion of a specific task to be
-+ * signaled or for a specified timeout to expire. It can be
-+ * interrupted by a kill signal. The timeout is in jiffies.
-+ */
-+unsigned long __sched
-+wait_for_completion_killable_timeout(struct completion *x,
-+				     unsigned long timeout)
-+{
-+	return wait_for_common(x, timeout, TASK_KILLABLE);
-+}
-+EXPORT_SYMBOL(wait_for_completion_killable_timeout);
-+
-+/**
-+ *	try_wait_for_completion - try to decrement a completion without blocking
-+ *	@x:	completion structure
-+ *
-+ *	Returns: 0 if a decrement cannot be done without blocking
-+ *		 1 if a decrement succeeded.
-+ *
-+ *	If a completion is being used as a counting completion,
-+ *	attempt to decrement the counter without blocking. This
-+ *	enables us to avoid waiting if the resource the completion
-+ *	is protecting is not available.
-+ */
-+bool try_wait_for_completion(struct completion *x)
-+{
-+	unsigned long flags;
-+	int ret = 1;
-+
-+	spin_lock_irqsave(&x->wait.lock, flags);
-+	if (!x->done)
-+		ret = 0;
-+	else
-+		x->done--;
-+	spin_unlock_irqrestore(&x->wait.lock, flags);
-+	return ret;
-+}
-+EXPORT_SYMBOL(try_wait_for_completion);
-+
-+/**
-+ *	completion_done - Test to see if a completion has any waiters
-+ *	@x:	completion structure
-+ *
-+ *	Returns: 0 if there are waiters (wait_for_completion() in progress)
-+ *		 1 if there are no waiters.
-+ *
-+ */
-+bool completion_done(struct completion *x)
-+{
-+	unsigned long flags;
-+	int ret = 1;
-+
-+	spin_lock_irqsave(&x->wait.lock, flags);
-+	if (!x->done)
-+		ret = 0;
-+	spin_unlock_irqrestore(&x->wait.lock, flags);
-+	return ret;
-+}
-+EXPORT_SYMBOL(completion_done);
-+
-+static long __sched
-+sleep_on_common(wait_queue_head_t *q, int state, long timeout)
-+{
-+	unsigned long flags;
-+	wait_queue_t wait;
-+
-+	init_waitqueue_entry(&wait, current);
-+
-+	__set_current_state(state);
-+
-+	spin_lock_irqsave(&q->lock, flags);
-+	__add_wait_queue(q, &wait);
-+	spin_unlock(&q->lock);
-+	timeout = schedule_timeout(timeout);
-+	spin_lock_irq(&q->lock);
-+	__remove_wait_queue(q, &wait);
-+	spin_unlock_irqrestore(&q->lock, flags);
-+
-+	return timeout;
-+}
-+
-+void __sched interruptible_sleep_on(wait_queue_head_t *q)
-+{
-+	sleep_on_common(q, TASK_INTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT);
-+}
-+EXPORT_SYMBOL(interruptible_sleep_on);
-+
-+long __sched
-+interruptible_sleep_on_timeout(wait_queue_head_t *q, long timeout)
-+{
-+	return sleep_on_common(q, TASK_INTERRUPTIBLE, timeout);
-+}
-+EXPORT_SYMBOL(interruptible_sleep_on_timeout);
-+
-+void __sched sleep_on(wait_queue_head_t *q)
-+{
-+	sleep_on_common(q, TASK_UNINTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT);
-+}
-+EXPORT_SYMBOL(sleep_on);
-+
-+long __sched sleep_on_timeout(wait_queue_head_t *q, long timeout)
-+{
-+	return sleep_on_common(q, TASK_UNINTERRUPTIBLE, timeout);
-+}
-+EXPORT_SYMBOL(sleep_on_timeout);
-+
-+#ifdef CONFIG_RT_MUTEXES
-+
-+/*
-+ * rt_mutex_setprio - set the current priority of a task
-+ * @p: task
-+ * @prio: prio value (kernel-internal form)
-+ *
-+ * This function changes the 'effective' priority of a task. It does
-+ * not touch ->normal_prio like __setscheduler().
-+ *
-+ * Used by the rt_mutex code to implement priority inheritance logic.
-+ */
-+void rt_mutex_setprio(struct task_struct *p, int prio)
-+{
-+	unsigned long flags;
-+	int queued, oldprio;
-+	struct rq *rq;
-+
-+	BUG_ON(prio < 0 || prio > MAX_PRIO);
-+
-+	rq = task_grq_lock(p, &flags);
-+
-+	trace_sched_pi_setprio(p, prio);
-+	oldprio = p->prio;
-+	queued = task_queued(p);
-+	if (queued)
-+		dequeue_task(p);
-+	p->prio = prio;
-+	if (task_running(p) && prio > oldprio)
-+		resched_task(p);
-+	if (queued) {
-+		enqueue_task(p);
-+		try_preempt(p, rq);
-+	}
-+
-+	task_grq_unlock(&flags);
-+}
-+
-+#endif
-+
-+/*
-+ * Adjust the deadline for when the priority is to change, before it's
-+ * changed.
-+ */
-+static inline void adjust_deadline(struct task_struct *p, int new_prio)
-+{
-+	p->deadline += static_deadline_diff(new_prio) - task_deadline_diff(p);
-+}
-+
-+void set_user_nice(struct task_struct *p, long nice)
-+{
-+	int queued, new_static, old_static;
-+	unsigned long flags;
-+	struct rq *rq;
-+
-+	if (TASK_NICE(p) == nice || nice < -20 || nice > 19)
-+		return;
-+	new_static = NICE_TO_PRIO(nice);
-+	/*
-+	 * We have to be careful, if called from sys_setpriority(),
-+	 * the task might be in the middle of scheduling on another CPU.
-+	 */
-+	rq = time_task_grq_lock(p, &flags);
-+	/*
-+	 * The RT priorities are set via sched_setscheduler(), but we still
-+	 * allow the 'normal' nice value to be set - but as expected
-+	 * it wont have any effect on scheduling until the task is
-+	 * not SCHED_NORMAL/SCHED_BATCH:
-+	 */
-+	if (has_rt_policy(p)) {
-+		p->static_prio = new_static;
-+		goto out_unlock;
-+	}
-+	queued = task_queued(p);
-+	if (queued)
-+		dequeue_task(p);
-+
-+	adjust_deadline(p, new_static);
-+	old_static = p->static_prio;
-+	p->static_prio = new_static;
-+	p->prio = effective_prio(p);
-+
-+	if (queued) {
-+		enqueue_task(p);
-+		if (new_static < old_static)
-+			try_preempt(p, rq);
-+	} else if (task_running(p)) {
-+		reset_rq_task(rq, p);
-+		if (old_static < new_static)
-+			resched_task(p);
-+	}
-+out_unlock:
-+	task_grq_unlock(&flags);
-+}
-+EXPORT_SYMBOL(set_user_nice);
-+
-+/*
-+ * can_nice - check if a task can reduce its nice value
-+ * @p: task
-+ * @nice: nice value
-+ */
-+int can_nice(const struct task_struct *p, const int nice)
-+{
-+	/* convert nice value [19,-20] to rlimit style value [1,40] */
-+	int nice_rlim = 20 - nice;
-+
-+	return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
-+		capable(CAP_SYS_NICE));
-+}
-+
-+#ifdef __ARCH_WANT_SYS_NICE
-+
-+/*
-+ * sys_nice - change the priority of the current process.
-+ * @increment: priority increment
-+ *
-+ * sys_setpriority is a more generic, but much slower function that
-+ * does similar things.
-+ */
-+SYSCALL_DEFINE1(nice, int, increment)
-+{
-+	long nice, retval;
-+
-+	/*
-+	 * Setpriority might change our priority at the same moment.
-+	 * We don't have to worry. Conceptually one call occurs first
-+	 * and we have a single winner.
-+	 */
-+	if (increment < -40)
-+		increment = -40;
-+	if (increment > 40)
-+		increment = 40;
-+
-+	nice = TASK_NICE(current) + increment;
-+	if (nice < -20)
-+		nice = -20;
-+	if (nice > 19)
-+		nice = 19;
-+
-+	if (increment < 0 && !can_nice(current, nice))
-+		return -EPERM;
-+
-+	retval = security_task_setnice(current, nice);
-+	if (retval)
-+		return retval;
-+
-+	set_user_nice(current, nice);
-+	return 0;
-+}
-+
-+#endif
-+
-+/**
-+ * task_prio - return the priority value of a given task.
-+ * @p: the task in question.
-+ *
-+ * This is the priority value as seen by users in /proc.
-+ * RT tasks are offset by -100. Normal tasks are centered around 1, value goes
-+ * from 0 (SCHED_ISO) up to 82 (nice +19 SCHED_IDLEPRIO).
-+ */
-+int task_prio(const struct task_struct *p)
-+{
-+	int delta, prio = p->prio - MAX_RT_PRIO;
-+
-+	/* rt tasks and iso tasks */
-+	if (prio <= 0)
-+		goto out;
-+
-+	/* Convert to ms to avoid overflows */
-+	delta = NS_TO_MS(p->deadline - grq.niffies);
-+	delta = delta * 40 / ms_longest_deadline_diff();
-+	if (delta > 0 && delta <= 80)
-+		prio += delta;
-+	if (idleprio_task(p))
-+		prio += 40;
-+out:
-+	return prio;
-+}
-+
-+/**
-+ * task_nice - return the nice value of a given task.
-+ * @p: the task in question.
-+ */
-+int task_nice(const struct task_struct *p)
-+{
-+	return TASK_NICE(p);
-+}
-+EXPORT_SYMBOL_GPL(task_nice);
-+
-+/**
-+ * idle_cpu - is a given cpu idle currently?
-+ * @cpu: the processor in question.
-+ */
-+int idle_cpu(int cpu)
-+{
-+	return cpu_curr(cpu) == cpu_rq(cpu)->idle;
-+}
-+
-+/**
-+ * idle_task - return the idle task for a given cpu.
-+ * @cpu: the processor in question.
-+ */
-+struct task_struct *idle_task(int cpu)
-+{
-+	return cpu_rq(cpu)->idle;
-+}
-+
-+/**
-+ * find_process_by_pid - find a process with a matching PID value.
-+ * @pid: the pid in question.
-+ */
-+static inline struct task_struct *find_process_by_pid(pid_t pid)
-+{
-+	return pid ? find_task_by_vpid(pid) : current;
-+}
-+
-+/* Actually do priority change: must hold grq lock. */
-+static void
-+__setscheduler(struct task_struct *p, struct rq *rq, int policy, int prio)
-+{
-+	int oldrtprio, oldprio;
-+
-+	BUG_ON(task_queued(p));
-+
-+	p->policy = policy;
-+	oldrtprio = p->rt_priority;
-+	p->rt_priority = prio;
-+	p->normal_prio = normal_prio(p);
-+	oldprio = p->prio;
-+	/* we are holding p->pi_lock already */
-+	p->prio = rt_mutex_getprio(p);
-+	if (task_running(p)) {
-+		reset_rq_task(rq, p);
-+		/* Resched only if we might now be preempted */
-+		if (p->prio > oldprio || p->rt_priority > oldrtprio)
-+			resched_task(p);
-+	}
-+}
-+
-+/*
-+ * check the target process has a UID that matches the current process's
-+ */
-+static bool check_same_owner(struct task_struct *p)
-+{
-+	const struct cred *cred = current_cred(), *pcred;
-+	bool match;
-+
-+	rcu_read_lock();
-+	pcred = __task_cred(p);
-+	match = (cred->euid == pcred->euid ||
-+		 cred->euid == pcred->uid);
-+	rcu_read_unlock();
-+	return match;
-+}
-+
-+static int __sched_setscheduler(struct task_struct *p, int policy,
-+		       struct sched_param *param, bool user)
-+{
-+	struct sched_param zero_param = { .sched_priority = 0 };
-+	int queued, retval, oldpolicy = -1;
-+	unsigned long flags, rlim_rtprio = 0;
-+	int reset_on_fork;
-+	struct rq *rq;
-+
-+	/* may grab non-irq protected spin_locks */
-+	BUG_ON(in_interrupt());
-+
-+	if (is_rt_policy(policy) && !capable(CAP_SYS_NICE)) {
-+		unsigned long lflags;
-+
-+		if (!lock_task_sighand(p, &lflags))
-+			return -ESRCH;
-+		rlim_rtprio = task_rlimit(p, RLIMIT_RTPRIO);
-+		unlock_task_sighand(p, &lflags);
-+		if (rlim_rtprio)
-+			goto recheck;
-+		/*
-+		 * If the caller requested an RT policy without having the
-+		 * necessary rights, we downgrade the policy to SCHED_ISO.
-+		 * We also set the parameter to zero to pass the checks.
-+		 */
-+		policy = SCHED_ISO;
-+		param = &zero_param;
-+	}
-+recheck:
-+	/* double check policy once rq lock held */
-+	if (policy < 0) {
-+		reset_on_fork = p->sched_reset_on_fork;
-+		policy = oldpolicy = p->policy;
-+	} else {
-+		reset_on_fork = !!(policy & SCHED_RESET_ON_FORK);
-+		policy &= ~SCHED_RESET_ON_FORK;
-+
-+		if (!SCHED_RANGE(policy))
-+			return -EINVAL;
-+	}
-+
-+	/*
-+	 * Valid priorities for SCHED_FIFO and SCHED_RR are
-+	 * 1..MAX_USER_RT_PRIO-1, valid priority for SCHED_NORMAL and
-+	 * SCHED_BATCH is 0.
-+	 */
-+	if (param->sched_priority < 0 ||
-+	    (p->mm && param->sched_priority > MAX_USER_RT_PRIO - 1) ||
-+	    (!p->mm && param->sched_priority > MAX_RT_PRIO - 1))
-+		return -EINVAL;
-+	if (is_rt_policy(policy) != (param->sched_priority != 0))
-+		return -EINVAL;
-+
-+	/*
-+	 * Allow unprivileged RT tasks to decrease priority:
-+	 */
-+	if (user && !capable(CAP_SYS_NICE)) {
-+		if (is_rt_policy(policy)) {
-+			unsigned long rlim_rtprio =
-+					task_rlimit(p, RLIMIT_RTPRIO);
-+
-+			/* can't set/change the rt policy */
-+			if (policy != p->policy && !rlim_rtprio)
-+				return -EPERM;
-+
-+			/* can't increase priority */
-+			if (param->sched_priority > p->rt_priority &&
-+			    param->sched_priority > rlim_rtprio)
-+				return -EPERM;
-+		} else {
-+			switch (p->policy) {
-+				/*
-+				 * Can only downgrade policies but not back to
-+				 * SCHED_NORMAL
-+				 */
-+				case SCHED_ISO:
-+					if (policy == SCHED_ISO)
-+						goto out;
-+					if (policy == SCHED_NORMAL)
-+						return -EPERM;
-+					break;
-+				case SCHED_BATCH:
-+					if (policy == SCHED_BATCH)
-+						goto out;
-+					if (policy != SCHED_IDLEPRIO)
-+						return -EPERM;
-+					break;
-+				case SCHED_IDLEPRIO:
-+					if (policy == SCHED_IDLEPRIO)
-+						goto out;
-+					return -EPERM;
-+				default:
-+					break;
-+			}
-+		}
-+
-+		/* can't change other user's priorities */
-+		if (!check_same_owner(p))
-+			return -EPERM;
-+
-+		/* Normal users shall not reset the sched_reset_on_fork flag */
-+		if (p->sched_reset_on_fork && !reset_on_fork)
-+			return -EPERM;
-+	}
-+
-+	if (user) {
-+		retval = security_task_setscheduler(p);
-+		if (retval)
-+			return retval;
-+	}
-+
-+	/*
-+	 * make sure no PI-waiters arrive (or leave) while we are
-+	 * changing the priority of the task:
-+	 */
-+	raw_spin_lock_irqsave(&p->pi_lock, flags);
-+	/*
-+	 * To be able to change p->policy safely, the apropriate
-+	 * runqueue lock must be held.
-+	 */
-+	rq = __task_grq_lock(p);
-+
-+	/*
-+	 * Changing the policy of the stop threads its a very bad idea
-+	 */
-+	if (p == rq->stop) {
-+		__task_grq_unlock();
-+		raw_spin_unlock_irqrestore(&p->pi_lock, flags);
-+		return -EINVAL;
-+	}
-+
-+	/* recheck policy now with rq lock held */
-+	if (unlikely(oldpolicy != -1 && oldpolicy != p->policy)) {
-+		policy = oldpolicy = -1;
-+		__task_grq_unlock();
-+		raw_spin_unlock_irqrestore(&p->pi_lock, flags);
-+		goto recheck;
-+	}
-+	update_clocks(rq);
-+	p->sched_reset_on_fork = reset_on_fork;
-+
-+	queued = task_queued(p);
-+	if (queued)
-+		dequeue_task(p);
-+	__setscheduler(p, rq, policy, param->sched_priority);
-+	if (queued) {
-+		enqueue_task(p);
-+		try_preempt(p, rq);
-+	}
-+	__task_grq_unlock();
-+	raw_spin_unlock_irqrestore(&p->pi_lock, flags);
-+
-+	rt_mutex_adjust_pi(p);
-+out:
-+	return 0;
-+}
-+
-+/**
-+ * sched_setscheduler - change the scheduling policy and/or RT priority of a thread.
-+ * @p: the task in question.
-+ * @policy: new policy.
-+ * @param: structure containing the new RT priority.
-+ *
-+ * NOTE that the task may be already dead.
-+ */
-+int sched_setscheduler(struct task_struct *p, int policy,
-+		       struct sched_param *param)
-+{
-+	return __sched_setscheduler(p, policy, param, true);
-+}
-+
-+EXPORT_SYMBOL_GPL(sched_setscheduler);
-+
-+/**
-+ * sched_setscheduler_nocheck - change the scheduling policy and/or RT priority of a thread from kernelspace.
-+ * @p: the task in question.
-+ * @policy: new policy.
-+ * @param: structure containing the new RT priority.
-+ *
-+ * Just like sched_setscheduler, only don't bother checking if the
-+ * current context has permission.  For example, this is needed in
-+ * stop_machine(): we create temporary high priority worker threads,
-+ * but our caller might not have that capability.
-+ */
-+int sched_setscheduler_nocheck(struct task_struct *p, int policy,
-+			       struct sched_param *param)
-+{
-+	return __sched_setscheduler(p, policy, param, false);
-+}
-+
-+static int
-+do_sched_setscheduler(pid_t pid, int policy, struct sched_param __user *param)
-+{
-+	struct sched_param lparam;
-+	struct task_struct *p;
-+	int retval;
-+
-+	if (!param || pid < 0)
-+		return -EINVAL;
-+	if (copy_from_user(&lparam, param, sizeof(struct sched_param)))
-+		return -EFAULT;
-+
-+	rcu_read_lock();
-+	retval = -ESRCH;
-+	p = find_process_by_pid(pid);
-+	if (p != NULL)
-+		retval = sched_setscheduler(p, policy, &lparam);
-+	rcu_read_unlock();
-+
-+	return retval;
-+}
-+
-+/**
-+ * sys_sched_setscheduler - set/change the scheduler policy and RT priority
-+ * @pid: the pid in question.
-+ * @policy: new policy.
-+ * @param: structure containing the new RT priority.
-+ */
-+asmlinkage long sys_sched_setscheduler(pid_t pid, int policy,
-+				       struct sched_param __user *param)
-+{
-+	/* negative values for policy are not valid */
-+	if (policy < 0)
-+		return -EINVAL;
-+
-+	return do_sched_setscheduler(pid, policy, param);
-+}
-+
-+/**
-+ * sys_sched_setparam - set/change the RT priority of a thread
-+ * @pid: the pid in question.
-+ * @param: structure containing the new RT priority.
-+ */
-+SYSCALL_DEFINE2(sched_setparam, pid_t, pid, struct sched_param __user *, param)
-+{
-+	return do_sched_setscheduler(pid, -1, param);
-+}
-+
-+/**
-+ * sys_sched_getscheduler - get the policy (scheduling class) of a thread
-+ * @pid: the pid in question.
-+ */
-+SYSCALL_DEFINE1(sched_getscheduler, pid_t, pid)
-+{
-+	struct task_struct *p;
-+	int retval = -EINVAL;
-+
-+	if (pid < 0)
-+		goto out_nounlock;
-+
-+	retval = -ESRCH;
-+	rcu_read_lock();
-+	p = find_process_by_pid(pid);
-+	if (p) {
-+		retval = security_task_getscheduler(p);
-+		if (!retval)
-+			retval = p->policy;
-+	}
-+	rcu_read_unlock();
-+
-+out_nounlock:
-+	return retval;
-+}
-+
-+/**
-+ * sys_sched_getscheduler - get the RT priority of a thread
-+ * @pid: the pid in question.
-+ * @param: structure containing the RT priority.
-+ */
-+SYSCALL_DEFINE2(sched_getparam, pid_t, pid, struct sched_param __user *, param)
-+{
-+	struct sched_param lp;
-+	struct task_struct *p;
-+	int retval = -EINVAL;
-+
-+	if (!param || pid < 0)
-+		goto out_nounlock;
-+
-+	rcu_read_lock();
-+	p = find_process_by_pid(pid);
-+	retval = -ESRCH;
-+	if (!p)
-+		goto out_unlock;
-+
-+	retval = security_task_getscheduler(p);
-+	if (retval)
-+		goto out_unlock;
-+
-+	lp.sched_priority = p->rt_priority;
-+	rcu_read_unlock();
-+
-+	/*
-+	 * This one might sleep, we cannot do it with a spinlock held ...
-+	 */
-+	retval = copy_to_user(param, &lp, sizeof(*param)) ? -EFAULT : 0;
-+
-+out_nounlock:
-+	return retval;
-+
-+out_unlock:
-+	rcu_read_unlock();
-+	return retval;
-+}
-+
-+long sched_setaffinity(pid_t pid, const struct cpumask *in_mask)
-+{
-+	cpumask_var_t cpus_allowed, new_mask;
-+	struct task_struct *p;
-+	int retval;
-+
-+	get_online_cpus();
-+	rcu_read_lock();
-+
-+	p = find_process_by_pid(pid);
-+	if (!p) {
-+		rcu_read_unlock();
-+		put_online_cpus();
-+		return -ESRCH;
-+	}
-+
-+	/* Prevent p going away */
-+	get_task_struct(p);
-+	rcu_read_unlock();
-+
-+	if (!alloc_cpumask_var(&cpus_allowed, GFP_KERNEL)) {
-+		retval = -ENOMEM;
-+		goto out_put_task;
-+	}
-+	if (!alloc_cpumask_var(&new_mask, GFP_KERNEL)) {
-+		retval = -ENOMEM;
-+		goto out_free_cpus_allowed;
-+	}
-+	retval = -EPERM;
-+	if (!check_same_owner(p) && !capable(CAP_SYS_NICE))
-+		goto out_unlock;
-+
-+	retval = security_task_setscheduler(p);
-+	if (retval)
-+		goto out_unlock;
-+
-+	cpuset_cpus_allowed(p, cpus_allowed);
-+	cpumask_and(new_mask, in_mask, cpus_allowed);
-+again:
-+	retval = set_cpus_allowed_ptr(p, new_mask);
-+
-+	if (!retval) {
-+		cpuset_cpus_allowed(p, cpus_allowed);
-+		if (!cpumask_subset(new_mask, cpus_allowed)) {
-+			/*
-+			 * We must have raced with a concurrent cpuset
-+			 * update. Just reset the cpus_allowed to the
-+			 * cpuset's cpus_allowed
-+			 */
-+			cpumask_copy(new_mask, cpus_allowed);
-+			goto again;
-+		}
-+	}
-+out_unlock:
-+	free_cpumask_var(new_mask);
-+out_free_cpus_allowed:
-+	free_cpumask_var(cpus_allowed);
-+out_put_task:
-+	put_task_struct(p);
-+	put_online_cpus();
-+	return retval;
-+}
-+
-+static int get_user_cpu_mask(unsigned long __user *user_mask_ptr, unsigned len,
-+			     cpumask_t *new_mask)
-+{
-+	if (len < sizeof(cpumask_t)) {
-+		memset(new_mask, 0, sizeof(cpumask_t));
-+	} else if (len > sizeof(cpumask_t)) {
-+		len = sizeof(cpumask_t);
-+	}
-+	return copy_from_user(new_mask, user_mask_ptr, len) ? -EFAULT : 0;
-+}
-+
-+
-+/**
-+ * sys_sched_setaffinity - set the cpu affinity of a process
-+ * @pid: pid of the process
-+ * @len: length in bytes of the bitmask pointed to by user_mask_ptr
-+ * @user_mask_ptr: user-space pointer to the new cpu mask
-+ */
-+SYSCALL_DEFINE3(sched_setaffinity, pid_t, pid, unsigned int, len,
-+		unsigned long __user *, user_mask_ptr)
-+{
-+	cpumask_var_t new_mask;
-+	int retval;
-+
-+	if (!alloc_cpumask_var(&new_mask, GFP_KERNEL))
-+		return -ENOMEM;
-+
-+	retval = get_user_cpu_mask(user_mask_ptr, len, new_mask);
-+	if (retval == 0)
-+		retval = sched_setaffinity(pid, new_mask);
-+	free_cpumask_var(new_mask);
-+	return retval;
-+}
-+
-+long sched_getaffinity(pid_t pid, cpumask_t *mask)
-+{
-+	struct task_struct *p;
-+	unsigned long flags;
-+	struct rq *rq;
-+	int retval;
-+
-+	get_online_cpus();
-+	rcu_read_lock();
-+
-+	retval = -ESRCH;
-+	p = find_process_by_pid(pid);
-+	if (!p)
-+		goto out_unlock;
-+
-+	retval = security_task_getscheduler(p);
-+	if (retval)
-+		goto out_unlock;
-+
-+	rq = task_grq_lock(p, &flags);
-+	cpumask_and(mask, &p->cpus_allowed, cpu_online_mask);
-+	task_grq_unlock(&flags);
-+
-+out_unlock:
-+	rcu_read_unlock();
-+	put_online_cpus();
-+
-+	return retval;
-+}
-+
-+/**
-+ * sys_sched_getaffinity - get the cpu affinity of a process
-+ * @pid: pid of the process
-+ * @len: length in bytes of the bitmask pointed to by user_mask_ptr
-+ * @user_mask_ptr: user-space pointer to hold the current cpu mask
-+ */
-+SYSCALL_DEFINE3(sched_getaffinity, pid_t, pid, unsigned int, len,
-+		unsigned long __user *, user_mask_ptr)
-+{
-+	int ret;
-+	cpumask_var_t mask;
-+
-+	if ((len * BITS_PER_BYTE) < nr_cpu_ids)
-+		return -EINVAL;
-+	if (len & (sizeof(unsigned long)-1))
-+		return -EINVAL;
-+
-+	if (!alloc_cpumask_var(&mask, GFP_KERNEL))
-+		return -ENOMEM;
-+
-+	ret = sched_getaffinity(pid, mask);
-+	if (ret == 0) {
-+		size_t retlen = min_t(size_t, len, cpumask_size());
-+
-+		if (copy_to_user(user_mask_ptr, mask, retlen))
-+			ret = -EFAULT;
-+		else
-+			ret = retlen;
-+	}
-+	free_cpumask_var(mask);
-+
-+	return ret;
-+}
-+
-+/**
-+ * sys_sched_yield - yield the current processor to other threads.
-+ *
-+ * This function yields the current CPU to other tasks. It does this by
-+ * scheduling away the current task. If it still has the earliest deadline
-+ * it will be scheduled again as the next task.
-+ */
-+SYSCALL_DEFINE0(sched_yield)
-+{
-+	struct task_struct *p;
-+	struct rq *rq;
-+
-+	p = current;
-+	rq = task_grq_lock_irq(p);
-+	schedstat_inc(rq, yld_count);
-+	requeue_task(p);
-+
-+	/*
-+	 * Since we are going to call schedule() anyway, there's
-+	 * no need to preempt or enable interrupts:
-+	 */
-+	__release(grq.lock);
-+	spin_release(&grq.lock.dep_map, 1, _THIS_IP_);
-+	do_raw_spin_unlock(&grq.lock);
-+	preempt_enable_no_resched();
-+
-+	schedule();
-+
-+	return 0;
-+}
-+
-+static inline int should_resched(void)
-+{
-+	return need_resched() && !(preempt_count() & PREEMPT_ACTIVE);
-+}
-+
-+static void __cond_resched(void)
-+{
-+	/* NOT a real fix but will make voluntary preempt work. 馬鹿な事 */
-+	if (unlikely(system_state != SYSTEM_RUNNING))
-+		return;
-+
-+	add_preempt_count(PREEMPT_ACTIVE);
-+	schedule();
-+	sub_preempt_count(PREEMPT_ACTIVE);
-+}
-+
-+int __sched _cond_resched(void)
-+{
-+	if (should_resched()) {
-+		__cond_resched();
-+		return 1;
-+	}
-+	return 0;
-+}
-+EXPORT_SYMBOL(_cond_resched);
-+
-+/*
-+ * __cond_resched_lock() - if a reschedule is pending, drop the given lock,
-+ * call schedule, and on return reacquire the lock.
-+ *
-+ * This works OK both with and without CONFIG_PREEMPT.  We do strange low-level
-+ * operations here to prevent schedule() from being called twice (once via
-+ * spin_unlock(), once by hand).
-+ */
-+int __cond_resched_lock(spinlock_t *lock)
-+{
-+	int resched = should_resched();
-+	int ret = 0;
-+
-+	lockdep_assert_held(lock);
-+
-+	if (spin_needbreak(lock) || resched) {
-+		spin_unlock(lock);
-+		if (resched)
-+			__cond_resched();
-+		else
-+			cpu_relax();
-+		ret = 1;
-+		spin_lock(lock);
-+	}
-+	return ret;
-+}
-+EXPORT_SYMBOL(__cond_resched_lock);
-+
-+int __sched __cond_resched_softirq(void)
-+{
-+	BUG_ON(!in_softirq());
-+
-+	if (should_resched()) {
-+		local_bh_enable();
-+		__cond_resched();
-+		local_bh_disable();
-+		return 1;
-+	}
-+	return 0;
-+}
-+EXPORT_SYMBOL(__cond_resched_softirq);
-+
-+/**
-+ * yield - yield the current processor to other threads.
-+ *
-+ * This is a shortcut for kernel-space yielding - it marks the
-+ * thread runnable and calls sys_sched_yield().
-+ */
-+void __sched yield(void)
-+{
-+	set_current_state(TASK_RUNNING);
-+	sys_sched_yield();
-+}
-+EXPORT_SYMBOL(yield);
-+
-+/*
-+ * This task is about to go to sleep on IO.  Increment rq->nr_iowait so
-+ * that process accounting knows that this is a task in IO wait state.
-+ *
-+ * But don't do that if it is a deliberate, throttling IO wait (this task
-+ * has set its backing_dev_info: the queue against which it should throttle)
-+ */
-+void __sched io_schedule(void)
-+{
-+	struct rq *rq = raw_rq();
-+
-+	delayacct_blkio_start();
-+	atomic_inc(&rq->nr_iowait);
-+	current->in_iowait = 1;
-+	schedule();
-+	current->in_iowait = 0;
-+	atomic_dec(&rq->nr_iowait);
-+	delayacct_blkio_end();
-+}
-+EXPORT_SYMBOL(io_schedule);
-+
-+long __sched io_schedule_timeout(long timeout)
-+{
-+	struct rq *rq = raw_rq();
-+	long ret;
-+
-+	delayacct_blkio_start();
-+	atomic_inc(&rq->nr_iowait);
-+	current->in_iowait = 1;
-+	ret = schedule_timeout(timeout);
-+	current->in_iowait = 0;
-+	atomic_dec(&rq->nr_iowait);
-+	delayacct_blkio_end();
-+	return ret;
-+}
-+
-+/**
-+ * sys_sched_get_priority_max - return maximum RT priority.
-+ * @policy: scheduling class.
-+ *
-+ * this syscall returns the maximum rt_priority that can be used
-+ * by a given scheduling class.
-+ */
-+SYSCALL_DEFINE1(sched_get_priority_max, int, policy)
-+{
-+	int ret = -EINVAL;
-+
-+	switch (policy) {
-+	case SCHED_FIFO:
-+	case SCHED_RR:
-+		ret = MAX_USER_RT_PRIO-1;
-+		break;
-+	case SCHED_NORMAL:
-+	case SCHED_BATCH:
-+	case SCHED_ISO:
-+	case SCHED_IDLEPRIO:
-+		ret = 0;
-+		break;
-+	}
-+	return ret;
-+}
-+
-+/**
-+ * sys_sched_get_priority_min - return minimum RT priority.
-+ * @policy: scheduling class.
-+ *
-+ * this syscall returns the minimum rt_priority that can be used
-+ * by a given scheduling class.
-+ */
-+SYSCALL_DEFINE1(sched_get_priority_min, int, policy)
-+{
-+	int ret = -EINVAL;
-+
-+	switch (policy) {
-+	case SCHED_FIFO:
-+	case SCHED_RR:
-+		ret = 1;
-+		break;
-+	case SCHED_NORMAL:
-+	case SCHED_BATCH:
-+	case SCHED_ISO:
-+	case SCHED_IDLEPRIO:
-+		ret = 0;
-+		break;
-+	}
-+	return ret;
-+}
-+
-+/**
-+ * sys_sched_rr_get_interval - return the default timeslice of a process.
-+ * @pid: pid of the process.
-+ * @interval: userspace pointer to the timeslice value.
-+ *
-+ * this syscall writes the default timeslice value of a given process
-+ * into the user-space timespec buffer. A value of '0' means infinity.
-+ */
-+SYSCALL_DEFINE2(sched_rr_get_interval, pid_t, pid,
-+		struct timespec __user *, interval)
-+{
-+	struct task_struct *p;
-+	unsigned int time_slice;
-+	unsigned long flags;
-+	struct rq *rq;
-+	int retval;
-+	struct timespec t;
-+
-+	if (pid < 0)
-+		return -EINVAL;
-+
-+	retval = -ESRCH;
-+	rcu_read_lock();
-+	p = find_process_by_pid(pid);
-+	if (!p)
-+		goto out_unlock;
-+
-+	retval = security_task_getscheduler(p);
-+	if (retval)
-+		goto out_unlock;
-+
-+	rq = task_grq_lock(p, &flags);
-+	time_slice = p->policy == SCHED_FIFO ? 0 : MS_TO_NS(task_timeslice(p));
-+	task_grq_unlock(&flags);
-+
-+	rcu_read_unlock();
-+	t = ns_to_timespec(time_slice);
-+	retval = copy_to_user(interval, &t, sizeof(t)) ? -EFAULT : 0;
-+	return retval;
-+
-+out_unlock:
-+	rcu_read_unlock();
-+	return retval;
-+}
-+
-+static const char stat_nam[] = TASK_STATE_TO_CHAR_STR;
-+
-+void sched_show_task(struct task_struct *p)
-+{
-+	unsigned long free = 0;
-+	unsigned state;
-+
-+	state = p->state ? __ffs(p->state) + 1 : 0;
-+	printk(KERN_INFO "%-13.13s %c", p->comm,
-+		state < sizeof(stat_nam) - 1 ? stat_nam[state] : '?');
-+#if BITS_PER_LONG == 32
-+	if (state == TASK_RUNNING)
-+		printk(KERN_CONT " running  ");
-+	else
-+		printk(KERN_CONT " %08lx ", thread_saved_pc(p));
-+#else
-+	if (state == TASK_RUNNING)
-+		printk(KERN_CONT "  running task    ");
-+	else
-+		printk(KERN_CONT " %016lx ", thread_saved_pc(p));
-+#endif
-+#ifdef CONFIG_DEBUG_STACK_USAGE
-+	free = stack_not_used(p);
-+#endif
-+	printk(KERN_CONT "%5lu %5d %6d 0x%08lx\n", free,
-+		task_pid_nr(p), task_pid_nr(p->real_parent),
-+		(unsigned long)task_thread_info(p)->flags);
-+
-+	show_stack(p, NULL);
-+}
-+
-+void show_state_filter(unsigned long state_filter)
-+{
-+	struct task_struct *g, *p;
-+
-+#if BITS_PER_LONG == 32
-+	printk(KERN_INFO
-+		"  task                PC stack   pid father\n");
-+#else
-+	printk(KERN_INFO
-+		"  task                        PC stack   pid father\n");
-+#endif
-+	read_lock(&tasklist_lock);
-+	do_each_thread(g, p) {
-+		/*
-+		 * reset the NMI-timeout, listing all files on a slow
-+		 * console might take alot of time:
-+		 */
-+		touch_nmi_watchdog();
-+		if (!state_filter || (p->state & state_filter))
-+			sched_show_task(p);
-+	} while_each_thread(g, p);
-+
-+	touch_all_softlockup_watchdogs();
-+
-+	read_unlock(&tasklist_lock);
-+	/*
-+	 * Only show locks if all tasks are dumped:
-+	 */
-+	if (!state_filter)
-+		debug_show_all_locks();
-+}
-+
-+/**
-+ * init_idle - set up an idle thread for a given CPU
-+ * @idle: task in question
-+ * @cpu: cpu the idle task belongs to
-+ *
-+ * NOTE: this function does not set the idle thread's NEED_RESCHED
-+ * flag, to make booting more robust.
-+ */
-+void init_idle(struct task_struct *idle, int cpu)
-+{
-+	struct rq *rq = cpu_rq(cpu);
-+	unsigned long flags;
-+
-+	time_grq_lock(rq, &flags);
-+	idle->last_ran = rq->clock;
-+	idle->state = TASK_RUNNING;
-+	/* Setting prio to illegal value shouldn't matter when never queued */
-+	idle->prio = PRIO_LIMIT;
-+	set_rq_task(rq, idle);
-+	idle->cpus_allowed = cpumask_of_cpu(cpu);
-+	/* Silence PROVE_RCU */
-+	rcu_read_lock();
-+	set_task_cpu(idle, cpu);
-+	rcu_read_unlock();
-+	rq->curr = rq->idle = idle;
-+	idle->oncpu = 1;
-+	set_cpuidle_map(cpu);
-+	grq_unlock_irqrestore(&flags);
-+
-+	/* Set the preempt count _outside_ the spinlocks! */
-+#if defined(CONFIG_PREEMPT) && !defined(CONFIG_PREEMPT_BKL)
-+	task_thread_info(idle)->preempt_count = (idle->lock_depth >= 0);
-+#else
-+	task_thread_info(idle)->preempt_count = 0;
-+#endif
-+	ftrace_graph_init_task(idle);
-+}
-+
-+/*
-+ * In a system that switches off the HZ timer nohz_cpu_mask
-+ * indicates which cpus entered this state. This is used
-+ * in the rcu update to wait only for active cpus. For system
-+ * which do not switch off the HZ timer nohz_cpu_mask should
-+ * always be CPU_BITS_NONE.
-+ */
-+cpumask_var_t nohz_cpu_mask;
-+
-+#ifdef CONFIG_SMP
-+#ifdef CONFIG_NO_HZ
-+void select_nohz_load_balancer(int stop_tick)
-+{
-+}
-+#if defined(CONFIG_SCHED_MC) || defined(CONFIG_SCHED_SMT)
-+/**
-+ * lowest_flag_domain - Return lowest sched_domain containing flag.
-+ * @cpu:	The cpu whose lowest level of sched domain is to
-+ *		be returned.
-+ * @flag:	The flag to check for the lowest sched_domain
-+ *		for the given cpu.
-+ *
-+ * Returns the lowest sched_domain of a cpu which contains the given flag.
-+ */
-+static inline struct sched_domain *lowest_flag_domain(int cpu, int flag)
-+{
-+	struct sched_domain *sd;
-+
-+	for_each_domain(cpu, sd)
-+		if (sd && (sd->flags & flag))
-+			break;
-+
-+	return sd;
-+}
-+
-+/**
-+ * for_each_flag_domain - Iterates over sched_domains containing the flag.
-+ * @cpu:	The cpu whose domains we're iterating over.
-+ * @sd:		variable holding the value of the power_savings_sd
-+ *		for cpu.
-+ * @flag:	The flag to filter the sched_domains to be iterated.
-+ *
-+ * Iterates over all the scheduler domains for a given cpu that has the 'flag'
-+ * set, starting from the lowest sched_domain to the highest.
-+ */
-+#define for_each_flag_domain(cpu, sd, flag) \
-+	for (sd = lowest_flag_domain(cpu, flag); \
-+		(sd && (sd->flags & flag)); sd = sd->parent)
-+
-+#endif /*  (CONFIG_SCHED_MC || CONFIG_SCHED_SMT) */
-+
-+static inline void resched_cpu(int cpu)
-+{
-+	unsigned long flags;
-+
-+	grq_lock_irqsave(&flags);
-+	resched_task(cpu_curr(cpu));
-+	grq_unlock_irqrestore(&flags);
-+}
-+
-+/*
-+ * In the semi idle case, use the nearest busy cpu for migrating timers
-+ * from an idle cpu.  This is good for power-savings.
-+ *
-+ * We don't do similar optimization for completely idle system, as
-+ * selecting an idle cpu will add more delays to the timers than intended
-+ * (as that cpu's timer base may not be uptodate wrt jiffies etc).
-+ */
-+int get_nohz_timer_target(void)
-+{
-+	int cpu = smp_processor_id();
-+	int i;
-+	struct sched_domain *sd;
-+
-+	for_each_domain(cpu, sd) {
-+		for_each_cpu(i, sched_domain_span(sd))
-+			if (!idle_cpu(i))
-+				return i;
-+	}
-+	return cpu;
-+}
-+
-+/*
-+ * When add_timer_on() enqueues a timer into the timer wheel of an
-+ * idle CPU then this timer might expire before the next timer event
-+ * which is scheduled to wake up that CPU. In case of a completely
-+ * idle system the next event might even be infinite time into the
-+ * future. wake_up_idle_cpu() ensures that the CPU is woken up and
-+ * leaves the inner idle loop so the newly added timer is taken into
-+ * account when the CPU goes back to idle and evaluates the timer
-+ * wheel for the next timer event.
-+ */
-+void wake_up_idle_cpu(int cpu)
-+{
-+	struct task_struct *idle;
-+	struct rq *rq;
-+
-+	if (cpu == smp_processor_id())
-+		return;
-+
-+	rq = cpu_rq(cpu);
-+	idle = rq->idle;
-+
-+	/*
-+	 * This is safe, as this function is called with the timer
-+	 * wheel base lock of (cpu) held. When the CPU is on the way
-+	 * to idle and has not yet set rq->curr to idle then it will
-+	 * be serialised on the timer wheel base lock and take the new
-+	 * timer into account automatically.
-+	 */
-+	if (unlikely(rq->curr != idle))
-+		return;
-+
-+	/*
-+	 * We can set TIF_RESCHED on the idle task of the other CPU
-+	 * lockless. The worst case is that the other CPU runs the
-+	 * idle task through an additional NOOP schedule()
-+	 */
-+	set_tsk_need_resched(idle);
-+
-+	/* NEED_RESCHED must be visible before we test polling */
-+	smp_mb();
-+	if (!tsk_is_polling(idle))
-+		smp_send_reschedule(cpu);
-+}
-+
-+#endif /* CONFIG_NO_HZ */
-+
-+/*
-+ * Change a given task's CPU affinity. Migrate the thread to a
-+ * proper CPU and schedule it away if the CPU it's executing on
-+ * is removed from the allowed bitmask.
-+ *
-+ * NOTE: the caller must have a valid reference to the task, the
-+ * task must not exit() & deallocate itself prematurely. The
-+ * call is not atomic; no spinlocks may be held.
-+ */
-+int set_cpus_allowed_ptr(struct task_struct *p, const struct cpumask *new_mask)
-+{
-+	unsigned long flags;
-+	int running_wrong = 0;
-+	int queued = 0;
-+	struct rq *rq;
-+	int ret = 0;
-+
-+	rq = task_grq_lock(p, &flags);
-+
-+	if (!cpumask_intersects(new_mask, cpu_active_mask)) {
-+		ret = -EINVAL;
-+		goto out;
-+	}
-+
-+	if (unlikely((p->flags & PF_THREAD_BOUND) && p != current &&
-+		     !cpumask_equal(&p->cpus_allowed, new_mask))) {
-+		ret = -EINVAL;
-+		goto out;
-+	}
-+
-+	queued = task_queued(p);
-+
-+	cpumask_copy(&p->cpus_allowed, new_mask);
-+
-+	/* Can the task run on the task's current CPU? If so, we're done */
-+	if (cpumask_test_cpu(task_cpu(p), new_mask))
-+		goto out;
-+
-+	if (task_running(p)) {
-+		/* Task is running on the wrong cpu now, reschedule it. */
-+		if (rq == this_rq()) {
-+			set_tsk_need_resched(p);
-+			running_wrong = 1;
-+		} else
-+			resched_task(p);
-+	} else
-+		set_task_cpu(p, cpumask_any_and(cpu_active_mask, new_mask));
-+
-+out:
-+	if (queued)
-+		try_preempt(p, rq);
-+	task_grq_unlock(&flags);
-+
-+	if (running_wrong)
-+		_cond_resched();
-+
-+	return ret;
-+}
-+EXPORT_SYMBOL_GPL(set_cpus_allowed_ptr);
-+
-+#ifdef CONFIG_HOTPLUG_CPU
-+/*
-+ * Reschedule a task if it's on a dead CPU.
-+ */
-+void move_task_off_dead_cpu(int dead_cpu, struct task_struct *p)
-+{
-+	unsigned long flags;
-+	struct rq *rq, *dead_rq;
-+
-+	dead_rq = cpu_rq(dead_cpu);
-+	rq = task_grq_lock(p, &flags);
-+	if (rq == dead_rq && task_running(p))
-+		resched_task(p);
-+	task_grq_unlock(&flags);
-+
-+}
-+
-+/* Run through task list and find tasks affined to just the dead cpu, then
-+ * allocate a new affinity */
-+static void break_sole_affinity(int src_cpu)
-+{
-+	struct task_struct *p, *t;
-+
-+	do_each_thread(t, p) {
-+		if (!online_cpus(p)) {
-+			cpumask_copy(&p->cpus_allowed, cpu_possible_mask);
-+			/*
-+			 * Don't tell them about moving exiting tasks or
-+			 * kernel threads (both mm NULL), since they never
-+			 * leave kernel.
-+			 */
-+			if (p->mm && printk_ratelimit()) {
-+				printk(KERN_INFO "process %d (%s) no "
-+				       "longer affine to cpu %d\n",
-+				       task_pid_nr(p), p->comm, src_cpu);
-+			}
-+		}
-+	} while_each_thread(t, p);
-+}
-+
-+/*
-+ * Schedules idle task to be the next runnable task on current CPU.
-+ * It does so by boosting its priority to highest possible.
-+ * Used by CPU offline code.
-+ */
-+void sched_idle_next(void)
-+{
-+	int this_cpu = smp_processor_id();
-+	struct rq *rq = cpu_rq(this_cpu);
-+	struct task_struct *idle = rq->idle;
-+	unsigned long flags;
-+
-+	/* cpu has to be offline */
-+	BUG_ON(cpu_online(this_cpu));
-+
-+	/*
-+	 * Strictly not necessary since rest of the CPUs are stopped by now
-+	 * and interrupts disabled on the current cpu.
-+	 */
-+	grq_lock_irqsave(&flags);
-+	break_sole_affinity(this_cpu);
-+
-+	__setscheduler(idle, rq, SCHED_FIFO, STOP_PRIO);
-+
-+	activate_idle_task(idle);
-+	set_tsk_need_resched(rq->curr);
-+
-+	grq_unlock_irqrestore(&flags);
-+}
-+
-+/*
-+ * Ensures that the idle task is using init_mm right before its cpu goes
-+ * offline.
-+ */
-+void idle_task_exit(void)
-+{
-+	struct mm_struct *mm = current->active_mm;
-+
-+	BUG_ON(cpu_online(smp_processor_id()));
-+
-+	if (mm != &init_mm)
-+		switch_mm(mm, &init_mm, current);
-+	mmdrop(mm);
-+}
-+
-+#endif /* CONFIG_HOTPLUG_CPU */
-+
-+void sched_set_stop_task(int cpu, struct task_struct *stop)
-+{
-+	struct sched_param stop_param = { .sched_priority = STOP_PRIO };
-+	struct sched_param start_param = { .sched_priority = MAX_USER_RT_PRIO - 1 };
-+	struct task_struct *old_stop = cpu_rq(cpu)->stop;
-+
-+	if (stop) {
-+		/*
-+		 * Make it appear like a SCHED_FIFO task, its something
-+		 * userspace knows about and won't get confused about.
-+		 *
-+		 * Also, it will make PI more or less work without too
-+		 * much confusion -- but then, stop work should not
-+		 * rely on PI working anyway.
-+		 */
-+		sched_setscheduler_nocheck(stop, SCHED_FIFO, &stop_param);
-+	}
-+
-+	cpu_rq(cpu)->stop = stop;
-+
-+	if (old_stop) {
-+		/*
-+		 * Reset it back to a normal rt scheduling prio so that
-+		 * it can die in pieces.
-+		 */
-+		sched_setscheduler_nocheck(old_stop, SCHED_FIFO, &start_param);
-+	}
-+}
-+
-+#if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
-+
-+static struct ctl_table sd_ctl_dir[] = {
-+	{
-+		.procname	= "sched_domain",
-+		.mode		= 0555,
-+	},
-+	{}
-+};
-+
-+static struct ctl_table sd_ctl_root[] = {
-+	{
-+		.procname	= "kernel",
-+		.mode		= 0555,
-+		.child		= sd_ctl_dir,
-+	},
-+	{}
-+};
-+
-+static struct ctl_table *sd_alloc_ctl_entry(int n)
-+{
-+	struct ctl_table *entry =
-+		kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
-+
-+	return entry;
-+}
-+
-+static void sd_free_ctl_entry(struct ctl_table **tablep)
-+{
-+	struct ctl_table *entry;
-+
-+	/*
-+	 * In the intermediate directories, both the child directory and
-+	 * procname are dynamically allocated and could fail but the mode
-+	 * will always be set. In the lowest directory the names are
-+	 * static strings and all have proc handlers.
-+	 */
-+	for (entry = *tablep; entry->mode; entry++) {
-+		if (entry->child)
-+			sd_free_ctl_entry(&entry->child);
-+		if (entry->proc_handler == NULL)
-+			kfree(entry->procname);
-+	}
-+
-+	kfree(*tablep);
-+	*tablep = NULL;
-+}
-+
-+static void
-+set_table_entry(struct ctl_table *entry,
-+		const char *procname, void *data, int maxlen,
-+		mode_t mode, proc_handler *proc_handler)
-+{
-+	entry->procname = procname;
-+	entry->data = data;
-+	entry->maxlen = maxlen;
-+	entry->mode = mode;
-+	entry->proc_handler = proc_handler;
-+}
-+
-+static struct ctl_table *
-+sd_alloc_ctl_domain_table(struct sched_domain *sd)
-+{
-+	struct ctl_table *table = sd_alloc_ctl_entry(13);
-+
-+	if (table == NULL)
-+		return NULL;
-+
-+	set_table_entry(&table[0], "min_interval", &sd->min_interval,
-+		sizeof(long), 0644, proc_doulongvec_minmax);
-+	set_table_entry(&table[1], "max_interval", &sd->max_interval,
-+		sizeof(long), 0644, proc_doulongvec_minmax);
-+	set_table_entry(&table[2], "busy_idx", &sd->busy_idx,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[3], "idle_idx", &sd->idle_idx,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[4], "newidle_idx", &sd->newidle_idx,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[5], "wake_idx", &sd->wake_idx,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[6], "forkexec_idx", &sd->forkexec_idx,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[7], "busy_factor", &sd->busy_factor,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[8], "imbalance_pct", &sd->imbalance_pct,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[9], "cache_nice_tries",
-+		&sd->cache_nice_tries,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[10], "flags", &sd->flags,
-+		sizeof(int), 0644, proc_dointvec_minmax);
-+	set_table_entry(&table[11], "name", sd->name,
-+		CORENAME_MAX_SIZE, 0444, proc_dostring);
-+	/* &table[12] is terminator */
-+
-+	return table;
-+}
-+
-+static ctl_table *sd_alloc_ctl_cpu_table(int cpu)
-+{
-+	struct ctl_table *entry, *table;
-+	struct sched_domain *sd;
-+	int domain_num = 0, i;
-+	char buf[32];
-+
-+	for_each_domain(cpu, sd)
-+		domain_num++;
-+	entry = table = sd_alloc_ctl_entry(domain_num + 1);
-+	if (table == NULL)
-+		return NULL;
-+
-+	i = 0;
-+	for_each_domain(cpu, sd) {
-+		snprintf(buf, 32, "domain%d", i);
-+		entry->procname = kstrdup(buf, GFP_KERNEL);
-+		entry->mode = 0555;
-+		entry->child = sd_alloc_ctl_domain_table(sd);
-+		entry++;
-+		i++;
-+	}
-+	return table;
-+}
-+
-+static struct ctl_table_header *sd_sysctl_header;
-+static void register_sched_domain_sysctl(void)
-+{
-+	int i, cpu_num = num_possible_cpus();
-+	struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
-+	char buf[32];
-+
-+	WARN_ON(sd_ctl_dir[0].child);
-+	sd_ctl_dir[0].child = entry;
-+
-+	if (entry == NULL)
-+		return;
-+
-+	for_each_possible_cpu(i) {
-+		snprintf(buf, 32, "cpu%d", i);
-+		entry->procname = kstrdup(buf, GFP_KERNEL);
-+		entry->mode = 0555;
-+		entry->child = sd_alloc_ctl_cpu_table(i);
-+		entry++;
-+	}
-+
-+	WARN_ON(sd_sysctl_header);
-+	sd_sysctl_header = register_sysctl_table(sd_ctl_root);
-+}
-+
-+/* may be called multiple times per register */
-+static void unregister_sched_domain_sysctl(void)
-+{
-+	if (sd_sysctl_header)
-+		unregister_sysctl_table(sd_sysctl_header);
-+	sd_sysctl_header = NULL;
-+	if (sd_ctl_dir[0].child)
-+		sd_free_ctl_entry(&sd_ctl_dir[0].child);
-+}
-+#else
-+static void register_sched_domain_sysctl(void)
-+{
-+}
-+static void unregister_sched_domain_sysctl(void)
-+{
-+}
-+#endif
-+
-+static void set_rq_online(struct rq *rq)
-+{
-+	if (!rq->online) {
-+		cpumask_set_cpu(cpu_of(rq), rq->rd->online);
-+		rq->online = 1;
-+	}
-+}
-+
-+static void set_rq_offline(struct rq *rq)
-+{
-+	if (rq->online) {
-+		cpumask_clear_cpu(cpu_of(rq), rq->rd->online);
-+		rq->online = 0;
-+	}
-+}
-+
-+/*
-+ * migration_call - callback that gets triggered when a CPU is added.
-+ */
-+static int __cpuinit
-+migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
-+{
-+#ifdef CONFIG_HOTPLUG_CPU
-+	struct task_struct *idle;
-+#endif
-+	int cpu = (long)hcpu;
-+	unsigned long flags;
-+	struct rq *rq = cpu_rq(cpu);
-+
-+	switch (action) {
-+
-+	case CPU_UP_PREPARE:
-+	case CPU_UP_PREPARE_FROZEN:
-+		break;
-+
-+	case CPU_ONLINE:
-+	case CPU_ONLINE_FROZEN:
-+		/* Update our root-domain */
-+		grq_lock_irqsave(&flags);
-+		if (rq->rd) {
-+			BUG_ON(!cpumask_test_cpu(cpu, rq->rd->span));
-+
-+			set_rq_online(rq);
-+		}
-+		grq_unlock_irqrestore(&flags);
-+		break;
-+
-+#ifdef CONFIG_HOTPLUG_CPU
-+	case CPU_DEAD:
-+	case CPU_DEAD_FROZEN:
-+		idle = rq->idle;
-+		/* Idle task back to normal (off runqueue, low prio) */
-+		grq_lock_irq();
-+		return_task(idle, 1);
-+		idle->static_prio = MAX_PRIO;
-+		__setscheduler(idle, rq, SCHED_NORMAL, 0);
-+		idle->prio = PRIO_LIMIT;
-+		set_rq_task(rq, idle);
-+		update_clocks(rq);
-+		grq_unlock_irq();
-+		break;
-+
-+	case CPU_DYING:
-+	case CPU_DYING_FROZEN:
-+		/* Update our root-domain */
-+		grq_lock_irqsave(&flags);
-+		if (rq->rd) {
-+			BUG_ON(!cpumask_test_cpu(cpu, rq->rd->span));
-+			set_rq_offline(rq);
-+		}
-+		grq_unlock_irqrestore(&flags);
-+		break;
-+#endif
-+	}
-+	return NOTIFY_OK;
-+}
-+
-+/*
-+ * Register at high priority so that task migration (migrate_all_tasks)
-+ * happens before everything else.  This has to be lower priority than
-+ * the notifier in the perf_counter subsystem, though.
-+ */
-+static struct notifier_block __cpuinitdata migration_notifier = {
-+	.notifier_call = migration_call,
-+	.priority = CPU_PRI_MIGRATION,
-+};
-+
-+static int __cpuinit sched_cpu_active(struct notifier_block *nfb,
-+				      unsigned long action, void *hcpu)
-+{
-+	switch (action & ~CPU_TASKS_FROZEN) {
-+	case CPU_ONLINE:
-+	case CPU_DOWN_FAILED:
-+		set_cpu_active((long)hcpu, true);
-+		return NOTIFY_OK;
-+	default:
-+		return NOTIFY_DONE;
-+	}
-+}
-+
-+static int __cpuinit sched_cpu_inactive(struct notifier_block *nfb,
-+					unsigned long action, void *hcpu)
-+{
-+	switch (action & ~CPU_TASKS_FROZEN) {
-+	case CPU_DOWN_PREPARE:
-+		set_cpu_active((long)hcpu, false);
-+		return NOTIFY_OK;
-+	default:
-+		return NOTIFY_DONE;
-+	}
-+}
-+
-+int __init migration_init(void)
-+{
-+	void *cpu = (void *)(long)smp_processor_id();
-+	int err;
-+
-+	/* Initialise migration for the boot CPU */
-+	err = migration_call(&migration_notifier, CPU_UP_PREPARE, cpu);
-+	BUG_ON(err == NOTIFY_BAD);
-+	migration_call(&migration_notifier, CPU_ONLINE, cpu);
-+	register_cpu_notifier(&migration_notifier);
-+
-+	/* Register cpu active notifiers */
-+	cpu_notifier(sched_cpu_active, CPU_PRI_SCHED_ACTIVE);
-+	cpu_notifier(sched_cpu_inactive, CPU_PRI_SCHED_INACTIVE);
-+
-+	return 0;
-+}
-+early_initcall(migration_init);
-+#endif
-+
-+#ifdef CONFIG_SMP
-+
-+#ifdef CONFIG_SCHED_DEBUG
-+
-+static __read_mostly int sched_domain_debug_enabled;
-+
-+static int __init sched_domain_debug_setup(char *str)
-+{
-+	sched_domain_debug_enabled = 1;
-+
-+	return 0;
-+}
-+early_param("sched_debug", sched_domain_debug_setup);
-+
-+static int sched_domain_debug_one(struct sched_domain *sd, int cpu, int level,
-+				  struct cpumask *groupmask)
-+{
-+	struct sched_group *group = sd->groups;
-+	char str[256];
-+
-+	cpulist_scnprintf(str, sizeof(str), sched_domain_span(sd));
-+	cpumask_clear(groupmask);
-+
-+	printk(KERN_DEBUG "%*s domain %d: ", level, "", level);
-+
-+	if (!(sd->flags & SD_LOAD_BALANCE)) {
-+		printk("does not load-balance\n");
-+		if (sd->parent)
-+			printk(KERN_ERR "ERROR: !SD_LOAD_BALANCE domain"
-+					" has parent");
-+		return -1;
-+	}
-+
-+	printk(KERN_CONT "span %s level %s\n", str, sd->name);
-+
-+	if (!cpumask_test_cpu(cpu, sched_domain_span(sd))) {
-+		printk(KERN_ERR "ERROR: domain->span does not contain "
-+				"CPU%d\n", cpu);
-+	}
-+	if (!cpumask_test_cpu(cpu, sched_group_cpus(group))) {
-+		printk(KERN_ERR "ERROR: domain->groups does not contain"
-+				" CPU%d\n", cpu);
-+	}
-+
-+	printk(KERN_DEBUG "%*s groups:", level + 1, "");
-+	do {
-+		if (!group) {
-+			printk("\n");
-+			printk(KERN_ERR "ERROR: group is NULL\n");
-+			break;
-+		}
-+
-+		if (!group->cpu_power) {
-+			printk(KERN_CONT "\n");
-+			printk(KERN_ERR "ERROR: domain->cpu_power not "
-+					"set\n");
-+			break;
-+		}
-+
-+		if (!cpumask_weight(sched_group_cpus(group))) {
-+			printk(KERN_CONT "\n");
-+			printk(KERN_ERR "ERROR: empty group\n");
-+			break;
-+		}
-+
-+		if (cpumask_intersects(groupmask, sched_group_cpus(group))) {
-+			printk(KERN_CONT "\n");
-+			printk(KERN_ERR "ERROR: repeated CPUs\n");
-+			break;
-+		}
-+
-+		cpumask_or(groupmask, groupmask, sched_group_cpus(group));
-+
-+		cpulist_scnprintf(str, sizeof(str), sched_group_cpus(group));
-+
-+		printk(KERN_CONT " %s", str);
-+		if (group->cpu_power != SCHED_LOAD_SCALE) {
-+			printk(KERN_CONT " (cpu_power = %d)",
-+				group->cpu_power);
-+		}
-+
-+		group = group->next;
-+	} while (group != sd->groups);
-+	printk(KERN_CONT "\n");
-+
-+	if (!cpumask_equal(sched_domain_span(sd), groupmask))
-+		printk(KERN_ERR "ERROR: groups don't span domain->span\n");
-+
-+	if (sd->parent &&
-+	    !cpumask_subset(groupmask, sched_domain_span(sd->parent)))
-+		printk(KERN_ERR "ERROR: parent span is not a superset "
-+			"of domain->span\n");
-+	return 0;
-+}
-+
-+static void sched_domain_debug(struct sched_domain *sd, int cpu)
-+{
-+	cpumask_var_t groupmask;
-+	int level = 0;
-+
-+	if (!sched_domain_debug_enabled)
-+		return;
-+
-+	if (!sd) {
-+		printk(KERN_DEBUG "CPU%d attaching NULL sched-domain.\n", cpu);
-+		return;
-+	}
-+
-+	printk(KERN_DEBUG "CPU%d attaching sched-domain:\n", cpu);
-+
-+	if (!alloc_cpumask_var(&groupmask, GFP_KERNEL)) {
-+		printk(KERN_DEBUG "Cannot load-balance (out of memory)\n");
-+		return;
-+	}
-+
-+	for (;;) {
-+		if (sched_domain_debug_one(sd, cpu, level, groupmask))
-+			break;
-+		level++;
-+		sd = sd->parent;
-+		if (!sd)
-+			break;
-+	}
-+	free_cpumask_var(groupmask);
-+}
-+#else /* !CONFIG_SCHED_DEBUG */
-+# define sched_domain_debug(sd, cpu) do { } while (0)
-+#endif /* CONFIG_SCHED_DEBUG */
-+
-+static int sd_degenerate(struct sched_domain *sd)
-+{
-+	if (cpumask_weight(sched_domain_span(sd)) == 1)
-+		return 1;
-+
-+	/* Following flags need at least 2 groups */
-+	if (sd->flags & (SD_LOAD_BALANCE |
-+			 SD_BALANCE_NEWIDLE |
-+			 SD_BALANCE_FORK |
-+			 SD_BALANCE_EXEC |
-+			 SD_SHARE_CPUPOWER |
-+			 SD_SHARE_PKG_RESOURCES)) {
-+		if (sd->groups != sd->groups->next)
-+			return 0;
-+	}
-+
-+	/* Following flags don't use groups */
-+	if (sd->flags & (SD_WAKE_AFFINE))
-+		return 0;
-+
-+	return 1;
-+}
-+
-+static int
-+sd_parent_degenerate(struct sched_domain *sd, struct sched_domain *parent)
-+{
-+	unsigned long cflags = sd->flags, pflags = parent->flags;
-+
-+	if (sd_degenerate(parent))
-+		return 1;
-+
-+	if (!cpumask_equal(sched_domain_span(sd), sched_domain_span(parent)))
-+		return 0;
-+
-+	/* Flags needing groups don't count if only 1 group in parent */
-+	if (parent->groups == parent->groups->next) {
-+		pflags &= ~(SD_LOAD_BALANCE |
-+				SD_BALANCE_NEWIDLE |
-+				SD_BALANCE_FORK |
-+				SD_BALANCE_EXEC |
-+				SD_SHARE_CPUPOWER |
-+				SD_SHARE_PKG_RESOURCES);
-+		if (nr_node_ids == 1)
-+			pflags &= ~SD_SERIALIZE;
-+	}
-+	if (~cflags & pflags)
-+		return 0;
-+
-+	return 1;
-+}
-+
-+static void free_rootdomain(struct root_domain *rd)
-+{
-+	synchronize_sched();
-+
-+	free_cpumask_var(rd->rto_mask);
-+	free_cpumask_var(rd->online);
-+	free_cpumask_var(rd->span);
-+	kfree(rd);
-+}
-+
-+static void rq_attach_root(struct rq *rq, struct root_domain *rd)
-+{
-+	struct root_domain *old_rd = NULL;
-+	unsigned long flags;
-+
-+	grq_lock_irqsave(&flags);
-+
-+	if (rq->rd) {
-+		old_rd = rq->rd;
-+
-+		if (cpumask_test_cpu(cpu_of(rq), old_rd->online))
-+			set_rq_offline(rq);
-+
-+		cpumask_clear_cpu(cpu_of(rq), old_rd->span);
-+
-+		/*
-+		 * If we dont want to free the old_rt yet then
-+		 * set old_rd to NULL to skip the freeing later
-+		 * in this function:
-+		 */
-+		if (!atomic_dec_and_test(&old_rd->refcount))
-+			old_rd = NULL;
-+	}
-+
-+	atomic_inc(&rd->refcount);
-+	rq->rd = rd;
-+
-+	cpumask_set_cpu(cpu_of(rq), rd->span);
-+	if (cpumask_test_cpu(rq->cpu, cpu_active_mask))
-+		set_rq_online(rq);
-+
-+	grq_unlock_irqrestore(&flags);
-+
-+	if (old_rd)
-+		free_rootdomain(old_rd);
-+}
-+
-+static int init_rootdomain(struct root_domain *rd)
-+{
-+	memset(rd, 0, sizeof(*rd));
-+
-+	if (!alloc_cpumask_var(&rd->span, GFP_KERNEL))
-+		goto out;
-+	if (!alloc_cpumask_var(&rd->online, GFP_KERNEL))
-+		goto free_span;
-+	if (!alloc_cpumask_var(&rd->rto_mask, GFP_KERNEL))
-+		goto free_online;
-+
-+	if (cpupri_init(&rd->cpupri) != 0)
-+		goto free_rto_mask;
-+	return 0;
-+
-+free_rto_mask:
-+	free_cpumask_var(rd->rto_mask);
-+free_online:
-+	free_cpumask_var(rd->online);
-+free_span:
-+	free_cpumask_var(rd->span);
-+out:
-+	return -ENOMEM;
-+}
-+
-+static void init_defrootdomain(void)
-+{
-+	init_rootdomain(&def_root_domain);
-+
-+	atomic_set(&def_root_domain.refcount, 1);
-+}
-+
-+static struct root_domain *alloc_rootdomain(void)
-+{
-+	struct root_domain *rd;
-+
-+	rd = kmalloc(sizeof(*rd), GFP_KERNEL);
-+	if (!rd)
-+		return NULL;
-+
-+	if (init_rootdomain(rd) != 0) {
-+		kfree(rd);
-+		return NULL;
-+	}
-+
-+	return rd;
-+}
-+
-+/*
-+ * Attach the domain 'sd' to 'cpu' as its base domain. Callers must
-+ * hold the hotplug lock.
-+ */
-+static void
-+cpu_attach_domain(struct sched_domain *sd, struct root_domain *rd, int cpu)
-+{
-+	struct rq *rq = cpu_rq(cpu);
-+	struct sched_domain *tmp;
-+
-+	for (tmp = sd; tmp; tmp = tmp->parent)
-+		tmp->span_weight = cpumask_weight(sched_domain_span(tmp));
-+
-+	/* Remove the sched domains which do not contribute to scheduling. */
-+	for (tmp = sd; tmp; ) {
-+		struct sched_domain *parent = tmp->parent;
-+		if (!parent)
-+			break;
-+
-+		if (sd_parent_degenerate(tmp, parent)) {
-+			tmp->parent = parent->parent;
-+			if (parent->parent)
-+				parent->parent->child = tmp;
-+		} else
-+			tmp = tmp->parent;
-+	}
-+
-+	if (sd && sd_degenerate(sd)) {
-+		sd = sd->parent;
-+		if (sd)
-+			sd->child = NULL;
-+	}
-+
-+	sched_domain_debug(sd, cpu);
-+
-+	rq_attach_root(rq, rd);
-+	rcu_assign_pointer(rq->sd, sd);
-+}
-+
-+/* cpus with isolated domains */
-+static cpumask_var_t cpu_isolated_map;
-+
-+/* Setup the mask of cpus configured for isolated domains */
-+static int __init isolated_cpu_setup(char *str)
-+{
-+	alloc_bootmem_cpumask_var(&cpu_isolated_map);
-+	cpulist_parse(str, cpu_isolated_map);
-+	return 1;
-+}
-+
-+__setup("isolcpus=", isolated_cpu_setup);
-+
-+/*
-+ * init_sched_build_groups takes the cpumask we wish to span, and a pointer
-+ * to a function which identifies what group(along with sched group) a CPU
-+ * belongs to. The return value of group_fn must be a >= 0 and < nr_cpu_ids
-+ * (due to the fact that we keep track of groups covered with a struct cpumask).
-+ *
-+ * init_sched_build_groups will build a circular linked list of the groups
-+ * covered by the given span, and will set each group's ->cpumask correctly,
-+ * and ->cpu_power to 0.
-+ */
-+static void
-+init_sched_build_groups(const struct cpumask *span,
-+			const struct cpumask *cpu_map,
-+			int (*group_fn)(int cpu, const struct cpumask *cpu_map,
-+					struct sched_group **sg,
-+					struct cpumask *tmpmask),
-+			struct cpumask *covered, struct cpumask *tmpmask)
-+{
-+	struct sched_group *first = NULL, *last = NULL;
-+	int i;
-+
-+	cpumask_clear(covered);
-+
-+	for_each_cpu(i, span) {
-+		struct sched_group *sg;
-+		int group = group_fn(i, cpu_map, &sg, tmpmask);
-+		int j;
-+
-+		if (cpumask_test_cpu(i, covered))
-+			continue;
-+
-+		cpumask_clear(sched_group_cpus(sg));
-+		sg->cpu_power = 0;
-+
-+		for_each_cpu(j, span) {
-+			if (group_fn(j, cpu_map, NULL, tmpmask) != group)
-+				continue;
-+
-+			cpumask_set_cpu(j, covered);
-+			cpumask_set_cpu(j, sched_group_cpus(sg));
-+		}
-+		if (!first)
-+			first = sg;
-+		if (last)
-+			last->next = sg;
-+		last = sg;
-+	}
-+	last->next = first;
-+}
-+
-+#define SD_NODES_PER_DOMAIN 16
-+
-+#ifdef CONFIG_NUMA
-+
-+/**
-+ * find_next_best_node - find the next node to include in a sched_domain
-+ * @node: node whose sched_domain we're building
-+ * @used_nodes: nodes already in the sched_domain
-+ *
-+ * Find the next node to include in a given scheduling domain. Simply
-+ * finds the closest node not already in the @used_nodes map.
-+ *
-+ * Should use nodemask_t.
-+ */
-+static int find_next_best_node(int node, nodemask_t *used_nodes)
-+{
-+	int i, n, val, min_val, best_node = 0;
-+
-+	min_val = INT_MAX;
-+
-+	for (i = 0; i < nr_node_ids; i++) {
-+		/* Start at @node */
-+		n = (node + i) % nr_node_ids;
-+
-+		if (!nr_cpus_node(n))
-+			continue;
-+
-+		/* Skip already used nodes */
-+		if (node_isset(n, *used_nodes))
-+			continue;
-+
-+		/* Simple min distance search */
-+		val = node_distance(node, n);
-+
-+		if (val < min_val) {
-+			min_val = val;
-+			best_node = n;
-+		}
-+	}
-+
-+	node_set(best_node, *used_nodes);
-+	return best_node;
-+}
-+
-+/**
-+ * sched_domain_node_span - get a cpumask for a node's sched_domain
-+ * @node: node whose cpumask we're constructing
-+ * @span: resulting cpumask
-+ *
-+ * Given a node, construct a good cpumask for its sched_domain to span. It
-+ * should be one that prevents unnecessary balancing, but also spreads tasks
-+ * out optimally.
-+ */
-+static void sched_domain_node_span(int node, struct cpumask *span)
-+{
-+	nodemask_t used_nodes;
-+	int i;
-+
-+	cpumask_clear(span);
-+	nodes_clear(used_nodes);
-+
-+	cpumask_or(span, span, cpumask_of_node(node));
-+	node_set(node, used_nodes);
-+
-+	for (i = 1; i < SD_NODES_PER_DOMAIN; i++) {
-+		int next_node = find_next_best_node(node, &used_nodes);
-+
-+		cpumask_or(span, span, cpumask_of_node(next_node));
-+	}
-+}
-+#endif /* CONFIG_NUMA */
-+
-+int sched_smt_power_savings = 0, sched_mc_power_savings = 0;
-+
-+/*
-+ * The cpus mask in sched_group and sched_domain hangs off the end.
-+ *
-+ * ( See the the comments in include/linux/sched.h:struct sched_group
-+ *   and struct sched_domain. )
-+ */
-+struct static_sched_group {
-+	struct sched_group sg;
-+	DECLARE_BITMAP(cpus, CONFIG_NR_CPUS);
-+};
-+
-+struct static_sched_domain {
-+	struct sched_domain sd;
-+	DECLARE_BITMAP(span, CONFIG_NR_CPUS);
-+};
-+
-+struct s_data {
-+#ifdef CONFIG_NUMA
-+	int			sd_allnodes;
-+	cpumask_var_t		domainspan;
-+	cpumask_var_t		covered;
-+	cpumask_var_t		notcovered;
-+#endif
-+	cpumask_var_t		nodemask;
-+	cpumask_var_t		this_sibling_map;
-+	cpumask_var_t		this_core_map;
-+	cpumask_var_t		this_book_map;
-+	cpumask_var_t		send_covered;
-+	cpumask_var_t		tmpmask;
-+	struct sched_group	**sched_group_nodes;
-+	struct root_domain	*rd;
-+};
-+
-+enum s_alloc {
-+	sa_sched_groups = 0,
-+	sa_rootdomain,
-+	sa_tmpmask,
-+	sa_send_covered,
-+	sa_this_book_map,
-+	sa_this_core_map,
-+	sa_this_sibling_map,
-+	sa_nodemask,
-+	sa_sched_group_nodes,
-+#ifdef CONFIG_NUMA
-+	sa_notcovered,
-+	sa_covered,
-+	sa_domainspan,
-+#endif
-+	sa_none,
-+};
-+
-+/*
-+ * SMT sched-domains:
-+ */
-+#ifdef CONFIG_SCHED_SMT
-+static DEFINE_PER_CPU(struct static_sched_domain, cpu_domains);
-+static DEFINE_PER_CPU(struct static_sched_group, sched_groups);
-+
-+static int
-+cpu_to_cpu_group(int cpu, const struct cpumask *cpu_map,
-+		 struct sched_group **sg, struct cpumask *unused)
-+{
-+	if (sg)
-+		*sg = &per_cpu(sched_groups, cpu).sg;
-+	return cpu;
-+}
-+#endif /* CONFIG_SCHED_SMT */
-+
-+/*
-+ * multi-core sched-domains:
-+ */
-+#ifdef CONFIG_SCHED_MC
-+static DEFINE_PER_CPU(struct static_sched_domain, core_domains);
-+static DEFINE_PER_CPU(struct static_sched_group, sched_group_core);
-+
-+static int
-+cpu_to_core_group(int cpu, const struct cpumask *cpu_map,
-+		  struct sched_group **sg, struct cpumask *mask)
-+{
-+	int group;
-+#ifdef CONFIG_SCHED_SMT
-+	cpumask_and(mask, topology_thread_cpumask(cpu), cpu_map);
-+	group = cpumask_first(mask);
-+#else
-+	group = cpu;
-+#endif
-+	if (sg)
-+		*sg = &per_cpu(sched_group_core, group).sg;
-+	return group;
-+}
-+#endif /* CONFIG_SCHED_MC */
-+
-+/*
-+ * book sched-domains:
-+ */
-+#ifdef CONFIG_SCHED_BOOK
-+static DEFINE_PER_CPU(struct static_sched_domain, book_domains);
-+static DEFINE_PER_CPU(struct static_sched_group, sched_group_book);
-+
-+static int
-+cpu_to_book_group(int cpu, const struct cpumask *cpu_map,
-+		  struct sched_group **sg, struct cpumask *mask)
-+{
-+	int group = cpu;
-+#ifdef CONFIG_SCHED_MC
-+	cpumask_and(mask, cpu_coregroup_mask(cpu), cpu_map);
-+	group = cpumask_first(mask);
-+#elif defined(CONFIG_SCHED_SMT)
-+	cpumask_and(mask, topology_thread_cpumask(cpu), cpu_map);
-+	group = cpumask_first(mask);
-+#endif
-+	if (sg)
-+		*sg = &per_cpu(sched_group_book, group).sg;
-+	return group;
-+}
-+#endif /* CONFIG_SCHED_BOOK */
-+
-+static DEFINE_PER_CPU(struct static_sched_domain, phys_domains);
-+static DEFINE_PER_CPU(struct static_sched_group, sched_group_phys);
-+
-+static int
-+cpu_to_phys_group(int cpu, const struct cpumask *cpu_map,
-+		  struct sched_group **sg, struct cpumask *mask)
-+{
-+	int group;
-+#ifdef CONFIG_SCHED_BOOK
-+	cpumask_and(mask, cpu_book_mask(cpu), cpu_map);
-+	group = cpumask_first(mask);
-+#elif defined(CONFIG_SCHED_MC)
-+	cpumask_and(mask, cpu_coregroup_mask(cpu), cpu_map);
-+	group = cpumask_first(mask);
-+#elif defined(CONFIG_SCHED_SMT)
-+	cpumask_and(mask, topology_thread_cpumask(cpu), cpu_map);
-+	group = cpumask_first(mask);
-+#else
-+	group = cpu;
-+#endif
-+	if (sg)
-+		*sg = &per_cpu(sched_group_phys, group).sg;
-+	return group;
-+}
-+
-+/**
-+ * group_first_cpu - Returns the first cpu in the cpumask of a sched_group.
-+ * @group: The group whose first cpu is to be returned.
-+ */
-+static inline unsigned int group_first_cpu(struct sched_group *group)
-+{
-+	return cpumask_first(sched_group_cpus(group));
-+}
-+
-+#ifdef CONFIG_NUMA
-+/*
-+ * The init_sched_build_groups can't handle what we want to do with node
-+ * groups, so roll our own. Now each node has its own list of groups which
-+ * gets dynamically allocated.
-+ */
-+static DEFINE_PER_CPU(struct static_sched_domain, node_domains);
-+static struct sched_group ***sched_group_nodes_bycpu;
-+
-+static DEFINE_PER_CPU(struct static_sched_domain, allnodes_domains);
-+static DEFINE_PER_CPU(struct static_sched_group, sched_group_allnodes);
-+
-+static int cpu_to_allnodes_group(int cpu, const struct cpumask *cpu_map,
-+				 struct sched_group **sg,
-+				 struct cpumask *nodemask)
-+{
-+	int group;
-+
-+	cpumask_and(nodemask, cpumask_of_node(cpu_to_node(cpu)), cpu_map);
-+	group = cpumask_first(nodemask);
-+
-+	if (sg)
-+		*sg = &per_cpu(sched_group_allnodes, group).sg;
-+	return group;
-+}
-+
-+static void init_numa_sched_groups_power(struct sched_group *group_head)
-+{
-+	struct sched_group *sg = group_head;
-+	int j;
-+
-+	if (!sg)
-+		return;
-+	do {
-+		for_each_cpu(j, sched_group_cpus(sg)) {
-+			struct sched_domain *sd;
-+
-+			sd = &per_cpu(phys_domains, j).sd;
-+			if (j != group_first_cpu(sd->groups)) {
-+				/*
-+				 * Only add "power" once for each
-+				 * physical package.
-+				 */
-+				continue;
-+			}
-+
-+			sg->cpu_power += sd->groups->cpu_power;
-+		}
-+		sg = sg->next;
-+	} while (sg != group_head);
-+}
-+
-+static int build_numa_sched_groups(struct s_data *d,
-+				   const struct cpumask *cpu_map, int num)
-+{
-+	struct sched_domain *sd;
-+	struct sched_group *sg, *prev;
-+	int n, j;
-+
-+	cpumask_clear(d->covered);
-+	cpumask_and(d->nodemask, cpumask_of_node(num), cpu_map);
-+	if (cpumask_empty(d->nodemask)) {
-+		d->sched_group_nodes[num] = NULL;
-+		goto out;
-+	}
-+
-+	sched_domain_node_span(num, d->domainspan);
-+	cpumask_and(d->domainspan, d->domainspan, cpu_map);
-+
-+	sg = kmalloc_node(sizeof(struct sched_group) + cpumask_size(),
-+			  GFP_KERNEL, num);
-+	if (!sg) {
-+		printk(KERN_WARNING "Can not alloc domain group for node %d\n",
-+		       num);
-+		return -ENOMEM;
-+	}
-+	d->sched_group_nodes[num] = sg;
-+
-+	for_each_cpu(j, d->nodemask) {
-+		sd = &per_cpu(node_domains, j).sd;
-+		sd->groups = sg;
-+	}
-+
-+	sg->cpu_power = 0;
-+	cpumask_copy(sched_group_cpus(sg), d->nodemask);
-+	sg->next = sg;
-+	cpumask_or(d->covered, d->covered, d->nodemask);
-+
-+	prev = sg;
-+	for (j = 0; j < nr_node_ids; j++) {
-+		n = (num + j) % nr_node_ids;
-+		cpumask_complement(d->notcovered, d->covered);
-+		cpumask_and(d->tmpmask, d->notcovered, cpu_map);
-+		cpumask_and(d->tmpmask, d->tmpmask, d->domainspan);
-+		if (cpumask_empty(d->tmpmask))
-+			break;
-+		cpumask_and(d->tmpmask, d->tmpmask, cpumask_of_node(n));
-+		if (cpumask_empty(d->tmpmask))
-+			continue;
-+		sg = kmalloc_node(sizeof(struct sched_group) + cpumask_size(),
-+				  GFP_KERNEL, num);
-+		if (!sg) {
-+			printk(KERN_WARNING
-+			       "Can not alloc domain group for node %d\n", j);
-+			return -ENOMEM;
-+		}
-+		sg->cpu_power = 0;
-+		cpumask_copy(sched_group_cpus(sg), d->tmpmask);
-+		sg->next = prev->next;
-+		cpumask_or(d->covered, d->covered, d->tmpmask);
-+		prev->next = sg;
-+		prev = sg;
-+	}
-+out:
-+	return 0;
-+}
-+#endif /* CONFIG_NUMA */
-+
-+#ifdef CONFIG_NUMA
-+/* Free memory allocated for various sched_group structures */
-+static void free_sched_groups(const struct cpumask *cpu_map,
-+			      struct cpumask *nodemask)
-+{
-+	int cpu, i;
-+
-+	for_each_cpu(cpu, cpu_map) {
-+		struct sched_group **sched_group_nodes
-+			= sched_group_nodes_bycpu[cpu];
-+
-+		if (!sched_group_nodes)
-+			continue;
-+
-+		for (i = 0; i < nr_node_ids; i++) {
-+			struct sched_group *oldsg, *sg = sched_group_nodes[i];
-+
-+			cpumask_and(nodemask, cpumask_of_node(i), cpu_map);
-+			if (cpumask_empty(nodemask))
-+				continue;
-+
-+			if (sg == NULL)
-+				continue;
-+			sg = sg->next;
-+next_sg:
-+			oldsg = sg;
-+			sg = sg->next;
-+			kfree(oldsg);
-+			if (oldsg != sched_group_nodes[i])
-+				goto next_sg;
-+		}
-+		kfree(sched_group_nodes);
-+		sched_group_nodes_bycpu[cpu] = NULL;
-+	}
-+}
-+#else /* !CONFIG_NUMA */
-+static void free_sched_groups(const struct cpumask *cpu_map,
-+			      struct cpumask *nodemask)
-+{
-+}
-+#endif /* CONFIG_NUMA */
-+
-+/*
-+ * Initialise sched groups cpu_power.
-+ *
-+ * cpu_power indicates the capacity of sched group, which is used while
-+ * distributing the load between different sched groups in a sched domain.
-+ * Typically cpu_power for all the groups in a sched domain will be same unless
-+ * there are asymmetries in the topology. If there are asymmetries, group
-+ * having more cpu_power will pickup more load compared to the group having
-+ * less cpu_power.
-+ *
-+ * cpu_power will be a multiple of SCHED_LOAD_SCALE. This multiple represents
-+ * the maximum number of tasks a group can handle in the presence of other idle
-+ * or lightly loaded groups in the same sched domain.
-+ */
-+static void init_sched_groups_power(int cpu, struct sched_domain *sd)
-+{
-+	struct sched_domain *child;
-+	struct sched_group *group;
-+	long power;
-+	int weight;
-+
-+	WARN_ON(!sd || !sd->groups);
-+
-+	if (cpu != group_first_cpu(sd->groups))
-+		return;
-+
-+	sd->groups->group_weight = cpumask_weight(sched_group_cpus(sd->groups));
-+
-+	child = sd->child;
-+
-+	sd->groups->cpu_power = 0;
-+
-+	if (!child) {
-+		power = SCHED_LOAD_SCALE;
-+		weight = cpumask_weight(sched_domain_span(sd));
-+		/*
-+		 * SMT siblings share the power of a single core.
-+		 * Usually multiple threads get a better yield out of
-+		 * that one core than a single thread would have,
-+		 * reflect that in sd->smt_gain.
-+		 */
-+		if ((sd->flags & SD_SHARE_CPUPOWER) && weight > 1) {
-+			power *= sd->smt_gain;
-+			power /= weight;
-+			power >>= SCHED_LOAD_SHIFT;
-+		}
-+		sd->groups->cpu_power += power;
-+		return;
-+	}
-+
-+	/*
-+	 * Add cpu_power of each child group to this groups cpu_power
-+	 */
-+	group = child->groups;
-+	do {
-+		sd->groups->cpu_power += group->cpu_power;
-+		group = group->next;
-+	} while (group != child->groups);
-+}
-+
-+/*
-+ * Initialisers for schedule domains
-+ * Non-inlined to reduce accumulated stack pressure in build_sched_domains()
-+ */
-+
-+#ifdef CONFIG_SCHED_DEBUG
-+# define SD_INIT_NAME(sd, type)		sd->name = #type
-+#else
-+# define SD_INIT_NAME(sd, type)		do { } while (0)
-+#endif
-+
-+#define	SD_INIT(sd, type)	sd_init_##type(sd)
-+
-+#define SD_INIT_FUNC(type)	\
-+static noinline void sd_init_##type(struct sched_domain *sd)	\
-+{								\
-+	memset(sd, 0, sizeof(*sd));				\
-+	*sd = SD_##type##_INIT;					\
-+	sd->level = SD_LV_##type;				\
-+	SD_INIT_NAME(sd, type);					\
-+}
-+
-+SD_INIT_FUNC(CPU)
-+#ifdef CONFIG_NUMA
-+ SD_INIT_FUNC(ALLNODES)
-+ SD_INIT_FUNC(NODE)
-+#endif
-+#ifdef CONFIG_SCHED_SMT
-+ SD_INIT_FUNC(SIBLING)
-+#endif
-+#ifdef CONFIG_SCHED_MC
-+ SD_INIT_FUNC(MC)
-+#endif
-+#ifdef CONFIG_SCHED_BOOK
-+ SD_INIT_FUNC(BOOK)
-+#endif
-+
-+static int default_relax_domain_level = -1;
-+
-+static int __init setup_relax_domain_level(char *str)
-+{
-+	unsigned long val;
-+
-+	val = simple_strtoul(str, NULL, 0);
-+	if (val < SD_LV_MAX)
-+		default_relax_domain_level = val;
-+
-+	return 1;
-+}
-+__setup("relax_domain_level=", setup_relax_domain_level);
-+
-+static void set_domain_attribute(struct sched_domain *sd,
-+				 struct sched_domain_attr *attr)
-+{
-+	int request;
-+
-+	if (!attr || attr->relax_domain_level < 0) {
-+		if (default_relax_domain_level < 0)
-+			return;
-+		else
-+			request = default_relax_domain_level;
-+	} else
-+		request = attr->relax_domain_level;
-+	if (request < sd->level) {
-+		/* turn off idle balance on this domain */
-+		sd->flags &= ~(SD_BALANCE_WAKE|SD_BALANCE_NEWIDLE);
-+	} else {
-+		/* turn on idle balance on this domain */
-+		sd->flags |= (SD_BALANCE_WAKE|SD_BALANCE_NEWIDLE);
-+	}
-+}
-+
-+static void __free_domain_allocs(struct s_data *d, enum s_alloc what,
-+				 const struct cpumask *cpu_map)
-+{
-+	switch (what) {
-+	case sa_sched_groups:
-+		free_sched_groups(cpu_map, d->tmpmask); /* fall through */
-+		d->sched_group_nodes = NULL;
-+	case sa_rootdomain:
-+		free_rootdomain(d->rd); /* fall through */
-+	case sa_tmpmask:
-+		free_cpumask_var(d->tmpmask); /* fall through */
-+	case sa_send_covered:
-+		free_cpumask_var(d->send_covered); /* fall through */
-+	case sa_this_book_map:
-+		free_cpumask_var(d->this_book_map); /* fall through */
-+	case sa_this_core_map:
-+		free_cpumask_var(d->this_core_map); /* fall through */
-+	case sa_this_sibling_map:
-+		free_cpumask_var(d->this_sibling_map); /* fall through */
-+	case sa_nodemask:
-+		free_cpumask_var(d->nodemask); /* fall through */
-+	case sa_sched_group_nodes:
-+#ifdef CONFIG_NUMA
-+		kfree(d->sched_group_nodes); /* fall through */
-+	case sa_notcovered:
-+		free_cpumask_var(d->notcovered); /* fall through */
-+	case sa_covered:
-+		free_cpumask_var(d->covered); /* fall through */
-+	case sa_domainspan:
-+		free_cpumask_var(d->domainspan); /* fall through */
-+#endif
-+	case sa_none:
-+		break;
-+	}
-+}
-+
-+static enum s_alloc __visit_domain_allocation_hell(struct s_data *d,
-+						   const struct cpumask *cpu_map)
-+{
-+#ifdef CONFIG_NUMA
-+	if (!alloc_cpumask_var(&d->domainspan, GFP_KERNEL))
-+		return sa_none;
-+	if (!alloc_cpumask_var(&d->covered, GFP_KERNEL))
-+		return sa_domainspan;
-+	if (!alloc_cpumask_var(&d->notcovered, GFP_KERNEL))
-+		return sa_covered;
-+	/* Allocate the per-node list of sched groups */
-+	d->sched_group_nodes = kcalloc(nr_node_ids,
-+				      sizeof(struct sched_group *), GFP_KERNEL);
-+	if (!d->sched_group_nodes) {
-+		printk(KERN_WARNING "Can not alloc sched group node list\n");
-+		return sa_notcovered;
-+	}
-+	sched_group_nodes_bycpu[cpumask_first(cpu_map)] = d->sched_group_nodes;
-+#endif
-+	if (!alloc_cpumask_var(&d->nodemask, GFP_KERNEL))
-+		return sa_sched_group_nodes;
-+	if (!alloc_cpumask_var(&d->this_sibling_map, GFP_KERNEL))
-+		return sa_nodemask;
-+	if (!alloc_cpumask_var(&d->this_core_map, GFP_KERNEL))
-+		return sa_this_sibling_map;
-+	if (!alloc_cpumask_var(&d->this_book_map, GFP_KERNEL))
-+		return sa_this_core_map;
-+	if (!alloc_cpumask_var(&d->send_covered, GFP_KERNEL))
-+		return sa_this_book_map;
-+	if (!alloc_cpumask_var(&d->tmpmask, GFP_KERNEL))
-+		return sa_send_covered;
-+	d->rd = alloc_rootdomain();
-+	if (!d->rd) {
-+		printk(KERN_WARNING "Cannot alloc root domain\n");
-+		return sa_tmpmask;
-+	}
-+	return sa_rootdomain;
-+}
-+
-+static struct sched_domain *__build_numa_sched_domains(struct s_data *d,
-+	const struct cpumask *cpu_map, struct sched_domain_attr *attr, int i)
-+{
-+	struct sched_domain *sd = NULL;
-+#ifdef CONFIG_NUMA
-+	struct sched_domain *parent;
-+
-+	d->sd_allnodes = 0;
-+	if (cpumask_weight(cpu_map) >
-+	    SD_NODES_PER_DOMAIN * cpumask_weight(d->nodemask)) {
-+		sd = &per_cpu(allnodes_domains, i).sd;
-+		SD_INIT(sd, ALLNODES);
-+		set_domain_attribute(sd, attr);
-+		cpumask_copy(sched_domain_span(sd), cpu_map);
-+		cpu_to_allnodes_group(i, cpu_map, &sd->groups, d->tmpmask);
-+		d->sd_allnodes = 1;
-+	}
-+	parent = sd;
-+
-+	sd = &per_cpu(node_domains, i).sd;
-+	SD_INIT(sd, NODE);
-+	set_domain_attribute(sd, attr);
-+	sched_domain_node_span(cpu_to_node(i), sched_domain_span(sd));
-+	sd->parent = parent;
-+	if (parent)
-+		parent->child = sd;
-+	cpumask_and(sched_domain_span(sd), sched_domain_span(sd), cpu_map);
-+#endif
-+	return sd;
-+}
-+
-+static struct sched_domain *__build_cpu_sched_domain(struct s_data *d,
-+	const struct cpumask *cpu_map, struct sched_domain_attr *attr,
-+	struct sched_domain *parent, int i)
-+{
-+	struct sched_domain *sd;
-+	sd = &per_cpu(phys_domains, i).sd;
-+	SD_INIT(sd, CPU);
-+	set_domain_attribute(sd, attr);
-+	cpumask_copy(sched_domain_span(sd), d->nodemask);
-+	sd->parent = parent;
-+	if (parent)
-+		parent->child = sd;
-+	cpu_to_phys_group(i, cpu_map, &sd->groups, d->tmpmask);
-+	return sd;
-+}
-+
-+static struct sched_domain *__build_book_sched_domain(struct s_data *d,
-+	const struct cpumask *cpu_map, struct sched_domain_attr *attr,
-+	struct sched_domain *parent, int i)
-+{
-+	struct sched_domain *sd = parent;
-+#ifdef CONFIG_SCHED_BOOK
-+	sd = &per_cpu(book_domains, i).sd;
-+	SD_INIT(sd, BOOK);
-+	set_domain_attribute(sd, attr);
-+	cpumask_and(sched_domain_span(sd), cpu_map, cpu_book_mask(i));
-+	sd->parent = parent;
-+	parent->child = sd;
-+	cpu_to_book_group(i, cpu_map, &sd->groups, d->tmpmask);
-+#endif
-+	return sd;
-+}
-+
-+static struct sched_domain *__build_mc_sched_domain(struct s_data *d,
-+	const struct cpumask *cpu_map, struct sched_domain_attr *attr,
-+	struct sched_domain *parent, int i)
-+{
-+	struct sched_domain *sd = parent;
-+#ifdef CONFIG_SCHED_MC
-+	sd = &per_cpu(core_domains, i).sd;
-+	SD_INIT(sd, MC);
-+	set_domain_attribute(sd, attr);
-+	cpumask_and(sched_domain_span(sd), cpu_map, cpu_coregroup_mask(i));
-+	sd->parent = parent;
-+	parent->child = sd;
-+	cpu_to_core_group(i, cpu_map, &sd->groups, d->tmpmask);
-+#endif
-+	return sd;
-+}
-+
-+static struct sched_domain *__build_smt_sched_domain(struct s_data *d,
-+	const struct cpumask *cpu_map, struct sched_domain_attr *attr,
-+	struct sched_domain *parent, int i)
-+{
-+	struct sched_domain *sd = parent;
-+#ifdef CONFIG_SCHED_SMT
-+	sd = &per_cpu(cpu_domains, i).sd;
-+	SD_INIT(sd, SIBLING);
-+	set_domain_attribute(sd, attr);
-+	cpumask_and(sched_domain_span(sd), cpu_map, topology_thread_cpumask(i));
-+	sd->parent = parent;
-+	parent->child = sd;
-+	cpu_to_cpu_group(i, cpu_map, &sd->groups, d->tmpmask);
-+#endif
-+	return sd;
-+}
-+
-+static void build_sched_groups(struct s_data *d, enum sched_domain_level l,
-+			       const struct cpumask *cpu_map, int cpu)
-+{
-+	switch (l) {
-+#ifdef CONFIG_SCHED_SMT
-+	case SD_LV_SIBLING: /* set up CPU (sibling) groups */
-+		cpumask_and(d->this_sibling_map, cpu_map,
-+			    topology_thread_cpumask(cpu));
-+		if (cpu == cpumask_first(d->this_sibling_map))
-+			init_sched_build_groups(d->this_sibling_map, cpu_map,
-+						&cpu_to_cpu_group,
-+						d->send_covered, d->tmpmask);
-+		break;
-+#endif
-+#ifdef CONFIG_SCHED_MC
-+	case SD_LV_MC: /* set up multi-core groups */
-+		cpumask_and(d->this_core_map, cpu_map, cpu_coregroup_mask(cpu));
-+		if (cpu == cpumask_first(d->this_core_map))
-+			init_sched_build_groups(d->this_core_map, cpu_map,
-+						&cpu_to_core_group,
-+						d->send_covered, d->tmpmask);
-+		break;
-+#endif
-+#ifdef CONFIG_SCHED_BOOK
-+	case SD_LV_BOOK: /* set up book groups */
-+		cpumask_and(d->this_book_map, cpu_map, cpu_book_mask(cpu));
-+		if (cpu == cpumask_first(d->this_book_map))
-+			init_sched_build_groups(d->this_book_map, cpu_map,
-+						&cpu_to_book_group,
-+						d->send_covered, d->tmpmask);
-+		break;
-+#endif
-+	case SD_LV_CPU: /* set up physical groups */
-+		cpumask_and(d->nodemask, cpumask_of_node(cpu), cpu_map);
-+		if (!cpumask_empty(d->nodemask))
-+			init_sched_build_groups(d->nodemask, cpu_map,
-+						&cpu_to_phys_group,
-+						d->send_covered, d->tmpmask);
-+		break;
-+#ifdef CONFIG_NUMA
-+	case SD_LV_ALLNODES:
-+		init_sched_build_groups(cpu_map, cpu_map, &cpu_to_allnodes_group,
-+					d->send_covered, d->tmpmask);
-+		break;
-+#endif
-+	default:
-+		break;
-+	}
-+}
-+
-+/*
-+ * Build sched domains for a given set of cpus and attach the sched domains
-+ * to the individual cpus
-+ */
-+static int __build_sched_domains(const struct cpumask *cpu_map,
-+				 struct sched_domain_attr *attr)
-+{
-+	enum s_alloc alloc_state = sa_none;
-+	struct s_data d;
-+	struct sched_domain *sd;
-+	int i;
-+#ifdef CONFIG_NUMA
-+	d.sd_allnodes = 0;
-+#endif
-+
-+	alloc_state = __visit_domain_allocation_hell(&d, cpu_map);
-+	if (alloc_state != sa_rootdomain)
-+		goto error;
-+	alloc_state = sa_sched_groups;
-+
-+	/*
-+	 * Set up domains for cpus specified by the cpu_map.
-+	 */
-+	for_each_cpu(i, cpu_map) {
-+		cpumask_and(d.nodemask, cpumask_of_node(cpu_to_node(i)),
-+			    cpu_map);
-+
-+		sd = __build_numa_sched_domains(&d, cpu_map, attr, i);
-+		sd = __build_cpu_sched_domain(&d, cpu_map, attr, sd, i);
-+		sd = __build_book_sched_domain(&d, cpu_map, attr, sd, i);
-+		sd = __build_mc_sched_domain(&d, cpu_map, attr, sd, i);
-+		sd = __build_smt_sched_domain(&d, cpu_map, attr, sd, i);
-+	}
-+
-+	for_each_cpu(i, cpu_map) {
-+		build_sched_groups(&d, SD_LV_SIBLING, cpu_map, i);
-+		build_sched_groups(&d, SD_LV_BOOK, cpu_map, i);
-+		build_sched_groups(&d, SD_LV_MC, cpu_map, i);
-+	}
-+
-+	/* Set up physical groups */
-+	for (i = 0; i < nr_node_ids; i++)
-+		build_sched_groups(&d, SD_LV_CPU, cpu_map, i);
-+
-+#ifdef CONFIG_NUMA
-+	/* Set up node groups */
-+	if (d.sd_allnodes)
-+		build_sched_groups(&d, SD_LV_ALLNODES, cpu_map, 0);
-+
-+	for (i = 0; i < nr_node_ids; i++)
-+		if (build_numa_sched_groups(&d, cpu_map, i))
-+			goto error;
-+#endif
-+
-+	/* Calculate CPU power for physical packages and nodes */
-+#ifdef CONFIG_SCHED_SMT
-+	for_each_cpu(i, cpu_map) {
-+		sd = &per_cpu(cpu_domains, i).sd;
-+		init_sched_groups_power(i, sd);
-+	}
-+#endif
-+#ifdef CONFIG_SCHED_MC
-+	for_each_cpu(i, cpu_map) {
-+		sd = &per_cpu(core_domains, i).sd;
-+		init_sched_groups_power(i, sd);
-+	}
-+#endif
-+#ifdef CONFIG_SCHED_BOOK
-+	for_each_cpu(i, cpu_map) {
-+		sd = &per_cpu(book_domains, i).sd;
-+		init_sched_groups_power(i, sd);
-+	}
-+#endif
-+
-+	for_each_cpu(i, cpu_map) {
-+		sd = &per_cpu(phys_domains, i).sd;
-+		init_sched_groups_power(i, sd);
-+	}
-+
-+#ifdef CONFIG_NUMA
-+	for (i = 0; i < nr_node_ids; i++)
-+		init_numa_sched_groups_power(d.sched_group_nodes[i]);
-+
-+	if (d.sd_allnodes) {
-+		struct sched_group *sg;
-+
-+		cpu_to_allnodes_group(cpumask_first(cpu_map), cpu_map, &sg,
-+								d.tmpmask);
-+		init_numa_sched_groups_power(sg);
-+	}
-+#endif
-+
-+	/* Attach the domains */
-+	for_each_cpu(i, cpu_map) {
-+#ifdef CONFIG_SCHED_SMT
-+		sd = &per_cpu(cpu_domains, i).sd;
-+#elif defined(CONFIG_SCHED_MC)
-+		sd = &per_cpu(core_domains, i).sd;
-+#elif defined(CONFIG_SCHED_BOOK)
-+		sd = &per_cpu(book_domains, i).sd;
-+#else
-+		sd = &per_cpu(phys_domains, i).sd;
-+#endif
-+		cpu_attach_domain(sd, d.rd, i);
-+	}
-+
-+	d.sched_group_nodes = NULL; /* don't free this we still need it */
-+	__free_domain_allocs(&d, sa_tmpmask, cpu_map);
-+	return 0;
-+
-+error:
-+	__free_domain_allocs(&d, alloc_state, cpu_map);
-+	return -ENOMEM;
-+}
-+
-+static int build_sched_domains(const struct cpumask *cpu_map)
-+{
-+	return __build_sched_domains(cpu_map, NULL);
-+}
-+
-+static cpumask_var_t *doms_cur;	/* current sched domains */
-+static int ndoms_cur;		/* number of sched domains in 'doms_cur' */
-+static struct sched_domain_attr *dattr_cur;
-+				/* attribues of custom domains in 'doms_cur' */
-+
-+/*
-+ * Special case: If a kmalloc of a doms_cur partition (array of
-+ * cpumask) fails, then fallback to a single sched domain,
-+ * as determined by the single cpumask fallback_doms.
-+ */
-+static cpumask_var_t fallback_doms;
-+
-+/*
-+ * arch_update_cpu_topology lets virtualised architectures update the
-+ * cpu core maps. It is supposed to return 1 if the topology changed
-+ * or 0 if it stayed the same.
-+ */
-+int __attribute__((weak)) arch_update_cpu_topology(void)
-+{
-+	return 0;
-+}
-+
-+cpumask_var_t *alloc_sched_domains(unsigned int ndoms)
-+{
-+	int i;
-+	cpumask_var_t *doms;
-+
-+	doms = kmalloc(sizeof(*doms) * ndoms, GFP_KERNEL);
-+	if (!doms)
-+		return NULL;
-+	for (i = 0; i < ndoms; i++) {
-+		if (!alloc_cpumask_var(&doms[i], GFP_KERNEL)) {
-+			free_sched_domains(doms, i);
-+			return NULL;
-+		}
-+	}
-+	return doms;
-+}
-+
-+void free_sched_domains(cpumask_var_t doms[], unsigned int ndoms)
-+{
-+	unsigned int i;
-+	for (i = 0; i < ndoms; i++)
-+		free_cpumask_var(doms[i]);
-+	kfree(doms);
-+}
-+
-+/*
-+ * Set up scheduler domains and groups. Callers must hold the hotplug lock.
-+ * For now this just excludes isolated cpus, but could be used to
-+ * exclude other special cases in the future.
-+ */
-+static int arch_init_sched_domains(const struct cpumask *cpu_map)
-+{
-+	int err;
-+
-+	arch_update_cpu_topology();
-+	ndoms_cur = 1;
-+	doms_cur = alloc_sched_domains(ndoms_cur);
-+	if (!doms_cur)
-+		doms_cur = &fallback_doms;
-+	cpumask_andnot(doms_cur[0], cpu_map, cpu_isolated_map);
-+	dattr_cur = NULL;
-+	err = build_sched_domains(doms_cur[0]);
-+	register_sched_domain_sysctl();
-+
-+	return err;
-+}
-+
-+static void arch_destroy_sched_domains(const struct cpumask *cpu_map,
-+				       struct cpumask *tmpmask)
-+{
-+	free_sched_groups(cpu_map, tmpmask);
-+}
-+
-+/*
-+ * Detach sched domains from a group of cpus specified in cpu_map
-+ * These cpus will now be attached to the NULL domain
-+ */
-+static void detach_destroy_domains(const struct cpumask *cpu_map)
-+{
-+	/* Save because hotplug lock held. */
-+	static DECLARE_BITMAP(tmpmask, CONFIG_NR_CPUS);
-+	int i;
-+
-+	for_each_cpu(i, cpu_map)
-+		cpu_attach_domain(NULL, &def_root_domain, i);
-+	synchronize_sched();
-+	arch_destroy_sched_domains(cpu_map, to_cpumask(tmpmask));
-+}
-+
-+/* handle null as "default" */
-+static int dattrs_equal(struct sched_domain_attr *cur, int idx_cur,
-+			struct sched_domain_attr *new, int idx_new)
-+{
-+	struct sched_domain_attr tmp;
-+
-+	/* fast path */
-+	if (!new && !cur)
-+		return 1;
-+
-+	tmp = SD_ATTR_INIT;
-+	return !memcmp(cur ? (cur + idx_cur) : &tmp,
-+			new ? (new + idx_new) : &tmp,
-+			sizeof(struct sched_domain_attr));
-+}
-+
-+/*
-+ * Partition sched domains as specified by the 'ndoms_new'
-+ * cpumasks in the array doms_new[] of cpumasks. This compares
-+ * doms_new[] to the current sched domain partitioning, doms_cur[].
-+ * It destroys each deleted domain and builds each new domain.
-+ *
-+ * 'doms_new' is an array of cpumask_var_t's of length 'ndoms_new'.
-+ * The masks don't intersect (don't overlap.) We should setup one
-+ * sched domain for each mask. CPUs not in any of the cpumasks will
-+ * not be load balanced. If the same cpumask appears both in the
-+ * current 'doms_cur' domains and in the new 'doms_new', we can leave
-+ * it as it is.
-+ *
-+ * The passed in 'doms_new' should be allocated using
-+ * alloc_sched_domains.  This routine takes ownership of it and will
-+ * free_sched_domains it when done with it. If the caller failed the
-+ * alloc call, then it can pass in doms_new == NULL && ndoms_new == 1,
-+ * and partition_sched_domains() will fallback to the single partition
-+ * 'fallback_doms', it also forces the domains to be rebuilt.
-+ *
-+ * If doms_new == NULL it will be replaced with cpu_online_mask.
-+ * ndoms_new == 0 is a special case for destroying existing domains,
-+ * and it will not create the default domain.
-+ *
-+ * Call with hotplug lock held
-+ */
-+void partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[],
-+			     struct sched_domain_attr *dattr_new)
-+{
-+	int i, j, n;
-+	int new_topology;
-+
-+	mutex_lock(&sched_domains_mutex);
-+
-+	/* always unregister in case we don't destroy any domains */
-+	unregister_sched_domain_sysctl();
-+
-+	/* Let architecture update cpu core mappings. */
-+	new_topology = arch_update_cpu_topology();
-+
-+	n = doms_new ? ndoms_new : 0;
-+
-+	/* Destroy deleted domains */
-+	for (i = 0; i < ndoms_cur; i++) {
-+		for (j = 0; j < n && !new_topology; j++) {
-+			if (cpumask_equal(doms_cur[i], doms_new[j])
-+			    && dattrs_equal(dattr_cur, i, dattr_new, j))
-+				goto match1;
-+		}
-+		/* no match - a current sched domain not in new doms_new[] */
-+		detach_destroy_domains(doms_cur[i]);
-+match1:
-+		;
-+	}
-+
-+	if (doms_new == NULL) {
-+		ndoms_cur = 0;
-+		doms_new = &fallback_doms;
-+		cpumask_andnot(doms_new[0], cpu_active_mask, cpu_isolated_map);
-+		WARN_ON_ONCE(dattr_new);
-+	}
-+
-+	/* Build new domains */
-+	for (i = 0; i < ndoms_new; i++) {
-+		for (j = 0; j < ndoms_cur && !new_topology; j++) {
-+			if (cpumask_equal(doms_new[i], doms_cur[j])
-+			    && dattrs_equal(dattr_new, i, dattr_cur, j))
-+				goto match2;
-+		}
-+		/* no match - add a new doms_new */
-+		__build_sched_domains(doms_new[i],
-+					dattr_new ? dattr_new + i : NULL);
-+match2:
-+		;
-+	}
-+
-+	/* Remember the new sched domains */
-+	if (doms_cur != &fallback_doms)
-+		free_sched_domains(doms_cur, ndoms_cur);
-+	kfree(dattr_cur);	/* kfree(NULL) is safe */
-+	doms_cur = doms_new;
-+	dattr_cur = dattr_new;
-+	ndoms_cur = ndoms_new;
-+
-+	register_sched_domain_sysctl();
-+
-+	mutex_unlock(&sched_domains_mutex);
-+}
-+
-+#if defined(CONFIG_SCHED_MC) || defined(CONFIG_SCHED_SMT)
-+static void arch_reinit_sched_domains(void)
-+{
-+	get_online_cpus();
-+
-+	/* Destroy domains first to force the rebuild */
-+	partition_sched_domains(0, NULL, NULL);
-+
-+	rebuild_sched_domains();
-+	put_online_cpus();
-+}
-+
-+static ssize_t sched_power_savings_store(const char *buf, size_t count, int smt)
-+{
-+	unsigned int level = 0;
-+
-+	if (sscanf(buf, "%u", &level) != 1)
-+		return -EINVAL;
-+
-+	/*
-+	 * level is always be positive so don't check for
-+	 * level < POWERSAVINGS_BALANCE_NONE which is 0
-+	 * What happens on 0 or 1 byte write,
-+	 * need to check for count as well?
-+	 */
-+
-+	if (level >= MAX_POWERSAVINGS_BALANCE_LEVELS)
-+		return -EINVAL;
-+
-+	if (smt)
-+		sched_smt_power_savings = level;
-+	else
-+		sched_mc_power_savings = level;
-+
-+	arch_reinit_sched_domains();
-+
-+	return count;
-+}
-+
-+#ifdef CONFIG_SCHED_MC
-+static ssize_t sched_mc_power_savings_show(struct sysdev_class *class,
-+					   struct sysdev_class_attribute *attr,
-+					   char *page)
-+{
-+	return sprintf(page, "%u\n", sched_mc_power_savings);
-+}
-+static ssize_t sched_mc_power_savings_store(struct sysdev_class *class,
-+					    struct sysdev_class_attribute *attr,
-+					    const char *buf, size_t count)
-+{
-+	return sched_power_savings_store(buf, count, 0);
-+}
-+static SYSDEV_CLASS_ATTR(sched_mc_power_savings, 0644,
-+			 sched_mc_power_savings_show,
-+			 sched_mc_power_savings_store);
-+#endif
-+
-+#ifdef CONFIG_SCHED_SMT
-+static ssize_t sched_smt_power_savings_show(struct sysdev_class *dev,
-+					    struct sysdev_class_attribute *attr,
-+					    char *page)
-+{
-+	return sprintf(page, "%u\n", sched_smt_power_savings);
-+}
-+static ssize_t sched_smt_power_savings_store(struct sysdev_class *dev,
-+					     struct sysdev_class_attribute *attr,
-+					     const char *buf, size_t count)
-+{
-+	return sched_power_savings_store(buf, count, 1);
-+}
-+static SYSDEV_CLASS_ATTR(sched_smt_power_savings, 0644,
-+		   sched_smt_power_savings_show,
-+		   sched_smt_power_savings_store);
-+#endif
-+
-+int __init sched_create_sysfs_power_savings_entries(struct sysdev_class *cls)
-+{
-+	int err = 0;
-+
-+#ifdef CONFIG_SCHED_SMT
-+	if (smt_capable())
-+		err = sysfs_create_file(&cls->kset.kobj,
-+					&attr_sched_smt_power_savings.attr);
-+#endif
-+#ifdef CONFIG_SCHED_MC
-+	if (!err && mc_capable())
-+		err = sysfs_create_file(&cls->kset.kobj,
-+					&attr_sched_mc_power_savings.attr);
-+#endif
-+	return err;
-+}
-+#endif /* CONFIG_SCHED_MC || CONFIG_SCHED_SMT */
-+
-+/*
-+ * Update cpusets according to cpu_active mask.  If cpusets are
-+ * disabled, cpuset_update_active_cpus() becomes a simple wrapper
-+ * around partition_sched_domains().
-+ */
-+static int cpuset_cpu_active(struct notifier_block *nfb, unsigned long action,
-+			     void *hcpu)
-+{
-+	switch (action & ~CPU_TASKS_FROZEN) {
-+	case CPU_ONLINE:
-+	case CPU_DOWN_FAILED:
-+		cpuset_update_active_cpus();
-+		return NOTIFY_OK;
-+	default:
-+		return NOTIFY_DONE;
-+	}
-+}
-+
-+static int cpuset_cpu_inactive(struct notifier_block *nfb, unsigned long action,
-+			       void *hcpu)
-+{
-+	switch (action & ~CPU_TASKS_FROZEN) {
-+	case CPU_DOWN_PREPARE:
-+		cpuset_update_active_cpus();
-+		return NOTIFY_OK;
-+	default:
-+		return NOTIFY_DONE;
-+	}
-+}
-+
-+static int update_runtime(struct notifier_block *nfb,
-+				unsigned long action, void *hcpu)
-+{
-+	switch (action) {
-+	case CPU_DOWN_PREPARE:
-+	case CPU_DOWN_PREPARE_FROZEN:
-+		return NOTIFY_OK;
-+
-+	case CPU_DOWN_FAILED:
-+	case CPU_DOWN_FAILED_FROZEN:
-+	case CPU_ONLINE:
-+	case CPU_ONLINE_FROZEN:
-+		return NOTIFY_OK;
-+
-+	default:
-+		return NOTIFY_DONE;
-+	}
-+}
-+
-+#if defined(CONFIG_SCHED_SMT) || defined(CONFIG_SCHED_MC)
-+/*
-+ * Cheaper version of the below functions in case support for SMT and MC is
-+ * compiled in but CPUs have no siblings.
-+ */
-+static int sole_cpu_idle(unsigned long cpu)
-+{
-+	return rq_idle(cpu_rq(cpu));
-+}
-+#endif
-+#ifdef CONFIG_SCHED_SMT
-+/* All this CPU's SMT siblings are idle */
-+static int siblings_cpu_idle(unsigned long cpu)
-+{
-+	return cpumask_subset(&(cpu_rq(cpu)->smt_siblings),
-+			      &grq.cpu_idle_map);
-+}
-+#endif
-+#ifdef CONFIG_SCHED_MC
-+/* All this CPU's shared cache siblings are idle */
-+static int cache_cpu_idle(unsigned long cpu)
-+{
-+	return cpumask_subset(&(cpu_rq(cpu)->cache_siblings),
-+			      &grq.cpu_idle_map);
-+}
-+#endif
-+
-+void __init sched_init_smp(void)
-+{
-+	struct sched_domain *sd;
-+	int cpu, cpus;
-+
-+	cpumask_var_t non_isolated_cpus;
-+
-+	alloc_cpumask_var(&non_isolated_cpus, GFP_KERNEL);
-+	alloc_cpumask_var(&fallback_doms, GFP_KERNEL);
-+
-+#if defined(CONFIG_NUMA)
-+	sched_group_nodes_bycpu = kzalloc(nr_cpu_ids * sizeof(void **),
-+								GFP_KERNEL);
-+	BUG_ON(sched_group_nodes_bycpu == NULL);
-+#endif
-+	get_online_cpus();
-+	mutex_lock(&sched_domains_mutex);
-+	arch_init_sched_domains(cpu_active_mask);
-+	cpumask_andnot(non_isolated_cpus, cpu_possible_mask, cpu_isolated_map);
-+	if (cpumask_empty(non_isolated_cpus))
-+		cpumask_set_cpu(smp_processor_id(), non_isolated_cpus);
-+	mutex_unlock(&sched_domains_mutex);
-+	put_online_cpus();
-+
-+	hotcpu_notifier(cpuset_cpu_active, CPU_PRI_CPUSET_ACTIVE);
-+	hotcpu_notifier(cpuset_cpu_inactive, CPU_PRI_CPUSET_INACTIVE);
-+
-+	/* RT runtime code needs to handle some hotplug events */
-+	hotcpu_notifier(update_runtime, 0);
-+
-+	/* Move init over to a non-isolated CPU */
-+	if (set_cpus_allowed_ptr(current, non_isolated_cpus) < 0)
-+		BUG();
-+	free_cpumask_var(non_isolated_cpus);
-+
-+	/*
-+	 * Assume that every added cpu gives us slightly less overall latency
-+	 * allowing us to increase the base rr_interval, non-linearly and with
-+	 * an upper bound.
-+	 */
-+	cpus = num_online_cpus();
-+	rr_interval = rr_interval * (4 * cpus + 4) / (cpus + 6);
-+
-+	grq_lock_irq();
-+	/*
-+	 * Set up the relative cache distance of each online cpu from each
-+	 * other in a simple array for quick lookup. Locality is determined
-+	 * by the closest sched_domain that CPUs are separated by. CPUs with
-+	 * shared cache in SMT and MC are treated as local. Separate CPUs
-+	 * (within the same package or physically) within the same node are
-+	 * treated as not local. CPUs not even in the same domain (different
-+	 * nodes) are treated as very distant.
-+	 */
-+	for_each_online_cpu(cpu) {
-+		struct rq *rq = cpu_rq(cpu);
-+		for_each_domain(cpu, sd) {
-+			unsigned long locality;
-+			int other_cpu;
-+
-+#ifdef CONFIG_SCHED_SMT
-+			if (sd->level == SD_LV_SIBLING) {
-+				for_each_cpu_mask(other_cpu, *sched_domain_span(sd))
-+					cpumask_set_cpu(other_cpu, &rq->smt_siblings);
-+			}
-+#endif
-+#ifdef CONFIG_SCHED_MC
-+			if (sd->level == SD_LV_MC) {
-+				for_each_cpu_mask(other_cpu, *sched_domain_span(sd))
-+					cpumask_set_cpu(other_cpu, &rq->cache_siblings);
-+			}
-+#endif
-+			if (sd->level <= SD_LV_SIBLING)
-+				locality = 1;
-+			else if (sd->level <= SD_LV_MC)
-+				locality = 2;
-+			else if (sd->level <= SD_LV_NODE)
-+				locality = 3;
-+			else
-+				continue;
-+
-+			for_each_cpu_mask(other_cpu, *sched_domain_span(sd)) {
-+				if (locality < rq->cpu_locality[other_cpu])
-+					rq->cpu_locality[other_cpu] = locality;
-+			}
-+		}
-+
-+/*
-+		 * Each runqueue has its own function in case it doesn't have
-+		 * siblings of its own allowing mixed topologies.
-+		 */
-+#ifdef CONFIG_SCHED_SMT
-+		if (cpus_weight(rq->smt_siblings) > 1)
-+			rq->siblings_idle = siblings_cpu_idle;
-+#endif
-+#ifdef CONFIG_SCHED_MC
-+		if (cpus_weight(rq->cache_siblings) > 1)
-+			rq->cache_idle = cache_cpu_idle;
-+#endif
-+	}
-+	grq_unlock_irq();
-+}
-+#else
-+void __init sched_init_smp(void)
-+{
-+}
-+#endif /* CONFIG_SMP */
-+
-+unsigned int sysctl_timer_migration = 1;
-+
-+int in_sched_functions(unsigned long addr)
-+{
-+	return in_lock_functions(addr) ||
-+		(addr >= (unsigned long)__sched_text_start
-+		&& addr < (unsigned long)__sched_text_end);
-+}
-+
-+void __init sched_init(void)
-+{
-+	int i;
-+	struct rq *rq;
-+
-+	prio_ratios[0] = 128;
-+	for (i = 1 ; i < PRIO_RANGE ; i++)
-+		prio_ratios[i] = prio_ratios[i - 1] * 11 / 10;
-+
-+	raw_spin_lock_init(&grq.lock);
-+	grq.nr_running = grq.nr_uninterruptible = grq.nr_switches = 0;
-+	grq.niffies = 0;
-+	grq.last_jiffy = jiffies;
-+	raw_spin_lock_init(&grq.iso_lock);
-+	grq.iso_ticks = grq.iso_refractory = 0;
-+#ifdef CONFIG_SMP
-+	init_defrootdomain();
-+	grq.qnr = grq.idle_cpus = 0;
-+	cpumask_clear(&grq.cpu_idle_map);
-+#else
-+	uprq = &per_cpu(runqueues, 0);
-+#endif
-+	for_each_possible_cpu(i) {
-+		rq = cpu_rq(i);
-+		rq->user_pc = rq->nice_pc = rq->softirq_pc = rq->system_pc =
-+			      rq->iowait_pc = rq->idle_pc = 0;
-+		rq->dither = 0;
-+#ifdef CONFIG_SMP
-+		rq->last_niffy = 0;
-+		rq->sd = NULL;
-+		rq->rd = NULL;
-+		rq->online = 0;
-+		rq->cpu = i;
-+		rq_attach_root(rq, &def_root_domain);
-+#endif
-+		atomic_set(&rq->nr_iowait, 0);
-+	}
-+
-+#ifdef CONFIG_SMP
-+	nr_cpu_ids = i;
-+	/*
-+	 * Set the base locality for cpu cache distance calculation to
-+	 * "distant" (3). Make sure the distance from a CPU to itself is 0.
-+	 */
-+	for_each_possible_cpu(i) {
-+		int j;
-+
-+		rq = cpu_rq(i);
-+#ifdef CONFIG_SCHED_SMT
-+		cpumask_clear(&rq->smt_siblings);
-+		cpumask_set_cpu(i, &rq->smt_siblings);
-+		rq->siblings_idle = sole_cpu_idle;
-+		cpumask_set_cpu(i, &rq->smt_siblings);
-+#endif
-+#ifdef CONFIG_SCHED_MC
-+		cpumask_clear(&rq->cache_siblings);
-+		cpumask_set_cpu(i, &rq->cache_siblings);
-+		rq->cache_idle = sole_cpu_idle;
-+		cpumask_set_cpu(i, &rq->cache_siblings);
-+#endif
-+		rq->cpu_locality = kmalloc(nr_cpu_ids * sizeof(unsigned long),
-+					   GFP_NOWAIT);
-+		for_each_possible_cpu(j) {
-+			if (i == j)
-+				rq->cpu_locality[j] = 0;
-+			else
-+				rq->cpu_locality[j] = 4;
-+		}
-+	}
-+#endif
-+
-+	for (i = 0; i < PRIO_LIMIT; i++)
-+		INIT_LIST_HEAD(grq.queue + i);
-+	/* delimiter for bitsearch */
-+	__set_bit(PRIO_LIMIT, grq.prio_bitmap);
-+
-+#ifdef CONFIG_PREEMPT_NOTIFIERS
-+	INIT_HLIST_HEAD(&init_task.preempt_notifiers);
-+#endif
-+
-+#ifdef CONFIG_RT_MUTEXES
-+	plist_head_init_raw(&init_task.pi_waiters, &init_task.pi_lock);
-+#endif
-+
-+	/*
-+	 * The boot idle thread does lazy MMU switching as well:
-+	 */
-+	atomic_inc(&init_mm.mm_count);
-+	enter_lazy_tlb(&init_mm, current);
-+
-+	/*
-+	 * Make us the idle thread. Technically, schedule() should not be
-+	 * called from this thread, however somewhere below it might be,
-+	 * but because we are the idle thread, we just pick up running again
-+	 * when this runqueue becomes "idle".
-+	 */
-+	init_idle(current, smp_processor_id());
-+
-+	/* Allocate the nohz_cpu_mask if CONFIG_CPUMASK_OFFSTACK */
-+	zalloc_cpumask_var(&nohz_cpu_mask, GFP_NOWAIT);
-+#ifdef CONFIG_SMP
-+	/* May be allocated at isolcpus cmdline parse time */
-+	if (cpu_isolated_map == NULL)
-+		zalloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT);
-+#endif /* SMP */
-+	perf_event_init();
-+}
-+
-+#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
-+static inline int preempt_count_equals(int preempt_offset)
-+{
-+	int nested = (preempt_count() & ~PREEMPT_ACTIVE) + rcu_preempt_depth();
-+
-+	return (nested == PREEMPT_INATOMIC_BASE + preempt_offset);
-+}
-+
-+void __might_sleep(const char *file, int line, int preempt_offset)
-+{
-+#ifdef in_atomic
-+	static unsigned long prev_jiffy;	/* ratelimiting */
-+
-+	if ((preempt_count_equals(preempt_offset) && !irqs_disabled()) ||
-+	    system_state != SYSTEM_RUNNING || oops_in_progress)
-+		return;
-+	if (time_before(jiffies, prev_jiffy + HZ) && prev_jiffy)
-+		return;
-+	prev_jiffy = jiffies;
-+
-+	printk(KERN_ERR
-+		"BUG: sleeping function called from invalid context at %s:%d\n",
-+			file, line);
-+	printk(KERN_ERR
-+		"in_atomic(): %d, irqs_disabled(): %d, pid: %d, name: %s\n",
-+			in_atomic(), irqs_disabled(),
-+			current->pid, current->comm);
-+
-+	debug_show_held_locks(current);
-+	if (irqs_disabled())
-+		print_irqtrace_events(current);
-+	dump_stack();
-+#endif
-+}
-+EXPORT_SYMBOL(__might_sleep);
-+#endif
-+
-+#ifdef CONFIG_MAGIC_SYSRQ
-+void normalize_rt_tasks(void)
-+{
-+	struct task_struct *g, *p;
-+	unsigned long flags;
-+	struct rq *rq;
-+	int queued;
-+
-+	read_lock_irq(&tasklist_lock);
-+
-+	do_each_thread(g, p) {
-+		if (!rt_task(p) && !iso_task(p))
-+			continue;
-+
-+		raw_spin_lock_irqsave(&p->pi_lock, flags);
-+		rq = __task_grq_lock(p);
-+
-+		queued = task_queued(p);
-+		if (queued)
-+			dequeue_task(p);
-+		__setscheduler(p, rq, SCHED_NORMAL, 0);
-+		if (queued) {
-+			enqueue_task(p);
-+			try_preempt(p, rq);
-+		}
-+
-+		__task_grq_unlock();
-+		raw_spin_unlock_irqrestore(&p->pi_lock, flags);
-+	} while_each_thread(g, p);
-+
-+	read_unlock_irq(&tasklist_lock);
-+}
-+#endif /* CONFIG_MAGIC_SYSRQ */
-+
-+#if defined(CONFIG_IA64) || defined(CONFIG_KGDB_KDB)
-+/*
-+ * These functions are only useful for the IA64 MCA handling, or kdb.
-+ *
-+ * They can only be called when the whole system has been
-+ * stopped - every CPU needs to be quiescent, and no scheduling
-+ * activity can take place. Using them for anything else would
-+ * be a serious bug, and as a result, they aren't even visible
-+ * under any other configuration.
-+ */
-+
-+/**
-+ * curr_task - return the current task for a given cpu.
-+ * @cpu: the processor in question.
-+ *
-+ * ONLY VALID WHEN THE WHOLE SYSTEM IS STOPPED!
-+ */
-+struct task_struct *curr_task(int cpu)
-+{
-+	return cpu_curr(cpu);
-+}
-+
-+#endif /* defined(CONFIG_IA64) || defined(CONFIG_KGDB_KDB) */
-+
-+#ifdef CONFIG_IA64
-+/**
-+ * set_curr_task - set the current task for a given cpu.
-+ * @cpu: the processor in question.
-+ * @p: the task pointer to set.
-+ *
-+ * Description: This function must only be used when non-maskable interrupts
-+ * are serviced on a separate stack.  It allows the architecture to switch the
-+ * notion of the current task on a cpu in a non-blocking manner.  This function
-+ * must be called with all CPU's synchronised, and interrupts disabled, the
-+ * and caller must save the original value of the current task (see
-+ * curr_task() above) and restore that value before reenabling interrupts and
-+ * re-starting the system.
-+ *
-+ * ONLY VALID WHEN THE WHOLE SYSTEM IS STOPPED!
-+ */
-+void set_curr_task(int cpu, struct task_struct *p)
-+{
-+	cpu_curr(cpu) = p;
-+}
-+
-+#endif
-+
-+/*
-+ * Use precise platform statistics if available:
-+ */
-+#ifdef CONFIG_VIRT_CPU_ACCOUNTING
-+void task_times(struct task_struct *p, cputime_t *ut, cputime_t *st)
-+{
-+	*ut = p->utime;
-+	*st = p->stime;
-+}
-+
-+void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *st)
-+{
-+	struct task_cputime cputime;
-+
-+	thread_group_cputime(p, &cputime);
-+
-+	*ut = cputime.utime;
-+	*st = cputime.stime;
-+}
-+#else
-+
-+#ifndef nsecs_to_cputime
-+# define nsecs_to_cputime(__nsecs)	nsecs_to_jiffies(__nsecs)
-+#endif
-+
-+void task_times(struct task_struct *p, cputime_t *ut, cputime_t *st)
-+{
-+	cputime_t rtime, utime = p->utime, total = cputime_add(utime, p->stime);
-+
-+	rtime = nsecs_to_cputime(p->sched_time);
-+
-+	if (total) {
-+		u64 temp;
-+
-+		temp = (u64)(rtime * utime);
-+		do_div(temp, total);
-+		utime = (cputime_t)temp;
-+	} else
-+		utime = rtime;
-+
-+	/*
-+	 * Compare with previous values, to keep monotonicity:
-+	 */
-+	p->prev_utime = max(p->prev_utime, utime);
-+	p->prev_stime = max(p->prev_stime, cputime_sub(rtime, p->prev_utime));
-+
-+	*ut = p->prev_utime;
-+	*st = p->prev_stime;
-+}
-+
-+/*
-+ * Must be called with siglock held.
-+ */
-+void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *st)
-+{
-+	struct signal_struct *sig = p->signal;
-+	struct task_cputime cputime;
-+	cputime_t rtime, utime, total;
-+
-+	thread_group_cputime(p, &cputime);
-+
-+	total = cputime_add(cputime.utime, cputime.stime);
-+	rtime = nsecs_to_cputime(cputime.sum_exec_runtime);
-+
-+	if (total) {
-+		u64 temp;
-+
-+		temp = (u64)(rtime * cputime.utime);
-+		do_div(temp, total);
-+		utime = (cputime_t)temp;
-+	} else
-+		utime = rtime;
-+
-+	sig->prev_utime = max(sig->prev_utime, utime);
-+	sig->prev_stime = max(sig->prev_stime,
-+			      cputime_sub(rtime, sig->prev_utime));
-+
-+	*ut = sig->prev_utime;
-+	*st = sig->prev_stime;
-+}
-+#endif
-+
-+inline cputime_t task_gtime(struct task_struct *p)
-+{
-+	return p->gtime;
-+}
-+
-+void __cpuinit init_idle_bootup_task(struct task_struct *idle)
-+{}
-+
-+#ifdef CONFIG_SCHED_DEBUG
-+void proc_sched_show_task(struct task_struct *p, struct seq_file *m)
-+{}
-+
-+void proc_sched_set_task(struct task_struct *p)
-+{}
-+#endif
-+
-+/* No RCU torture test support */
-+void synchronize_sched_expedited(void)
-+{
-+	barrier();
-+}
-+EXPORT_SYMBOL_GPL(synchronize_sched_expedited);
-+
-+#ifdef CONFIG_SMP
-+unsigned long default_scale_freq_power(struct sched_domain *sd, int cpu)
-+{
-+	return SCHED_LOAD_SCALE;
-+}
-+
-+unsigned long default_scale_smt_power(struct sched_domain *sd, int cpu)
-+{
-+	unsigned long weight = cpumask_weight(sched_domain_span(sd));
-+	unsigned long smt_gain = sd->smt_gain;
-+
-+	smt_gain /= weight;
-+
-+	return smt_gain;
-+}
-+#endif
-Index: linux-2.6.37-ck2/kernel/sched.c
-===================================================================
---- linux-2.6.37-ck2.orig/kernel/sched.c	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/kernel/sched.c	2011-02-14 09:47:50.994252001 +1100
-@@ -1,3 +1,6 @@
-+#ifdef CONFIG_SCHED_BFS
-+#include "sched_bfs.c"
-+#else
- /*
-  *  kernel/sched.c
-  *
-@@ -9603,3 +9606,4 @@
- EXPORT_SYMBOL_GPL(synchronize_sched_expedited);
- 
- #endif /* #else #ifndef CONFIG_SMP */
-+#endif /* CONFIG_SCHED_BFS */
-Index: linux-2.6.37-ck2/kernel/sysctl.c
-===================================================================
---- linux-2.6.37-ck2.orig/kernel/sysctl.c	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/kernel/sysctl.c	2011-02-14 09:47:50.995252001 +1100
-@@ -117,7 +117,12 @@
- static int __maybe_unused one = 1;
- static int __maybe_unused two = 2;
- static unsigned long one_ul = 1;
--static int one_hundred = 100;
-+static int __maybe_unused one_hundred = 100;
-+#ifdef CONFIG_SCHED_BFS
-+extern int rr_interval;
-+extern int sched_iso_cpu;
-+static int __read_mostly one_thousand = 1000;
-+#endif
- #ifdef CONFIG_PRINTK
- static int ten_thousand = 10000;
- #endif
-@@ -252,7 +257,7 @@
- 	{ }
- };
- 
--#ifdef CONFIG_SCHED_DEBUG
-+#if defined(CONFIG_SCHED_DEBUG) && !defined(CONFIG_SCHED_BFS)
- static int min_sched_granularity_ns = 100000;		/* 100 usecs */
- static int max_sched_granularity_ns = NSEC_PER_SEC;	/* 1 second */
- static int min_wakeup_granularity_ns;			/* 0 usecs */
-@@ -269,6 +274,7 @@
- #endif
- 
- static struct ctl_table kern_table[] = {
-+#ifndef CONFIG_SCHED_BFS
- 	{
- 		.procname	= "sched_child_runs_first",
- 		.data		= &sysctl_sched_child_runs_first,
-@@ -382,6 +388,7 @@
- 		.mode		= 0644,
- 		.proc_handler	= proc_dointvec,
- 	},
-+#endif /* !CONFIG_SCHED_BFS */
- #ifdef CONFIG_PROVE_LOCKING
- 	{
- 		.procname	= "prove_locking",
-@@ -815,6 +822,26 @@
- 		.proc_handler	= proc_dointvec,
- 	},
- #endif
-+#ifdef CONFIG_SCHED_BFS
-+	{
-+		.procname	= "rr_interval",
-+		.data		= &rr_interval,
-+		.maxlen		= sizeof (int),
-+		.mode		= 0644,
-+		.proc_handler	= &proc_dointvec_minmax,
-+		.extra1		= &one,
-+		.extra2		= &one_thousand,
-+	},
-+	{
-+		.procname	= "iso_cpu",
-+		.data		= &sched_iso_cpu,
-+		.maxlen		= sizeof (int),
-+		.mode		= 0644,
-+		.proc_handler	= &proc_dointvec_minmax,
-+		.extra1		= &zero,
-+		.extra2		= &one_hundred,
-+	},
-+#endif
- #if defined(CONFIG_S390) && defined(CONFIG_SMP)
- 	{
- 		.procname	= "spin_retry",
-Index: linux-2.6.37-ck2/lib/Kconfig.debug
-===================================================================
---- linux-2.6.37-ck2.orig/lib/Kconfig.debug	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/lib/Kconfig.debug	2011-02-14 09:47:50.995252001 +1100
-@@ -833,7 +833,7 @@
- 
- config RCU_TORTURE_TEST
- 	tristate "torture tests for RCU"
--	depends on DEBUG_KERNEL
-+	depends on DEBUG_KERNEL && !SCHED_BFS
- 	default n
- 	help
- 	  This option provides a kernel module that runs torture tests
-Index: linux-2.6.37-ck2/include/linux/jiffies.h
-===================================================================
---- linux-2.6.37-ck2.orig/include/linux/jiffies.h	2010-02-25 21:51:52.000000000 +1100
-+++ linux-2.6.37-ck2/include/linux/jiffies.h	2011-02-14 09:47:50.995252001 +1100
-@@ -164,7 +164,7 @@
-  * Have the 32 bit jiffies value wrap 5 minutes after boot
-  * so jiffies wrap bugs show up earlier.
-  */
--#define INITIAL_JIFFIES ((unsigned long)(unsigned int) (-300*HZ))
-+#define INITIAL_JIFFIES ((unsigned long)(unsigned int) (-10*HZ))
- 
- /*
-  * Change timeval to jiffies, trying to avoid the
-Index: linux-2.6.37-ck2/mm/vmscan.c
-===================================================================
---- linux-2.6.37-ck2.orig/mm/vmscan.c	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/mm/vmscan.c	2011-02-14 10:11:01.693252000 +1100
-@@ -36,6 +36,7 @@
- #include <linux/rwsem.h>
- #include <linux/delay.h>
- #include <linux/kthread.h>
-+#include <linux/timer.h>
- #include <linux/freezer.h>
- #include <linux/memcontrol.h>
- #include <linux/delayacct.h>
-@@ -133,7 +134,7 @@
- /*
-  * From 0 .. 100.  Higher means more swappy.
-  */
--int vm_swappiness = 60;
-+int vm_swappiness;
- long vm_total_pages;	/* The total number of pages which the VM controls */
- 
- static LIST_HEAD(shrinker_list);
-@@ -900,7 +901,7 @@
- 
- activate_locked:
- 		/* Not a candidate for swapping, so reclaim swap space. */
--		if (PageSwapCache(page) && vm_swap_full())
-+		if (PageSwapCache(page))
- 			try_to_free_swap(page);
- 		VM_BUG_ON(PageActive(page));
- 		SetPageActive(page);
-@@ -1855,6 +1856,35 @@
- }
- 
- /*
-+ * Helper functions to adjust nice level of kswapd, based on the priority of
-+ * the task (p) that called it. If it is already higher priority we do not
-+ * demote its nice level since it is still working on behalf of a higher
-+ * priority task. With kernel threads we leave it at nice 0.
-+ *
-+ * We don't ever run kswapd real time, so if a real time task calls kswapd we
-+ * set it to highest SCHED_NORMAL priority.
-+ */
-+static inline int effective_sc_prio(struct task_struct *p)
-+{
-+	if (likely(p->mm)) {
-+		if (rt_task(p))
-+			return -20;
-+		if (p->policy == SCHED_IDLEPRIO)
-+			return 19;
-+		return task_nice(p);
-+	}
-+	return 0;
-+}
-+
-+static void set_kswapd_nice(struct task_struct *kswapd, int active)
-+{
-+	long nice = effective_sc_prio(current);
-+
-+	if (task_nice(kswapd) > nice || !active)
-+		set_user_nice(kswapd, nice);
-+}
-+
-+/*
-  * This is the direct reclaim path, for page-allocating processes.  We only
-  * try to reclaim pages from zones which will satisfy the caller's allocation
-  * request.
-@@ -2371,6 +2401,8 @@
- 	return sc.nr_reclaimed;
- }
- 
-+#define WT_EXPIRY	(HZ * 5)	/* Time to wakeup watermark_timer */
-+
- /*
-  * The background pageout daemon, started as a kernel thread
-  * from the init process.
-@@ -2421,6 +2453,8 @@
- 		unsigned long new_order;
- 		int ret;
- 
-+		/* kswapd has been busy so delay watermark_timer */
-+		mod_timer(&pgdat->watermark_timer, jiffies + WT_EXPIRY);
- 		prepare_to_wait(&pgdat->kswapd_wait, &wait, TASK_INTERRUPTIBLE);
- 		new_order = pgdat->kswapd_max_order;
- 		pgdat->kswapd_max_order = 0;
-@@ -2457,6 +2491,7 @@
- 				}
- 			}
- 
-+			set_user_nice(tsk, 0);
- 			order = pgdat->kswapd_max_order;
- 		}
- 		finish_wait(&pgdat->kswapd_wait, &wait);
-@@ -2483,6 +2518,7 @@
- void wakeup_kswapd(struct zone *zone, int order)
- {
- 	pg_data_t *pgdat;
-+	int active;
- 
- 	if (!populated_zone(zone))
- 		return;
-@@ -2495,7 +2531,9 @@
-	pgdat = zone->zone_pgdat;
-	if (pgdat->kswapd_max_order < order)
-		pgdat->kswapd_max_order = order;
--	if (!waitqueue_active(&pgdat->kswapd_wait))
-+	active = waitqueue_active(&pgdat->kswapd_wait);
-+	set_kswapd_nice(pgdat->kswapd, active);
-+	if (!active)
-		return;
-	if (zone_watermark_ok_safe(zone, order, low_wmark_pages(zone), 0, 0))
-		return;
-@@ -2601,20 +2639,57 @@
- }
- 
- /*
-+ * We wake up kswapd every WT_EXPIRY till free ram is above pages_lots
-+ */
-+static void watermark_wakeup(unsigned long data)
-+{
-+	pg_data_t *pgdat = (pg_data_t *)data;
-+	struct timer_list *wt = &pgdat->watermark_timer;
-+	int i;
-+
-+	if (!waitqueue_active(&pgdat->kswapd_wait) || above_background_load())
-+		goto out;
-+	for (i = pgdat->nr_zones - 1; i >= 0; i--) {
-+		struct zone *z = pgdat->node_zones + i;
-+
-+		if (!populated_zone(z) || is_highmem(z)) {
-+			/* We are better off leaving highmem full */
-+			continue;
-+		}
-+		if (!zone_watermark_ok(z, 0, lots_wmark_pages(z), 0, 0)) {
-+			wake_up_interruptible(&pgdat->kswapd_wait);
-+			goto out;
-+		}
-+	}
-+out:
-+	mod_timer(wt, jiffies + WT_EXPIRY);
-+	return;
-+}
-+
-+/*
-  * This kswapd start function will be called by init and node-hot-add.
-  * On node-hot-add, kswapd will moved to proper cpus if cpus are hot-added.
-  */
- int kswapd_run(int nid)
- {
- 	pg_data_t *pgdat = NODE_DATA(nid);
-+	struct timer_list *wt;
- 	int ret = 0;
- 
- 	if (pgdat->kswapd)
- 		return 0;
- 
-+	wt = &pgdat->watermark_timer;
-+	init_timer(wt);
-+	wt->data = (unsigned long)pgdat;
-+	wt->function = watermark_wakeup;
-+	wt->expires = jiffies + WT_EXPIRY;
-+	add_timer(wt);
-+
- 	pgdat->kswapd = kthread_run(kswapd, pgdat, "kswapd%d", nid);
- 	if (IS_ERR(pgdat->kswapd)) {
- 		/* failure at boot is fatal */
-+		del_timer(wt);
- 		BUG_ON(system_state == SYSTEM_BOOTING);
- 		printk("Failed to start kswapd on node %d\n",nid);
- 		ret = -1;
-Index: linux-2.6.37-ck2/include/linux/swap.h
-===================================================================
---- linux-2.6.37-ck2.orig/include/linux/swap.h	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/include/linux/swap.h	2011-02-14 10:11:09.770252000 +1100
-@@ -192,7 +192,7 @@
- 	int next;	/* swapfile to be used next */
- };
- 
--/* Swap 50% full? Release swapcache more aggressively.. */
-+/* Swap 50% full? */
- #define vm_swap_full() (nr_swap_pages*2 < total_swap_pages)
- 
- /* linux/mm/page_alloc.c */
-@@ -206,6 +206,7 @@
- 
- 
- /* linux/mm/swap.c */
-+extern void ____lru_cache_add(struct page *, enum lru_list lru, int tail);
- extern void __lru_cache_add(struct page *, enum lru_list lru);
- extern void lru_cache_add_lru(struct page *, enum lru_list lru);
- extern void activate_page(struct page *);
-@@ -226,9 +227,14 @@
- 	__lru_cache_add(page, LRU_INACTIVE_ANON);
- }
- 
-+static inline void lru_cache_add_file_tail(struct page *page, int tail)
-+{
-+	____lru_cache_add(page, LRU_INACTIVE_FILE, tail);
-+}
-+
- static inline void lru_cache_add_file(struct page *page)
- {
--	__lru_cache_add(page, LRU_INACTIVE_FILE);
-+	____lru_cache_add(page, LRU_INACTIVE_FILE, 0);
- }
- 
- /* LRU Isolation modes. */
-@@ -348,9 +354,10 @@
- extern void grab_swap_token(struct mm_struct *);
- extern void __put_swap_token(struct mm_struct *);
- 
-+/* Only allow swap token to have effect if swap is full */
- static inline int has_swap_token(struct mm_struct *mm)
- {
--	return (mm == swap_token_mm);
-+	return (mm == swap_token_mm && vm_swap_full());
- }
- 
- static inline void put_swap_token(struct mm_struct *mm)
-Index: linux-2.6.37-ck2/mm/memory.c
-===================================================================
---- linux-2.6.37-ck2.orig/mm/memory.c	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/mm/memory.c	2011-02-14 10:11:00.984252001 +1100
-@@ -2754,7 +2754,7 @@
- 	mem_cgroup_commit_charge_swapin(page, ptr);
- 
- 	swap_free(entry);
--	if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
-+	if ((vma->vm_flags & VM_LOCKED) || PageMlocked(page))
- 		try_to_free_swap(page);
- 	unlock_page(page);
- 	if (swapcache) {
-Index: linux-2.6.37-ck2/mm/swapfile.c
-===================================================================
---- linux-2.6.37-ck2.orig/mm/swapfile.c	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/mm/swapfile.c	2011-02-14 10:11:00.985252001 +1100
-@@ -321,7 +321,7 @@
- 		scan_base = offset = si->lowest_bit;
- 
- 	/* reuse swap entry of cache-only swap if not busy. */
--	if (vm_swap_full() && si->swap_map[offset] == SWAP_HAS_CACHE) {
-+	if (si->swap_map[offset] == SWAP_HAS_CACHE) {
- 		int swap_was_freed;
- 		spin_unlock(&swap_lock);
- 		swap_was_freed = __try_to_reclaim_swap(si, offset);
-@@ -410,7 +410,7 @@
- 			spin_lock(&swap_lock);
- 			goto checks;
- 		}
--		if (vm_swap_full() && si->swap_map[offset] == SWAP_HAS_CACHE) {
-+		if (si->swap_map[offset] == SWAP_HAS_CACHE) {
- 			spin_lock(&swap_lock);
- 			goto checks;
- 		}
-@@ -425,7 +425,7 @@
- 			spin_lock(&swap_lock);
- 			goto checks;
- 		}
--		if (vm_swap_full() && si->swap_map[offset] == SWAP_HAS_CACHE) {
-+		if (si->swap_map[offset] == SWAP_HAS_CACHE) {
- 			spin_lock(&swap_lock);
- 			goto checks;
- 		}
-@@ -739,8 +739,7 @@
- 		 * Not mapped elsewhere, or swap space full? Free it!
- 		 * Also recheck PageSwapCache now page is locked (above).
- 		 */
--		if (PageSwapCache(page) && !PageWriteback(page) &&
--				(!page_mapped(page) || vm_swap_full())) {
-+		if (PageSwapCache(page) && !PageWriteback(page)) {
- 			delete_from_swap_cache(page);
- 			SetPageDirty(page);
- 		}
-Index: linux-2.6.37-ck2/include/linux/mmzone.h
-===================================================================
---- linux-2.6.37-ck2.orig/include/linux/mmzone.h	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/include/linux/mmzone.h	2011-02-14 10:11:01.470252001 +1100
-@@ -15,6 +15,7 @@
- #include <linux/seqlock.h>
- #include <linux/nodemask.h>
- #include <linux/pageblock-flags.h>
-+#include <linux/timer.h>
- #include <generated/bounds.h>
- #include <asm/atomic.h>
- #include <asm/page.h>
-@@ -161,12 +162,14 @@
- 	WMARK_MIN,
- 	WMARK_LOW,
- 	WMARK_HIGH,
-+	WMARK_LOTS,
- 	NR_WMARK
- };
- 
- #define min_wmark_pages(z) (z->watermark[WMARK_MIN])
- #define low_wmark_pages(z) (z->watermark[WMARK_LOW])
- #define high_wmark_pages(z) (z->watermark[WMARK_HIGH])
-+#define lots_wmark_pages(z) (z->watermark[WMARK_LOTS])
- 
- struct per_cpu_pages {
- 	int count;		/* number of pages in the list */
-@@ -343,7 +346,7 @@
- 	ZONE_PADDING(_pad1_)
- 
- 	/* Fields commonly accessed by the page reclaim scanner */
--	spinlock_t		lru_lock;	
-+	spinlock_t		lru_lock;
- 	struct zone_lru {
- 		struct list_head list;
- 	} lru[NR_LRU_LISTS];
-@@ -645,6 +648,7 @@
- 	wait_queue_head_t kswapd_wait;
- 	struct task_struct *kswapd;
- 	int kswapd_max_order;
-+	struct timer_list watermark_timer;
- } pg_data_t;
- 
- #define node_present_pages(nid)	(NODE_DATA(nid)->node_present_pages)
-Index: linux-2.6.37-ck2/include/linux/mm_inline.h
-===================================================================
---- linux-2.6.37-ck2.orig/include/linux/mm_inline.h	2009-12-03 21:40:09.000000000 +1100
-+++ linux-2.6.37-ck2/include/linux/mm_inline.h	2011-02-14 10:11:09.770252000 +1100
-@@ -20,14 +20,24 @@
- }
- 
- static inline void
--add_page_to_lru_list(struct zone *zone, struct page *page, enum lru_list l)
-+__add_page_to_lru_list(struct zone *zone, struct page *page, enum lru_list l, int tail)
- {
--	list_add(&page->lru, &zone->lru[l].list);
-+	/* See if this should be added to the tail of this lru list */
-+	if (tail)
-+		list_add_tail(&page->lru, &zone->lru[l].list);
-+	else
-+		list_add(&page->lru, &zone->lru[l].list);
- 	__inc_zone_state(zone, NR_LRU_BASE + l);
- 	mem_cgroup_add_lru_list(page, l);
- }
- 
- static inline void
-+add_page_to_lru_list(struct zone *zone, struct page *page, enum lru_list l)
-+{
-+	__add_page_to_lru_list(zone, page, l, 0);
-+}
-+
-+static inline void
- del_page_from_lru_list(struct zone *zone, struct page *page, enum lru_list l)
- {
- 	list_del(&page->lru);
-Index: linux-2.6.37-ck2/mm/filemap.c
-===================================================================
---- linux-2.6.37-ck2.orig/mm/filemap.c	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/mm/filemap.c	2011-02-14 10:11:09.772252000 +1100
-@@ -439,8 +439,8 @@
- }
- EXPORT_SYMBOL(add_to_page_cache_locked);
- 
--int add_to_page_cache_lru(struct page *page, struct address_space *mapping,
--				pgoff_t offset, gfp_t gfp_mask)
-+int __add_to_page_cache_lru(struct page *page, struct address_space *mapping,
-+				pgoff_t offset, gfp_t gfp_mask, int tail)
- {
- 	int ret;
- 
-@@ -456,12 +456,18 @@
- 	ret = add_to_page_cache(page, mapping, offset, gfp_mask);
- 	if (ret == 0) {
- 		if (page_is_file_cache(page))
--			lru_cache_add_file(page);
-+			lru_cache_add_file_tail(page, tail);
- 		else
- 			lru_cache_add_anon(page);
- 	}
- 	return ret;
- }
-+
-+int add_to_page_cache_lru(struct page *page, struct address_space *mapping,
-+				pgoff_t offset, gfp_t gfp_mask)
-+{
-+	return __add_to_page_cache_lru(page, mapping, offset, gfp_mask, 0);
-+}
- EXPORT_SYMBOL_GPL(add_to_page_cache_lru);
- 
- #ifdef CONFIG_NUMA
-@@ -968,6 +974,28 @@
- 	ra->ra_pages /= 4;
- }
- 
-+static inline int nr_mapped(void)
-+{
-+	return global_page_state(NR_FILE_MAPPED) +
-+		global_page_state(NR_ANON_PAGES);
-+}
-+
-+/*
-+ * This examines how large in pages a file size is and returns 1 if it is
-+ * more than half the unmapped ram. Avoid doing read_page_state which is
-+ * expensive unless we already know it is likely to be large enough.
-+ */
-+static int large_isize(unsigned long nr_pages)
-+{
-+	if (nr_pages * 6 > vm_total_pages) {
-+		 unsigned long unmapped_ram = vm_total_pages - nr_mapped();
-+
-+		if (nr_pages * 2 > unmapped_ram)
-+			return 1;
-+	}
-+	return 0;
-+}
-+
- /**
-  * do_generic_file_read - generic file read routine
-  * @filp:	the file to read
-@@ -992,7 +1020,7 @@
- 	pgoff_t prev_index;
- 	unsigned long offset;      /* offset into pagecache page */
- 	unsigned int prev_offset;
--	int error;
-+	int error, tail = 0;
- 
- 	index = *ppos >> PAGE_CACHE_SHIFT;
- 	prev_index = ra->prev_pos >> PAGE_CACHE_SHIFT;
-@@ -1003,7 +1031,7 @@
- 	for (;;) {
- 		struct page *page;
- 		pgoff_t end_index;
--		loff_t isize;
-+		loff_t isize = 0;
- 		unsigned long nr, ret;
- 
- 		cond_resched();
-@@ -1177,8 +1205,16 @@
- 			desc->error = -ENOMEM;
- 			goto out;
- 		}
--		error = add_to_page_cache_lru(page, mapping,
--						index, GFP_KERNEL);
-+		/*
-+		 * If we know the file is large we add the pages read to the
-+		 * end of the lru as we're unlikely to be able to cache the
-+		 * whole file in ram so make those pages the first to be
-+		 * dropped if not referenced soon.
-+		 */
-+		if (large_isize(end_index))
-+			tail = 1;
-+		error = __add_to_page_cache_lru(page, mapping,
-+						index, GFP_KERNEL, tail);
- 		if (error) {
- 			page_cache_release(page);
- 			if (error == -EEXIST)
-Index: linux-2.6.37-ck2/mm/swap.c
-===================================================================
---- linux-2.6.37-ck2.orig/mm/swap.c	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/mm/swap.c	2011-02-14 10:11:09.772252000 +1100
-@@ -215,15 +215,23 @@
- 
- EXPORT_SYMBOL(mark_page_accessed);
- 
--void __lru_cache_add(struct page *page, enum lru_list lru)
-+void ______pagevec_lru_add(struct pagevec *pvec, enum lru_list lru, int tail);
-+
-+void ____lru_cache_add(struct page *page, enum lru_list lru, int tail)
- {
- 	struct pagevec *pvec = &get_cpu_var(lru_add_pvecs)[lru];
- 
- 	page_cache_get(page);
- 	if (!pagevec_add(pvec, page))
--		____pagevec_lru_add(pvec, lru);
-+		______pagevec_lru_add(pvec, lru, tail);
- 	put_cpu_var(lru_add_pvecs);
- }
-+EXPORT_SYMBOL(____lru_cache_add);
-+
-+void __lru_cache_add(struct page *page, enum lru_list lru)
-+{
-+	____lru_cache_add(page, lru, 0);
-+}
- EXPORT_SYMBOL(__lru_cache_add);
- 
- /**
-@@ -231,7 +239,7 @@
-  * @page: the page to be added to the LRU.
-  * @lru: the LRU list to which the page is added.
-  */
--void lru_cache_add_lru(struct page *page, enum lru_list lru)
-+void __lru_cache_add_lru(struct page *page, enum lru_list lru, int tail)
- {
- 	if (PageActive(page)) {
- 		VM_BUG_ON(PageUnevictable(page));
-@@ -242,7 +250,12 @@
- 	}
- 
- 	VM_BUG_ON(PageLRU(page) || PageActive(page) || PageUnevictable(page));
--	__lru_cache_add(page, lru);
-+	____lru_cache_add(page, lru, tail);
-+}
-+
-+void lru_cache_add_lru(struct page *page, enum lru_list lru)
-+{
-+	__lru_cache_add_lru(page, lru, 0);
- }
- 
- /**
-@@ -403,7 +416,7 @@
-  * Add the passed pages to the LRU, then drop the caller's refcount
-  * on them.  Reinitialises the caller's pagevec.
-  */
--void ____pagevec_lru_add(struct pagevec *pvec, enum lru_list lru)
-+void ______pagevec_lru_add(struct pagevec *pvec, enum lru_list lru, int tail)
- {
- 	int i;
- 	struct zone *zone = NULL;
-@@ -431,7 +444,7 @@
- 		if (active)
- 			SetPageActive(page);
- 		update_page_reclaim_stat(zone, page, file, active);
--		add_page_to_lru_list(zone, page, lru);
-+		__add_page_to_lru_list(zone, page, lru, tail);
- 	}
- 	if (zone)
- 		spin_unlock_irq(&zone->lru_lock);
-@@ -439,6 +452,11 @@
- 	pagevec_reinit(pvec);
- }
- 
-+void ____pagevec_lru_add(struct pagevec *pvec, enum lru_list lru)
-+{
-+	______pagevec_lru_add(pvec, lru, 0);
-+}
-+
- EXPORT_SYMBOL(____pagevec_lru_add);
- 
- /*
-Index: linux-2.6.37-ck2/mm/page-writeback.c
-===================================================================
---- linux-2.6.37-ck2.orig/mm/page-writeback.c	2011-01-06 14:04:10.000000000 +1100
-+++ linux-2.6.37-ck2/mm/page-writeback.c	2011-02-14 10:11:10.037252000 +1100
-@@ -78,7 +78,7 @@
- /*
-  * The generator of dirty data starts writeback at this percentage
-  */
--int vm_dirty_ratio = 20;
-+int vm_dirty_ratio = 5;
- 
- /*
-  * vm_dirty_bytes starts at 0 (disabled) so that it is a function of
-Index: linux-2.6.37-ck2/arch/x86/Kconfig
-===================================================================
---- linux-2.6.37-ck2.orig/arch/x86/Kconfig	2011-01-06 14:04:08.000000000 +1100
-+++ linux-2.6.37-ck2/arch/x86/Kconfig	2011-02-14 10:11:10.260252001 +1100
-@@ -1046,7 +1046,7 @@
- 
- choice
- 	depends on EXPERIMENTAL
--	prompt "Memory split" if EMBEDDED
-+	prompt "Memory split"
- 	default VMSPLIT_3G
- 	depends on X86_32
- 	---help---
-@@ -1066,17 +1066,17 @@
- 	  option alone!
- 
- 	config VMSPLIT_3G
--		bool "3G/1G user/kernel split"
-+		bool "Default 896MB lowmem (3G/1G user/kernel split)"
- 	config VMSPLIT_3G_OPT
- 		depends on !X86_PAE
--		bool "3G/1G user/kernel split (for full 1G low memory)"
-+		bool "1GB lowmem (3G/1G user/kernel split)"
- 	config VMSPLIT_2G
--		bool "2G/2G user/kernel split"
-+		bool "2GB lowmem (2G/2G user/kernel split)"
- 	config VMSPLIT_2G_OPT
- 		depends on !X86_PAE
--		bool "2G/2G user/kernel split (for full 2G low memory)"
-+		bool "2GB lowmem (2G/2G user/kernel split)"
- 	config VMSPLIT_1G
--		bool "1G/3G user/kernel split"
-+		bool "3GB lowmem (1G/3G user/kernel split)"
- endchoice
- 
- config PAGE_OFFSET
-Index: linux-2.6.37-ck2/kernel/Kconfig.hz
-===================================================================
---- linux-2.6.37-ck2.orig/kernel/Kconfig.hz	2009-06-10 13:05:27.000000000 +1000
-+++ linux-2.6.37-ck2/kernel/Kconfig.hz	2011-02-14 10:11:10.921252001 +1100
-@@ -4,7 +4,7 @@
- 
- choice
- 	prompt "Timer frequency"
--	default HZ_250
-+	default HZ_1000
- 	help
- 	 Allows the configuration of the timer frequency. It is customary
- 	 to have the timer interrupt run at 1000 Hz but 100 Hz may be more
-@@ -23,13 +23,14 @@
- 	  with lots of processors that may show reduced performance if
- 	  too many timer interrupts are occurring.
- 
--	config HZ_250
-+	config HZ_250_NODEFAULT
- 		bool "250 HZ"
- 	help
--	 250 Hz is a good compromise choice allowing server performance
--	 while also showing good interactive responsiveness even
--	 on SMP and NUMA systems. If you are going to be using NTSC video
--	 or multimedia, selected 300Hz instead.
-+	 250 HZ is a lousy compromise choice allowing server interactivity
-+	 while also showing desktop throughput and no extra power saving on
-+	 laptops. No good for anything.
-+
-+	 Recommend 100 or 1000 instead.
- 
- 	config HZ_300
- 		bool "300 HZ"
-@@ -43,16 +44,82 @@
- 		bool "1000 HZ"
- 	help
- 	 1000 Hz is the preferred choice for desktop systems and other
--	 systems requiring fast interactive responses to events.
-+	 systems requiring fast interactive responses to events. Laptops
-+	 can also benefit from this choice without sacrificing battery life
-+	 if dynticks is also enabled.
-+
-+	config HZ_1500
-+		bool "1500 HZ"
-+	help
-+	 1500 Hz is an insane value to use to run broken software that is Hz
-+	 limited.
-+
-+	 Being over 1000, driver breakage is likely.
-+
-+	config HZ_2000
-+		bool "2000 HZ"
-+	help
-+	 2000 Hz is an insane value to use to run broken software that is Hz
-+	 limited.
-+
-+	 Being over 1000, driver breakage is likely.
-+
-+	config HZ_3000
-+		bool "3000 HZ"
-+	help
-+	 3000 Hz is an insane value to use to run broken software that is Hz
-+	 limited.
-+
-+	 Being over 1000, driver breakage is likely.
-+
-+	config HZ_4000
-+		bool "4000 HZ"
-+	help
-+	 4000 Hz is an insane value to use to run broken software that is Hz
-+	 limited.
-+
-+	 Being over 1000, driver breakage is likely.
-+
-+	config HZ_5000
-+		bool "5000 HZ"
-+	help
-+	 5000 Hz is an obscene value to use to run broken software that is Hz
-+	 limited.
-+
-+	 Being over 1000, driver breakage is likely.
-+
-+	config HZ_7500
-+		bool "7500 HZ"
-+	help
-+	 7500 Hz is an obscene value to use to run broken software that is Hz
-+	 limited.
-+
-+	 Being over 1000, driver breakage is likely.
-+
-+	config HZ_10000
-+		bool "10000 HZ"
-+	help
-+	 10000 Hz is an obscene value to use to run broken software that is Hz
-+	 limited.
-+
-+	 Being over 1000, driver breakage is likely.
-+
- 
- endchoice
- 
- config HZ
- 	int
- 	default 100 if HZ_100
--	default 250 if HZ_250
-+	default 250 if HZ_250_NODEFAULT
- 	default 300 if HZ_300
- 	default 1000 if HZ_1000
-+	default 1500 if HZ_1500
-+	default 2000 if HZ_2000
-+	default 3000 if HZ_3000
-+	default 4000 if HZ_4000
-+	default 5000 if HZ_5000
-+	default 7500 if HZ_7500
-+	default 10000 if HZ_10000
- 
- config SCHED_HRTICK
- 	def_bool HIGH_RES_TIMERS && (!SMP || USE_GENERIC_SMP_HELPERS)
-Index: linux-2.6.37-ck2/arch/x86/kernel/cpu/proc.c
-===================================================================
---- linux-2.6.37-ck2.orig/arch/x86/kernel/cpu/proc.c	2009-12-03 21:39:58.000000000 +1100
-+++ linux-2.6.37-ck2/arch/x86/kernel/cpu/proc.c	2011-02-14 10:11:10.919252001 +1100
-@@ -109,7 +109,7 @@
- 
- 	seq_printf(m, "\nbogomips\t: %lu.%02lu\n",
- 		   c->loops_per_jiffy/(500000/HZ),
--		   (c->loops_per_jiffy/(5000/HZ)) % 100);
-+		   (c->loops_per_jiffy * 10 /(50000/HZ)) % 100);
- 
- #ifdef CONFIG_X86_64
- 	if (c->x86_tlbsize > 0)
-Index: linux-2.6.37-ck2/arch/x86/kernel/smpboot.c
-===================================================================
---- linux-2.6.37-ck2.orig/arch/x86/kernel/smpboot.c	2011-01-06 14:04:08.000000000 +1100
-+++ linux-2.6.37-ck2/arch/x86/kernel/smpboot.c	2011-02-14 10:11:10.920252001 +1100
-@@ -497,7 +497,7 @@
- 		"Total of %d processors activated (%lu.%02lu BogoMIPS).\n",
- 		num_online_cpus(),
- 		bogosum/(500000/HZ),
--		(bogosum/(5000/HZ))%100);
-+		(bogosum * 10/(50000/HZ))%100);
- 
- 	pr_debug("Before bogocount - setting activated=1.\n");
- }
-Index: linux-2.6.37-ck2/include/linux/nfsd/stats.h
-===================================================================
---- linux-2.6.37-ck2.orig/include/linux/nfsd/stats.h	2009-06-10 13:05:27.000000000 +1000
-+++ linux-2.6.37-ck2/include/linux/nfsd/stats.h	2011-02-14 10:11:10.920252001 +1100
-@@ -11,8 +11,8 @@
- 
- #include <linux/nfs4.h>
- 
--/* thread usage wraps very million seconds (approx one fortnight) */
--#define	NFSD_USAGE_WRAP	(HZ*1000000)
-+/* thread usage wraps every one hundred thousand seconds (approx one day) */
-+#define	NFSD_USAGE_WRAP	(HZ*100000)
- 
- #ifdef __KERNEL__
- 
-Index: linux-2.6.37-ck2/include/net/inet_timewait_sock.h
-===================================================================
---- linux-2.6.37-ck2.orig/include/net/inet_timewait_sock.h	2010-08-02 11:12:25.000000000 +1000
-+++ linux-2.6.37-ck2/include/net/inet_timewait_sock.h	2011-02-14 10:11:10.920252001 +1100
-@@ -39,8 +39,8 @@
-  * If time > 4sec, it is "slow" path, no recycling is required,
-  * so that we select tick to get range about 4 seconds.
-  */
--#if HZ <= 16 || HZ > 4096
--# error Unsupported: HZ <= 16 or HZ > 4096
-+#if HZ <= 16 || HZ > 16384
-+# error Unsupported: HZ <= 16 or HZ > 16384
- #elif HZ <= 32
- # define INET_TWDR_RECYCLE_TICK (5 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)
- #elif HZ <= 64
-@@ -55,8 +55,12 @@
- # define INET_TWDR_RECYCLE_TICK (10 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)
- #elif HZ <= 2048
- # define INET_TWDR_RECYCLE_TICK (11 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)
--#else
-+#elif HZ <= 4096
- # define INET_TWDR_RECYCLE_TICK (12 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)
-+#elif HZ <= 8192
-+# define INET_TWDR_RECYCLE_TICK (13 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)
-+#else
-+# define INET_TWDR_RECYCLE_TICK (14 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)
- #endif
- 
- /* TIME_WAIT reaping mechanism. */
-Index: linux-2.6.37-ck2/init/calibrate.c
-===================================================================
---- linux-2.6.37-ck2.orig/init/calibrate.c	2010-02-25 21:51:52.000000000 +1100
-+++ linux-2.6.37-ck2/init/calibrate.c	2011-02-14 10:11:10.921252001 +1100
-@@ -176,7 +176,7 @@
- 	if (!printed)
- 		pr_cont("%lu.%02lu BogoMIPS (lpj=%lu)\n",
- 			loops_per_jiffy/(500000/HZ),
--			(loops_per_jiffy/(5000/HZ)) % 100, loops_per_jiffy);
-+			(loops_per_jiffy * 10 /(50000/HZ)) % 100, loops_per_jiffy);
- 
- 	printed = true;
- }
-Index: linux-2.6.37-ck2/kernel/Kconfig.preempt
-===================================================================
---- linux-2.6.37-ck2.orig/kernel/Kconfig.preempt	2009-06-10 13:05:27.000000000 +1000
-+++ linux-2.6.37-ck2/kernel/Kconfig.preempt	2011-02-14 10:11:11.217252001 +1100
-@@ -1,7 +1,7 @@
- 
- choice
- 	prompt "Preemption Model"
--	default PREEMPT_NONE
-+	default PREEMPT
- 
- config PREEMPT_NONE
- 	bool "No Forced Preemption (Server)"
-@@ -17,7 +17,7 @@
- 	  latencies.
- 
- config PREEMPT_VOLUNTARY
--	bool "Voluntary Kernel Preemption (Desktop)"
-+	bool "Voluntary Kernel Preemption (Nothing)"
- 	help
- 	  This option reduces the latency of the kernel by adding more
- 	  "explicit preemption points" to the kernel code. These new
-@@ -31,7 +31,8 @@
- 	  applications to run more 'smoothly' even when the system is
- 	  under load.
- 
--	  Select this if you are building a kernel for a desktop system.
-+	  Select this for no system in particular (choose Preemptible
-+	  instead on a desktop if you know what's good for you).
- 
- config PREEMPT
- 	bool "Preemptible Kernel (Low-Latency Desktop)"
-Index: linux-2.6.37-ck2/drivers/cpufreq/cpufreq_ondemand.c
-===================================================================
---- linux-2.6.37-ck2.orig/drivers/cpufreq/cpufreq_ondemand.c	2011-01-06 14:04:08.000000000 +1100
-+++ linux-2.6.37-ck2/drivers/cpufreq/cpufreq_ondemand.c	2011-02-14 10:11:11.438252001 +1100
-@@ -28,12 +28,12 @@
-  * It helps to keep variable names smaller, simpler
-  */
- 
--#define DEF_FREQUENCY_DOWN_DIFFERENTIAL		(10)
--#define DEF_FREQUENCY_UP_THRESHOLD		(80)
-+#define DEF_FREQUENCY_DOWN_DIFFERENTIAL		(17)
-+#define DEF_FREQUENCY_UP_THRESHOLD		(63)
- #define DEF_SAMPLING_DOWN_FACTOR		(1)
- #define MAX_SAMPLING_DOWN_FACTOR		(100000)
- #define MICRO_FREQUENCY_DOWN_DIFFERENTIAL	(3)
--#define MICRO_FREQUENCY_UP_THRESHOLD		(95)
-+#define MICRO_FREQUENCY_UP_THRESHOLD		(80)
- #define MICRO_FREQUENCY_MIN_SAMPLE_RATE		(10000)
- #define MIN_FREQUENCY_UP_THRESHOLD		(11)
- #define MAX_FREQUENCY_UP_THRESHOLD		(100)
-@@ -513,10 +513,10 @@
- 
- 	/*
- 	 * Every sampling_rate, we check, if current idle time is less
--	 * than 20% (default), then we try to increase frequency
-+	 * than 37% (default), then we try to increase frequency
- 	 * Every sampling_rate, we look for a the lowest
- 	 * frequency which can sustain the load while keeping idle time over
--	 * 30%. If such a frequency exist, we try to decrease to this frequency.
-+	 * 50%. If such a frequency exist, we try to decrease to this frequency.
- 	 *
- 	 * Any frequency increase takes it to the maximum frequency.
- 	 * Frequency reduction happens at minimum steps of
-Index: linux-2.6.37-ck2/Makefile
-===================================================================
---- linux-2.6.37-ck2.orig/Makefile	2011-01-06 14:04:07.000000000 +1100
-+++ linux-2.6.37-ck2/Makefile	2011-02-14 10:11:20.469252000 +1100
-@@ -10,6 +10,10 @@
- # Comments in this file are targeted only to the developer, do not
- # expect to learn how to build the kernel reading this file.
- 
-+CKVERSION = -ck2
-+CKNAME = BFS Powered
-+EXTRAVERSION := $(EXTRAVERSION)$(CKVERSION)
-+
- # Do not:
- # o  use make's built-in rules and variables
- #    (this increases performance and avoids hard-to-debug behaviour);
author	Cecil <knoppmyth@gmail.com>	2011-07-17 20:40:13 (GMT)
committer	Cecil <knoppmyth@gmail.com>	2011-07-17 20:40:13 (GMT)
commit	99940cf1f228736b21713df64f993015ae0d586d (patch)
tree	66681918a7fdaddfeced8d977c46c63cc6c4ba8b /abs/core/kernel26
parent	de0161dec5775de3e8929570ae2fd19d2359df11 (diff)
download	linhes_pkgbuild-99940cf1f228736b21713df64f993015ae0d586d.zip linhes_pkgbuild-99940cf1f228736b21713df64f993015ae0d586d.tar.gz linhes_pkgbuild-99940cf1f228736b21713df64f993015ae0d586d.tar.bz2