Permalink
Browse files

Merge branch 'android-2.6.35.7-1.4' into android-2.6.35.7

Conflicts:
	arch/arm/configs/c1_cm7_sakuramilk_defconfig
	arch/arm/configs/c1_sakuramilk_defconfig
  • Loading branch information...
sakuramilk committed Oct 13, 2011
2 parents eed6b84 + cc2a330 commit 3109cf6ccd54f3641caad57fb5a657ffe8cc1eaf
Showing with 13,524 additions and 823 deletions.
  1. +1 −0 .gitignore
  2. +36 −9 arch/arm/configs/c1_cm7_sakuramilk_defconfig
  3. +34 −9 arch/arm/configs/c1_sakuramilk_defconfig
  4. +2,592 −0 arch/arm/configs/c1_sc02c_defconfig
  5. +8 −0 arch/arm/mach-s5pv310/Kconfig
  6. +1 −1 arch/arm/mach-s5pv310/cpu.c
  7. +277 −717 arch/arm/mach-s5pv310/cpufreq-oc.c
  8. +3 −1 arch/arm/mach-s5pv310/cpufreq.c
  9. +10 −5 arch/arm/mach-s5pv310/include/mach/cpufreq.h
  10. +1 −1 arch/arm/mm/alignment.c
  11. +1 −0 arch/x86/include/asm/page.h
  12. +73 −0 build.sh
  13. +158 −0 drivers/cpufreq/Kconfig
  14. +14 −6 drivers/cpufreq/Makefile
  15. +47 −3 drivers/cpufreq/cpufreq.c
  16. +825 −0 drivers/cpufreq/cpufreq_brazilianwax.c
  17. +2 −2 drivers/cpufreq/cpufreq_interactive.c
  18. +393 −0 drivers/cpufreq/cpufreq_interactivex.c
  19. +662 −0 drivers/cpufreq/cpufreq_lagfree.c
  20. +573 −0 drivers/cpufreq/cpufreq_minmax.c
  21. +6 −3 drivers/cpufreq/cpufreq_ondemand.c
  22. +883 −0 drivers/cpufreq/cpufreq_ondemandx.c
  23. +751 −0 drivers/cpufreq/cpufreq_savagedzen.c
  24. +760 −0 drivers/cpufreq/cpufreq_smartass.c
  25. +868 −0 drivers/cpufreq/cpufreq_smartass2.c
  26. +28 −2 drivers/input/keyboard/cypress/cypress-touchkey.c
  27. +7 −0 drivers/media/video/samsung/mali/Kconfig
  28. +25 −1 drivers/media/video/samsung/mali/Makefile
  29. +72 −0 drivers/media/video/samsung/mali/common/gpu_clock_control.c
  30. +14 −0 drivers/media/video/samsung/mali/common/gpu_clock_control.h
  31. +6 −0 drivers/media/video/samsung/mali/linux/mali_kernel_pm.c
  32. +33 −3 drivers/media/video/samsung/mali/platform/orion-m400/mali_platform_dvfs.c
  33. +7 −0 drivers/media/video/samsung/tvout/Makefile
  34. +1 −1 drivers/usb/gadget/f_mass_storage.c
  35. +79 −53 include/linux/cpucust.h
  36. +15 −0 include/linux/cpufreq.h
  37. +5 −1 include/linux/mm.h
  38. +18 −0 include/linux/rcu_type.h
  39. +4 −2 include/linux/slab.h
  40. +301 −0 include/linux/slqb_def.h
  41. +2 −1 include/linux/swap.h
  42. +4 −1 init/Kconfig
  43. +1 −1 init/main.c
  44. +20 −0 lib/Kconfig.debug
  45. +1 −0 mksc02c-cm7.sh
  46. +1 −0 mksc02c.sh
  47. +1 −0 mm/Makefile
  48. +3,817 −0 mm/slqb.c
  49. +46 −0 usr/galaxys2_initramfs.list
  50. BIN usr/galaxys2_initramfs_files/busybox
  51. +37 −0 usr/galaxys2_initramfs_files/init
  52. BIN usr/galaxys2_initramfs_files/read_boot_headers
