revert I/O Schedulers, SLQB allocator and governor

arch/arm/mach-s5pv310/cpufreq.c

@@ -38,7 +38,7 @@
 #endif
 
 #include <plat/pm.h>
-
+#include <plat/s5p-tmu.h>
 #include <plat/s5pv310.h>
 
 #include <mach/cpufreq.h>
@@ -1186,9 +1186,7 @@ static int s5pv310_target(struct cpufreq_policy *policy,
 	}
 
 	if (!strncmp(policy->governor->name, "ondemand", CPUFREQ_NAME_LEN)
-	||  !strncmp(policy->governor->name, "conservative", CPUFREQ_NAME_LEN)
-	||  !strncmp(policy->governor->name, "interactive", CPUFREQ_NAME_LEN)
-	) {
+	|| !strncmp(policy->governor->name, "conservative", CPUFREQ_NAME_LEN)) {
 		check_gov = 1;
 		if (relation & ENABLE_FURTHER_CPUFREQ)
 			s5pv310_dvs_locking = 0;
@@ -1595,13 +1593,6 @@ int s5pv310_cpufreq_lock(unsigned int nId,
 		}
 	}
 
-	/* touch screen lock the minimum freq at 500MHz */
-	if (s5pv310_max_armclk == ARMCLOCK_1200MHZ) {
-		if (cpufreq_level != CPU_L0) {
-			cpufreq_level += 2;
-		}
-	}
-
 	if (g_cpufreq_lock_id & (1 << nId)) {
 		printk(KERN_ERR
 		"[CPUFREQ]This device [%d] already locked cpufreq\n", nId);
@@ -1671,12 +1662,6 @@ int s5pv310_cpufreq_upper_limit(unsigned int nId, enum cpufreq_level_request cpu
 		return 0;
 	}
 
-	if (s5pv310_max_armclk == ARMCLOCK_1200MHZ) {
-		if (cpufreq_level != CPU_L0) {
-			cpufreq_level += 2;
-		}
-	}
-
 	mutex_lock(&set_cpu_freq_lock);
 	g_cpufreq_limit_id |= (1 << nId);
 	g_cpufreq_limit_val[nId] = cpufreq_level;
@@ -1792,7 +1777,7 @@ static int s5pv310_cpufreq_notifier_event(struct notifier_block *this,
 	case PM_SUSPEND_PREPARE:
 		max = policy->max;
 		min = policy->min;
-		policy->max = policy->min = s5pv310_freq_table[L2].frequency;
+		policy->max = policy->min = s5pv310_freq_table[CUST_SUSPEND_CLK_L].frequency;
 		ret = cpufreq_driver_target(policy,
 		s5pv310_freq_table[CUST_SUSPEND_CLK_L].frequency, DISABLE_FURTHER_CPUFREQ);
 		if (WARN_ON(ret < 0))

block/Kconfig.iosched

@@ -43,45 +43,6 @@ config CFQ_GROUP_IOSCHED
 	---help---
 	  Enable group IO scheduling in CFQ.
 
-config IOSCHED_BFQ
-	tristate "BFQ I/O scheduler"
-	depends on EXPERIMENTAL
-	default n
-	---help---
-	  The BFQ I/O scheduler tries to distribute bandwidth among
-	  all processes according to their weights.
-	  It aims at distributing the bandwidth as desired, independently of
-	  the disk parameters and with any workload. It also tries to
-	  guarantee low latency to interactive and soft real-time
-	  applications.  If compiled built-in (saying Y here), BFQ can
-	  be configured to support hierarchical scheduling.
-
-config CGROUP_BFQIO
-	bool "BFQ hierarchical scheduling support"
-	depends on CGROUPS && IOSCHED_BFQ=y
-	default n
-	---help---
-	  Enable hierarchical scheduling in BFQ, using the cgroups
-	  filesystem interface.  The name of the subsystem will be
-	  bfqio.
-
-config IOSCHED_VR
-	tristate "V(R) I/O scheduler"
-	default n
-	---help---
-	  Requests are chosen according to SSTF with a penalty of rev_penalty
-	  for switching head direction.
-
-config IOSCHED_SIO
-	tristate "Simple I/O scheduler"
-	default y
-	---help---
-	  The Simple I/O scheduler is an extremely simple scheduler,
-	  based on noop and deadline, that relies on deadlines to
-	  ensure fairness. The algorithm does not do any sorting but
-	  basic merging, trying to keep a minimum overhead. It is aimed
-	  mainly for aleatory access devices (eg: flash devices).
-
 choice
 	prompt "Default I/O scheduler"
 	default DEFAULT_CFQ
@@ -95,32 +56,16 @@ choice
 	config DEFAULT_CFQ
 		bool "CFQ" if IOSCHED_CFQ=y
 
-	config DEFAULT_BFQ
-		bool "BFQ" if IOSCHED_BFQ=y
-
-	config DEFAULT_SIO
-		bool "SIO" if IOSCHED_SIO=y
-
 	config DEFAULT_NOOP
 		bool "No-op"
 
-	config DEFAULT_VR
-		bool "V(R)" if IOSCHED_VR=y
-
-	config DEFAULT_AS
-		bool "Anticipatory" if IOSCHED_AS=y
-
 endchoice
 
 config DEFAULT_IOSCHED
 	string
 	default "deadline" if DEFAULT_DEADLINE
 	default "cfq" if DEFAULT_CFQ
 	default "noop" if DEFAULT_NOOP
-	default "vr" if DEFAULT_VR
-	default "bfq" if DEFAULT_BFQ
-	default "sio" if DEFAULT_SIO
-	default "anticipatory" if DEFAULT_AS
 
 endmenu
 

block/Makefile

@@ -12,10 +12,6 @@ obj-$(CONFIG_BLK_CGROUP)	+= blk-cgroup.o
 obj-$(CONFIG_IOSCHED_NOOP)	+= noop-iosched.o
 obj-$(CONFIG_IOSCHED_DEADLINE)	+= deadline-iosched.o
 obj-$(CONFIG_IOSCHED_CFQ)	+= cfq-iosched.o
-obj-$(CONFIG_IOSCHED_VR)	+= vr-iosched.o
-obj-$(CONFIG_IOSCHED_BFQ)	+= bfq-iosched.o
-obj-$(CONFIG_IOSCHED_SIO)	+= sio-iosched.o
-obj-$(CONFIG_IOSCHED_SIO)	+= as-iosched.o
 
 obj-$(CONFIG_BLOCK_COMPAT)	+= compat_ioctl.o
 obj-$(CONFIG_BLK_DEV_INTEGRITY)	+= blk-integrity.o