Permalink
Browse files

ermmm

  • Loading branch information...
playfulgod committed Jun 9, 2012
1 parent 1dccc69 commit e72f7c2fa16c6e086ef9a7395602d85a328aa79c
@@ -35,15 +35,15 @@ CONFIG_BROKEN_ON_SMP=y
CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="$(KERNEL_LOCAL_VERSION)-Plague"
+CONFIG_LOCALVERSION="$(KERNEL_LOCAL_VERSION)"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KERNEL_LZO=y
CONFIG_KERNEL_GZIP=y
# CONFIG_KERNEL_LZMA is not set
# CONFIG_KERNEL_LZO is not set
-# CONFIG_SWAP is not set
+CONFIG_SWAP=y
CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_POSIX_MQUEUE is not set
@@ -174,11 +174,14 @@ CONFIG_LBDAF=y
# IO Schedulers
#
CONFIG_IOSCHED_NOOP=y
-# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_DEADLINE=Y
CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_CFQ=y
+CONFIG_IOSCHED_SIO=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
+# CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_DEFAULT_IOSCHED="sio"
# CONFIG_INLINE_SPIN_TRYLOCK is not set
# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
# CONFIG_INLINE_SPIN_LOCK is not set
@@ -399,7 +402,6 @@ CONFIG_MSM_CPU_FREQ_MIN=245760
# CONFIG_MSM_RMT_STORAGE_CLIENT_STATS is not set
CONFIG_MSM_DALRPC=y
# CONFIG_MSM_DALRPC_TEST is not set
-# CONFIG_MSM_CPU_FREQ_SET_MIN_MAX is not set
# CONFIG_MSM_AVS_HW is not set
# CONFIG_MSM_HW3D is not set
CONFIG_MSM_ADSP=y
@@ -562,19 +564,23 @@ CONFIG_CPU_FREQ_TABLE=y
CONFIG_CPU_FREQ_DEBUG=y
CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE 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_DEFAULT_GOV_INTERACTIVE is not set
+CONFIG_CPU_FREQ_DEFAULT_DEFAULT_GOV_SMARTASS2=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_LAGFREE is not set
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
CONFIG_CPU_FREQ_GOV_USERSPACE=y
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-# CONFIG_CPU_IDLE is not set
+CONFIG_CPU_FREQ_GOV_SMARTASS2=y
+CONFIG_CPU_FREQ_GOV_LAGFREE=y
+CONFIG_CPU_IDLE=y
CONFIG_CPU_FREQ_MSM=y
#
@@ -1101,8 +1107,8 @@ CONFIG_NETDEV_1000=y
CONFIG_WLAN=y
# CONFIG_USB_ZD1201 is not set
CONFIG_LIBRA_SDIOIF=m
-# CONFIG_BCM4329 is not set
-# CONFIG_HOSTAP is not set
+# CONFIG_BCM4329=m
+# CONFIG_HOSTAP=m
#
# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -396,6 +396,15 @@ static struct clkctl_acpu_speed pll0_960_pll1_589_pll2_1200_pll4_800[] = {
{ 1, 934400, ACPU_PLL_4, 6, 0, 120000, 3, 7, 200000 },
{ 1, 988800, ACPU_PLL_4, 6, 0, 126000, 3, 7, 200000},
{ 1, 1008000, ACPU_PLL_4, 6, 0, 126000, 3, 7, 200000},
+ { 1, 1100000, ACPU_PLL_4, 6, 0, 128000, 3, 7, 200000},
+ { 1, 1150000, ACPU_PLL_4, 6, 0, 128000, 3, 7, 200000},
+ { 1, 1200000, ACPU_PLL_4, 6, 0, 130000, 3, 7, 200000},
+ { 1, 1250000, ACPU_PLL_4, 6, 0, 130000, 3, 7, 200000},
+ { 1, 1300000, ACPU_PLL_4, 6, 0, 132000, 3, 7, 200000},
+ { 1, 1350000, ACPU_PLL_4, 6, 0, 132000, 3, 7, 200000},
+ { 1, 1400000, ACPU_PLL_4, 6, 0, 134000, 3, 7, 200000},
+ { 1, 1450000, ACPU_PLL_4, 6, 0, 134000, 3, 7, 200000},
+ { 1, 1500000, ACPU_PLL_4, 6, 0, 136000, 3, 7, 200000},
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0}, {0, 0, 0, 0} }
};
View
@@ -59,12 +59,17 @@ choice
config DEFAULT_NOOP
bool "No-op"
+ config DEFAULT_SIO
+
+ bool "SIO" if IOSCHED_SIO=y
+
endchoice
config DEFAULT_IOSCHED
string
default "deadline" if DEFAULT_DEADLINE
default "cfq" if DEFAULT_CFQ
+ default "sio" if DEFAULT_SIO
default "noop" if DEFAULT_NOOP
endmenu
View
@@ -13,6 +13,7 @@ obj-$(CONFIG_BLK_DEV_THROTTLING) += blk-throttle.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_SIO) += sio-iosched.o
obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o
obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o
Oops, something went wrong.

0 comments on commit e72f7c2

Please sign in to comment.