android/android_kernel_cmhtcleo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed merge problem

Browse Source
This commit is contained in:
securecrt 2012-08-23 13:06:34 +08:00
parent 1160ee1202
commit f9c1be0ea3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/android/lowmemorykiller.c
View File

@ -40,14 +40,11 @@
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/sysfs.h>
<<<<<<< HEAD
=======
#ifdef CONFIG_SWAP
#include <linux/fs.h>
#include <linux/swap.h>
#endif
>>>>>>> ics_HWA
static uint32_t lowmem_debug_level = 2;
static int lowmem_adj[6] = {
@ -124,6 +121,8 @@ static int lmk_hotplug_callback(struct notifier_block *self,
}
#endif
static void lowmem_notify_killzone_approach(void);
static inline void get_free_ram(int *other_free, int *other_file)