Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_device_samsung_i9300 into replicant-6.0replicant-6.0-alpha-0006

2 files changed, 55 insertions, 20 deletions

diff --git a/rootdir/fstab.smdk4x12 b/rootdir/fstab.smdk4x12
index 507d3ed..dba5118 100644
--- a/rootdir/fstab.smdk4x12
+++ b/rootdir/fstab.smdk4x12
@@ -4,9 +4,12 @@
 # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
 /dev/block/mmcblk0p3		/efs			ext4		noatime,nosuid,nodev,journal_async_commit,errors=panic		wait
 /dev/block/mmcblk0p9		/system			ext4		ro,noatime		wait
+/dev/block/mmcblk0p8		/cache			f2fs		noatime,discard,inline_xattr,inline_data,nosuid,nodev		wait
 /dev/block/mmcblk0p8		/cache			ext4		noatime,nosuid,nodev,journal_async_commit,errors=panic		wait
 /dev/block/mmcblk0p10		/preload		ext4		noatime,nosuid,nodev,journal_async_commit		wait
+/dev/block/mmcblk0p12		/data			f2fs		noatime,discard,inline_xattr,inline_data,nosuid,nodev		wait,check,encryptable=footer
 /dev/block/mmcblk0p12		/data			ext4		noatime,nosuid,nodev,noauto_da_alloc,journal_async_commit,errors=panic		wait,check,encryptable=footer
+/dev/block/platform/dw_mmc/by-name/OTA /misc emmc		defaults										defaults 
 
 # vold-managed volumes ("block device" is actually a sysfs devpath)
 /devices/platform/s3c-sdhci.2/mmc_host/mmc1*		/storage/sdcard1		auto		defaults		voldmanaged=sdcard1:auto,encryptable=userdata
@@ -18,4 +21,4 @@
 /dev/block/mmcblk0p7		/modem				emmc		defaults		recoveryonly
 
 # zram
-/dev/block/zram0			none				swap		defaults		zramsize=268435456
+/dev/block/zram0			none				swap		defaults		zramsize=419430400,zramstreams=2
diff --git a/rootdir/init.target.rc b/rootdir/init.target.rc
index 45b4501..4fcf34d 100644
--- a/rootdir/init.target.rc
+++ b/rootdir/init.target.rc
@@ -1,6 +1,57 @@
 on init
 # ko files for FM Radio
     insmod /system/lib/modules/Si4709_driver.ko
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/boost_freq
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/boost_lock_time
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/boost_mincpus
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/cpu_down_freq
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/cpu_down_rate
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/cpu_up_freq
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/cpu_up_rate
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/cpucore_table
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/down_differential
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/dvfs_debug
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/freq_step
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_freq_1_1
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_freq_2_0
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_freq_2_1
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_freq_3_0
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_freq_3_1
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_freq_4_0
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_lock
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_rq_1_1
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_rq_2_0
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_rq_2_1
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_rq_3_0
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_rq_3_1
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_rq_4_0
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/ignore_nice_load
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/io_is_busy
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/up_threshold
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/min_cpu_lock
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/max_cpu_lock
+    chown system system /sys/devices/system/cpu/cpufreq/pegasusq/sampling_rate
+
+on boot
+    # Flash storage isn't a good entropy source, and only causes
+    # locking overhead in the kernel. Turn it off.
+    write /sys/block/mmcblk0/queue/add_random 0
+    write /sys/block/mmcblk1/queue/add_random 0
+
+    # KSM
+    write /sys/kernel/mm/ksm/deferred_timer 1
+    write /sys/kernel/mm/ksm/pages_to_scan 100
+    write /sys/kernel/mm/ksm/sleep_millisecs 500
+    write /sys/kernel/mm/ksm/run 0
+
+    # Swapping 1 page at a time is ok
+    write /proc/sys/vm/page-cluster 0
+
+    write /proc/sys/vm/swappiness 100
+
+    # increase read-ahead value to 256 kb
+    write /sys/block/mmcblk0/queue/read_ahead_kb 256
 
 
 on post-fs-data
@@ -50,22 +101,3 @@ on fs
 #    user gps
 #    group system inet sdcard_rw gps
 #    seclabel u:r:glgps:s0
-
-on property:dev.bootcomplete=1
-# boot on default pegasusq settings (for better performance)
-# switch to more conservative settings after bootup is complete
-    write /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_freq_1_1 500000
-    write /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_freq_2_0 500000
-    write /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_freq_2_1 700000
-    write /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_freq_3_0 700000
-    write /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_freq_3_1 900000
-    write /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_freq_4_0 900000
-    write /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_rq_1_1 150
-    write /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_rq_2_0 150
-    write /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_rq_2_1 250
-    write /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_rq_3_0 250
-    write /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_rq_3_1 350
-    write /sys/devices/system/cpu/cpufreq/pegasusq/hotplug_rq_4_0 450
-    write /sys/devices/system/cpu/cpufreq/pegasusq/up_threshold 90
-    write /sys/devices/system/cpu/cpufreq/pegasusq/cpu_down_rate 10
-    write /sys/devices/system/cpu/cpufreq/pegasusq/down_differential 3