Append "DEFAULT_BFQ" to the default I/O scheduler

block/Kconfig.iosched

@@ -53,6 +53,9 @@ choice
 	config DEFAULT_CFQ
 		bool "CFQ" if IOSCHED_CFQ=y
 
+	config DEFAULT_BFQ
+		bool "BFQ" if IOSCHED_BFQ=y
+
 	config DEFAULT_NOOP
 		bool "No-op"
 
@@ -62,6 +65,7 @@ config DEFAULT_IOSCHED
 	string
 	default "deadline" if DEFAULT_DEADLINE
 	default "cfq" if DEFAULT_CFQ
+	default "bfq" if DEFAULT_BFQ
 	default "noop" if DEFAULT_NOOP
 
 config MQ_IOSCHED_DEADLINE

drivers/char/Kconfig

@@ -25,6 +25,15 @@ config DEVKMEM
 	  kind of kernel debugging operations.
 	  When in doubt, say "N".
 
+config WASAWASA
+	tristate "/dev/wasawasa virtual device support"
+	default n
+	help
+	  Say Y here if you want to support the /dev/sawasawa device.
+	  To compile this driver as a module, choose M here: the module
+	  will be called wasawasa.
+	  When in doubt, say "N".
+
 config SGI_SNSC
 	bool "SGI Altix system controller communication support"
 	depends on (IA64_SGI_SN2 || IA64_GENERIC)

drivers/char/Makefile

@@ -14,6 +14,7 @@ obj-$(CONFIG_UV_MMTIMER)	+= uv_mmtimer.o
 obj-$(CONFIG_IBM_BSR)		+= bsr.o
 obj-$(CONFIG_SGI_MBCS)		+= mbcs.o
 obj-$(CONFIG_BFIN_OTP)		+= bfin-otp.o
+obj-$(CONFIG_WASAWASA)		+= wasawasa.o
 
 obj-$(CONFIG_PRINTER)		+= lp.o
 

drivers/char/wasawasa.c

@@ -0,0 +1,95 @@
+/*
+ * wasawasa - Baby, please kernel module. (BPKM)
+ * 
+ * Copyright © 2014 sasairc
+ * This work is free. You can redistribute it and/or modify it under the
+ * terms of the Do What The Fuck You Want To Public License, Version 2,
+ * as published by Sam Hocevar.Hocevar See the COPYING file or http://www.wtfpl.net/
+ * for more details.
+ */
+
+#include <linux/semaphore.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/fs.h>
+#include <linux/cdev.h>
+#include <linux/uaccess.h>
+#include <asm/string.h>
+
+#define MODNAME     "wasawasa"
+#define CHAR_MAJOR  254
+#define CHAR_MINOR  1
+
+MODULE_LICENSE("WTFPL");
+MODULE_AUTHOR("sasairc");
+
+static struct cdev      cdev;
+static struct semaphore sema;
+
+static
+int open_wasawasa(struct inode *inode, struct file *file)
+{
+    return 0;
+}
+
+static
+int release_wasawasa(struct inode *inode, struct file *file)
+{
+    return 0;
+}
+
+static
+ssize_t read_wasawasa(struct file *file, char *buf, size_t count, loff_t *offset)
+{
+    ssize_t     len = 0;
+
+    const char* str = "わさわさ";
+
+    down_interruptible(&sema);
+    if ((len = strlen(str)) > 0) {
+        copy_to_user(buf, str, len);
+        *offset += len;
+    }
+    up(&sema);
+
+    return len;
+}
+
+static
+struct file_operations cdev_fops = {
+    .owner      = THIS_MODULE,
+    .open       = open_wasawasa,
+    .read       = read_wasawasa,
+    .release    = release_wasawasa,
+};
+
+static
+int __init init_wasawasa(void)
+{
+    int     ret = 0;
+
+    dev_t   dev;
+
+    dev = MKDEV(CHAR_MAJOR, 0);
+    cdev_init(&cdev, &cdev_fops);
+    if ((ret = cdev_add(&cdev, dev, CHAR_MINOR)) < 0)
+        printk(KERN_WARNING "%s: cdev_add() failure.\n",
+                MODNAME);
+    else
+        sema_init(&sema, 1);
+
+    return ret;
+}
+
+static
+void __exit exit_wasawasa(void)
+{
+    dev_t   dev;
+
+    dev = MKDEV(CHAR_MAJOR, 0);
+    cdev_del(&cdev);
+    unregister_chrdev_region(dev, CHAR_MINOR);
+}
+
+module_init(init_wasawasa);
+module_exit(exit_wasawasa);

drivers/video/logo/Kconfig

@@ -27,6 +27,18 @@ config LOGO_LINUX_CLUT224
 	bool "Standard 224-color Linux logo"
 	default y
 
+config LOGO_VIM_CLUT224
+	bool "224-color Vi IMproved (vim) logo"
+	default y
+
+config LOGO_NAXTU_CLUT224
+	bool "224-color NAXTU logo"
+	default y
+	help
+  	  Say Y here if you want to see the NAXTU face.
+	  "It's too awesome!! I'm coming, I'm coming, I'm coming, I'm coming...
+	   Ah...! Hmmm, Ahhhhhh!!"
+
 config LOGO_BLACKFIN_VGA16
 	bool "16-colour Blackfin Processor Linux logo"
 	depends on BLACKFIN

drivers/video/logo/Makefile

@@ -4,6 +4,8 @@ obj-$(CONFIG_LOGO)			+= logo.o
 obj-$(CONFIG_LOGO_LINUX_MONO)		+= logo_linux_mono.o
 obj-$(CONFIG_LOGO_LINUX_VGA16)		+= logo_linux_vga16.o
 obj-$(CONFIG_LOGO_LINUX_CLUT224)	+= logo_linux_clut224.o
+obj-$(CONFIG_LOGO_VIM_CLUT224)		+= logo_vim_clut224.o
+obj-$(CONFIG_LOGO_NAXTU_CLUT224)	+= logo_naxtu_clut224.o
 obj-$(CONFIG_LOGO_BLACKFIN_CLUT224)	+= logo_blackfin_clut224.o
 obj-$(CONFIG_LOGO_BLACKFIN_VGA16)	+= logo_blackfin_vga16.o
 obj-$(CONFIG_LOGO_DEC_CLUT224)		+= logo_dec_clut224.o

drivers/video/logo/logo.c

@@ -82,6 +82,14 @@ const struct linux_logo * __ref fb_find_logo(int depth)
 		/* Blackfin Linux logo */
 		logo = &logo_blackfin_clut224;
 #endif
+#ifdef CONFIG_LOGO_VIM_CLUT224
+		/* Vi IMproved (vim) logo */
+		logo = &logo_vim_clut224;
+#endif
+#ifdef CONFIG_LOGO_NAXTU_CLUT224
+		/* NAXTU logo */
+		logo = &logo_naxtu_clut224;
+#endif
 #ifdef CONFIG_LOGO_DEC_CLUT224
 		/* DEC Linux logo on MIPS/MIPS64 or ALPHA */
 		logo = &logo_dec_clut224;

include/linux/linux_logo.h

@@ -35,6 +35,8 @@ struct linux_logo {
 extern const struct linux_logo logo_linux_mono;
 extern const struct linux_logo logo_linux_vga16;
 extern const struct linux_logo logo_linux_clut224;
+extern const struct linux_logo logo_vim_clut224;
+extern const struct linux_logo logo_naxtu_clut224;
 extern const struct linux_logo logo_blackfin_vga16;
 extern const struct linux_logo logo_blackfin_clut224;
 extern const struct linux_logo logo_dec_clut224;