View
@@ -33,6 +33,7 @@ modules.builtin
*.gcno
*.log
out
build
#
# Top-level generic files
@@ -38,7 +38,7 @@ CONFIG_EXPERIMENTAL=y
CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
CONFIG_LOCALVERSION="-SC02C-SKLMLK-V1.3.10-CM"
CONFIG_LOCALVERSION="-SC02C-SKLMLK-V1.4.9"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
@@ -109,8 +109,8 @@ CONFIG_SYSCTL_SYSCALL=y
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_EXTRA_PASS is not set
CONFIG_HOTPLUG=y
# CONFIG_PRINTK is not set
# CONFIG_SEC_LOG is not set
#CONFIG_PRINTK is not set
#CONFIG_SEC_LOG is not set
CONFIG_BUG=y
CONFIG_ELF_CORE=y
CONFIG_BASE_FULL=y
@@ -134,7 +134,8 @@ CONFIG_VM_EVENT_COUNTERS=y
# CONFIG_SLUB_DEBUG is not set
CONFIG_COMPAT_BRK=y
# CONFIG_SLAB is not set
CONFIG_SLUB=y
# CONFIG_SLUB is not set
CONFIG_SLQB=y
# CONFIG_SLOB is not set
CONFIG_PROFILING=y
CONFIG_OPROFILE=y
@@ -450,13 +451,18 @@ CONFIG_FREQ_STEP_UP_L2_L0=y
#
# CPUFreq overclock
#
#CONFIG_FREQ_OVERCLOCK is not set
CONFIG_FREQ_OVERCLOCK=y
#
# build target CyanogenMod7
#
CONFIG_BUILD_TARGET_CM7=y
#
# sakuramod kernel build
#
# CONFIG_SAKURAMOD is not set
#
# Processor Type
#
@@ -585,16 +591,32 @@ CONFIG_CPU_FREQ_STAT=y
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_SMARTASS is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMANDX is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVEX is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_MINMAX is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_LAGFREE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_SMARTASS2 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_ONDEMANDX=y
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
# CONFIG_CPU_FREQ_GOV_INTERACTIVE is not set
CONFIG_CPU_FREQ_GOV_INTERACTIVEX=y
CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
CONFIG_CPU_FREQ_GOV_MINMAX=y
CONFIG_CPU_FREQ_GOV_LAGFREE=y
CONFIG_CPU_FREQ_GOV_SMARTASS=y
CONFIG_CPU_FREQ_GOV_SMARTASS2=y
CONFIG_CPU_FREQ_GOV_SAVAGEDZEN=y
CONFIG_CPU_FREQ_GOV_BRAZILIANWAX=y
CONFIG_CPU_FREQ_MIN_TICKS=10
CONFIG_CPU_FREQ_SAMPLING_LATENCY_MULTIPLIER=1000
CONFIG_CPU_IDLE=y
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y
@@ -1673,6 +1695,7 @@ CONFIG_MALI_OSMEM_ONLY=y
# CONFIG_MALI_DED_OSMEM is not set
# CONFIG_VIDEO_MALI400MP_DEBUG is not set
CONFIG_VIDEO_MALI400MP_DVFS=y
CONFIG_GPU_CLOCK_CONTROL=y
CONFIG_VIDEO_UMP=y
# CONFIG_UMP_DED_ONLY is not set
CONFIG_UMP_OSMEM_ONLY=y
@@ -2042,8 +2065,12 @@ CONFIG_USB_ANDROID_MASS_STORAGE=y
# CONFIG_USB_ANDROID_MTP is not set
CONFIG_USB_ANDROID_RNDIS=y
CONFIG_USB_ANDROID_RNDIS_WCEIS=y
CONFIG_USB_ANDROID_RNDIS_DWORD_ALIGNED=y
CONFIG_USB_ANDROID_ACCESSORY=y
# CONFIG_USB_ANDROID_SAMSUNG_COMPOSITE is not set
# CONFIG_USB_ANDROID_SAMSUNG_ESCAPE is not set
# CONFIG_USB_ANDROID_SAMSUNG_KIES_UMS is not set
# CONFIG_CONFIG_USB_ANDROID_SAMSUNG_RNDIS_WITH_MS_COMPOSITE is not set
# CONFIG_USB_ANDROID_SAMSUNG_MTP is not set
# CONFIG_USB_CDC_COMPOSITE is not set
# CONFIG_USB_G_NOKIA is not set
@@ -2400,7 +2427,7 @@ CONFIG_MAGIC_SYSRQ=y
# CONFIG_HEADERS_CHECK is not set
# CONFIG_DEBUG_KERNEL is not set
# CONFIG_STACKTRACE is not set
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_BUGVERBOSE is not set
# CONFIG_DEBUG_MEMORY_INIT is not set
CONFIG_FRAME_POINTER=y
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -38,7 +38,7 @@ CONFIG_EXPERIMENTAL=y
CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
CONFIG_LOCALVERSION="-SC02COMKI1-SKLMLK-V1.3.8"
CONFIG_LOCALVERSION="-SC02COMKJ1-SKLMLK-V1.4.9"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
@@ -109,8 +109,8 @@ CONFIG_SYSCTL_SYSCALL=y
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_EXTRA_PASS is not set
CONFIG_HOTPLUG=y
CONFIG_PRINTK=y
CONFIG_SEC_LOG=y
# CONFIG_PRINTK is not set
# CONFIG_SEC_LOG is not set
CONFIG_BUG=y
CONFIG_ELF_CORE=y
CONFIG_BASE_FULL=y
@@ -134,7 +134,8 @@ CONFIG_VM_EVENT_COUNTERS=y
# CONFIG_SLUB_DEBUG is not set
CONFIG_COMPAT_BRK=y
# CONFIG_SLAB is not set
CONFIG_SLUB=y
# CONFIG_SLUB is not set
CONFIG_SLQB=y
# CONFIG_SLOB is not set
CONFIG_PROFILING=y
CONFIG_OPROFILE=y
@@ -450,13 +451,18 @@ CONFIG_FREQ_STEP_UP_L2_L0=y
#
# CPUFreq overclock
#
#CONFIG_FREQ_OVERCLOCK is not set
CONFIG_FREQ_OVERCLOCK=y
#
# build target CyanogenMod7
#
# CONFIG_BUILD_TARGET_CM7 is not set
#
# sakuramod kernel build
#
# CONFIG_SAKURAMOD is not set
#
# Processor Type
#
@@ -585,16 +591,32 @@ CONFIG_CPU_FREQ_STAT=y
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_SMARTASS is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMANDX is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVEX is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_MINMAX is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_LAGFREE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_SMARTASS2 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_ONDEMANDX=y
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
# CONFIG_CPU_FREQ_GOV_INTERACTIVE is not set
CONFIG_CPU_FREQ_GOV_INTERACTIVEX=y
CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
CONFIG_CPU_FREQ_GOV_MINMAX=y
CONFIG_CPU_FREQ_GOV_LAGFREE=y
CONFIG_CPU_FREQ_GOV_SMARTASS=y
CONFIG_CPU_FREQ_GOV_SMARTASS2=y
CONFIG_CPU_FREQ_GOV_SAVAGEDZEN=y
CONFIG_CPU_FREQ_GOV_BRAZILIANWAX=y
CONFIG_CPU_FREQ_MIN_TICKS=10
CONFIG_CPU_FREQ_SAMPLING_LATENCY_MULTIPLIER=1000
CONFIG_CPU_IDLE=y
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y
@@ -1670,6 +1692,7 @@ CONFIG_MALI_OSMEM_ONLY=y
# CONFIG_MALI_DED_OSMEM is not set
# CONFIG_VIDEO_MALI400MP_DEBUG is not set
CONFIG_VIDEO_MALI400MP_DVFS=y
CONFIG_GPU_CLOCK_CONTROL=y
CONFIG_VIDEO_UMP=y
# CONFIG_UMP_DED_ONLY is not set
CONFIG_UMP_OSMEM_ONLY=y
@@ -2219,6 +2242,8 @@ CONFIG_VIBETONZ=m
# CONFIG_LEVEL is not set
CONFIG_SAMSUNG_PHONE_SVNET=y
# CONFIG_SAMSUNG_PHONE_TTY is not set
# CONFIG_SAMSUNG_PHONE_TTY_RAFFAELLO is not set
# CONFIG_SAMSUNG_PHONE_TTY_RAFFAELLO_RECOVERY is not set
#
# File systems
@@ -2398,7 +2423,7 @@ CONFIG_MAGIC_SYSRQ=y
# CONFIG_HEADERS_CHECK is not set
# CONFIG_DEBUG_KERNEL is not set
# CONFIG_STACKTRACE is not set
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_BUGVERBOSE is not set
# CONFIG_DEBUG_MEMORY_INIT is not set
CONFIG_FRAME_POINTER=y
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
Oops, something went wrong.

0 comments on commit 3109cf6

Please sign in to comment.