From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 10 Feb 2012 18:58:25 +0000 (-0800)
Subject: Merge tag 'staging-3.3-rc3' into staging-next
X-Git-Tag: MMI-PSA29.97-13-9~17268^2~176
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b91867f2ee5c84b550f95ce54c91b180f70f48cb;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'staging-3.3-rc3' into staging-next

This was done to resolve some merge issues with the following files that
had changed in both branches:
	drivers/staging/rtl8712/rtl871x_sta_mgt.c
	drivers/staging/tidspbridge/rmgr/drv_interface.c
	drivers/staging/zcache/zcache-main.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

b91867f2ee5c84b550f95ce54c91b180f70f48cb
diff --cc drivers/staging/android/Kconfig
index fef3580ce8de,75ca22581ec4..f3b7c759bcfd
--- a/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@@ -100,8 -99,38 +100,34 @@@ config ANDROID_LOW_MEMORY_KILLE
  	---help---
  	  Register processes to be killed when memory is low
  
 -config ANDROID_PMEM
 -	bool "Android pmem allocator"
 -	depends on ARM
 -
  source "drivers/staging/android/switch/Kconfig"
  
+ config ANDROID_INTF_ALARM
+ 	bool "Android alarm driver"
+ 	depends on RTC_CLASS
+ 	default n
+ 	help
+ 	  Provides non-wakeup and rtc backed wakeup alarms based on rtc or
+ 	  elapsed realtime, and a non-wakeup alarm on the monotonic clock.
+ 	  Also provides an interface to set the wall time which must be used
+ 	  for elapsed realtime to work.
+ 
+ config ANDROID_INTF_ALARM_DEV
+ 	bool "Android alarm device"
+ 	depends on ANDROID_INTF_ALARM
+ 	default y
+ 	help
+ 	  Exports the alarm interface to user-space.
+ 
+ config ANDROID_ALARM_OLDDRV_COMPAT
+ 	bool "Android Alarm compatability with old drivers"
+ 	depends on ANDROID_INTF_ALARM
+ 	default n
+ 	help
+ 	  Provides preprocessor alias to aid compatability with
+ 	  older out-of-tree drivers that use the Android Alarm
+ 	  in-kernel API. This will be removed eventually.
+ 
  endif # if ANDROID
  
  endmenu
diff --cc drivers/staging/android/Makefile
index 5fcc24ffdd58,7c6e53b89e6e..785f26999108
--- a/drivers/staging/android/Makefile
+++ b/drivers/staging/android/Makefile
@@@ -5,4 -5,7 +5,6 @@@ obj-$(CONFIG_ANDROID_RAM_CONSOLE)	+= ra
  obj-$(CONFIG_ANDROID_TIMED_OUTPUT)	+= timed_output.o
  obj-$(CONFIG_ANDROID_TIMED_GPIO)	+= timed_gpio.o
  obj-$(CONFIG_ANDROID_LOW_MEMORY_KILLER)	+= lowmemorykiller.o
 -obj-$(CONFIG_ANDROID_PMEM)		+= pmem.o
  obj-$(CONFIG_ANDROID_SWITCH)		+= switch/
+ obj-$(CONFIG_ANDROID_INTF_ALARM)	+= alarm.o
+ obj-$(CONFIG_ANDROID_INTF_ALARM_DEV)	+= alarm-dev.o
diff --cc drivers/staging/android/lowmemorykiller.c
index efc7dc1f4831,ae38c39a1525..8b8a537ed063
--- a/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@@ -180,10 -178,9 +180,10 @@@ static int lowmem_shrink(struct shrinke
  		 */
  #ifdef CONFIG_PROFILING
  		lowmem_deathpending = selected;
 +		lowmem_deathpending_timeout = jiffies + HZ;
  		task_handoff_register(&task_nb);
  #endif
- 		force_sig(SIGKILL, selected);
+ 		send_sig(SIGKILL, selected, 0);
  		rem -= selected_tasksize;
  	}
  	lowmem_print(4, "lowmem_shrink %lu, %x, return %d\n",
diff --cc drivers/staging/tidspbridge/rmgr/drv_interface.c
index 385740bad0de,31b5140a00c5..c14fa8ec3fa8
--- a/drivers/staging/tidspbridge/rmgr/drv_interface.c
+++ b/drivers/staging/tidspbridge/rmgr/drv_interface.c
@@@ -405,14 -540,10 +540,13 @@@ static int __devexit omap34_xx_bridge_r
  
  	if (driver_context) {
  		/* Put the DSP in reset state */
- 		ret = dsp_deinit(driver_context);
+ 		dsp_deinit(driver_context);
  		driver_context = 0;
- 		DBC_ASSERT(ret == true);
  	}
  
 +	kfree(drv_datap);
 +	dev_set_drvdata(bridge, NULL);
 +
  func_cont:
  	mem_ext_phys_pool_release();