|
[-]
[+]
|
Changed |
kernel-adaptation-google-nexus7.changes
|
|
|
|
[-]
[+]
|
Changed |
kernel-adaptation-google-nexus7.spec
^
|
|
|
|
[-]
[+]
|
Added |
console_lock.patch
^
|
| @@ -0,0 +1,36 @@
+--- a/kernel/power/consoleearlysuspend.c.orig 2013-04-07 15:39:52.000000000 +0300
++++ b/kernel/power/consoleearlysuspend.c 2013-04-07 15:40:00.000000000 +0300
+@@ -25,28 +25,28 @@
+ static int orig_fgconsole;
+ static void console_early_suspend(struct early_suspend *h)
+ {
+- acquire_console_sem();
++ console_lock();
+ orig_fgconsole = fg_console;
+ if (vc_allocate(EARLY_SUSPEND_CONSOLE))
+ goto err;
+ if (set_console(EARLY_SUSPEND_CONSOLE))
+ goto err;
+- release_console_sem();
++ console_unlock();
+
+ if (vt_waitactive(EARLY_SUSPEND_CONSOLE + 1))
+ pr_warning("console_early_suspend: Can't switch VCs.\n");
+ return;
+ err:
+ pr_warning("console_early_suspend: Can't set console\n");
+- release_console_sem();
++ console_unlock();
+ }
+
+ static void console_late_resume(struct early_suspend *h)
+ {
+ int ret;
+- acquire_console_sem();
++ console_lock();
+ ret = set_console(orig_fgconsole);
+- release_console_sem();
++ console_unlock();
+ if (ret) {
+ pr_warning("console_late_resume: Can't set console.\n");
+ return;
|
|
[-]
[+]
|
Changed |
kernel-adaptation-google-nexus7.config
^
|
| @@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.1.10 Kernel Configuration
+# Linux/arm 3.1.10-tk1 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -344,6 +344,7 @@
CONFIG_TEGRA_MC_PROFILE=y
CONFIG_TEGRA_EDP_LIMITS=y
CONFIG_TEGRA_EMC_TO_DDR_CLOCK=1
+# CONFIG_TEGRA_CONVSERVATIVE_GOV_ON_EARLYSUPSEND is not set
CONFIG_USB_HOTPLUG=y
CONFIG_TEGRA_DYNAMIC_PWRDET=y
CONFIG_TEGRA_EDP_EXACT_FREQ=y
@@ -559,7 +560,15 @@
#
CONFIG_SUSPEND=y
CONFIG_SUSPEND_FREEZER=y
-# CONFIG_WAKELOCK is not set
+CONFIG_HAS_WAKELOCK=y
+CONFIG_HAS_EARLYSUSPEND=y
+CONFIG_WAKELOCK=y
+CONFIG_WAKELOCK_STAT=y
+CONFIG_USER_WAKELOCK=y
+CONFIG_EARLYSUSPEND=y
+# CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL is not set
+CONFIG_CONSOLE_EARLYSUSPEND=y
+# CONFIG_FB_EARLYSUSPEND is not set
CONFIG_PM_SLEEP=y
CONFIG_PM_SLEEP_SMP=y
CONFIG_PM_RUNTIME=y
@@ -2575,6 +2584,7 @@
# OTG and related infrastructure
#
CONFIG_USB_OTG_UTILS=y
+# CONFIG_USB_OTG_WAKELOCK is not set
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_USB_ULPI=y
CONFIG_USB_ULPI_VIEWPORT=y
|
