Revert "staging/android: fix build issues"

This reverts commit 3cc8af27c10b5e1eb8e9ad2b19823f3553647405.

diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c
index 64cc2a1e7b163cda23f801a838d2d49f514f6bab..6c10b456c6cc5c082c6ceca278672c98538ff0aa 100644 (file)
--- a/drivers/staging/android/logger.c
+++ b/drivers/staging/android/logger.c
@@ -17,7 +17,6 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/sched.h>
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/miscdevice.h>

diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c
index 32314e85e2b7615cbe3770260523dc4adbed6ed6..935d281a201acdfcff732d1e74d1879942c9e183 100644 (file)
--- a/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@ -100,17 +100,15 @@ static int lowmem_shrink(int nr_to_scan, gfp_t gfp_mask)
        read_lock(&tasklist_lock);
        for_each_process(p) {
                struct mm_struct *mm;
-               struct signal_struct *sig;
                int oom_adj;
 
                task_lock(p);
                mm = p->mm;
-               sig = p->signal;
-               if (!mm || !sig) {
+               if (!mm) {
                        task_unlock(p);
                        continue;
                }
-               oom_adj = sig->oom_adj;
+               oom_adj = mm->oom_adj;
                if (oom_adj < min_adj) {
                        task_unlock(p);
                        continue;