Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e597d940 authored by TARKZiM's avatar TARKZiM
Browse files

lmk: Fix build errors on 3.10

parent bfccac4f

drivers/staging/android/binder_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -960,7 +960,7 @@ enum lru_status binder_alloc_free_page(struct list_head *item, 
	return LRU_REMOVED_RETRY;



err_down_write_mmap_sem_failed:

	mmput_async(mm);

	mmput(mm);

err_mmget:

err_page_already_freed:

	mutex_unlock(&alloc->mutex);

drivers/staging/android/lowmemorykiller.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc) 
	int other_file = global_page_state(NR_FILE_PAGES) -

						global_page_state(NR_SHMEM) -

						global_page_state(NR_UNEVICTABLE) -

						total_swapcache_pages;

						total_swapcache_pages();



	if (lowmem_adj_size < array_size)

		array_size = lowmem_adj_size;

include/linux/sched.h

+56 −0
Original line number Diff line number Diff line
@@ -1565,6 +1565,62 @@ struct task_struct { 
/* Future-safe accessor for struct task_struct's cpus_allowed. */

#define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)



#define MAX_NICE	19

#define MIN_NICE	-20

#define NICE_WIDTH	(MAX_NICE - MIN_NICE + 1)



/*

 * Priority of a process goes from 0..MAX_PRIO-1, valid RT

 * priority is 0..MAX_RT_PRIO-1, and SCHED_NORMAL/SCHED_BATCH

 * tasks are in the range MAX_RT_PRIO..MAX_PRIO-1. Priority

 * values are inverted: lower p->prio value means higher priority.

 *

 * The MAX_USER_RT_PRIO value allows the actual maximum

 * RT priority to be separate from the value exported to

 * user-space.  This allows kernel threads to set their

 * priority to a value higher than any user task. Note:

 * MAX_RT_PRIO must not be smaller than MAX_USER_RT_PRIO.

 */

#define MAX_USER_RT_PRIO	100

#define MAX_RT_PRIO		MAX_USER_RT_PRIO



#define MAX_PRIO		(MAX_RT_PRIO + NICE_WIDTH)

#define DEFAULT_PRIO		(MAX_RT_PRIO + NICE_WIDTH / 2)



/*

 * Convert user-nice values [ -20 ... 0 ... 19 ]

 * to static priority [ MAX_RT_PRIO..MAX_PRIO-1 ],

 * and back.

 */

#define NICE_TO_PRIO(nice)	((nice) + DEFAULT_PRIO)

#define PRIO_TO_NICE(prio)	((prio) - DEFAULT_PRIO)

#define TASK_NICE(p)		PRIO_TO_NICE((p)->static_prio)



/*

 * 'User priority' is the nice value converted to something we

 * can work with better when scaling various scheduler parameters,

 * it's a [ 0 ... 39 ] range.

 */

#define USER_PRIO(p)		((p)-MAX_RT_PRIO)

#define TASK_USER_PRIO(p)	USER_PRIO((p)->static_prio)

#define MAX_USER_PRIO		(USER_PRIO(MAX_PRIO))



/*

 * Convert nice value [19,-20] to rlimit style value [1,40].

 */

static inline long nice_to_rlimit(long nice)

{

	return (MAX_NICE - nice + 1);

}



/*

 * Convert rlimit style value [1,40] to nice value [-20, 19].

 */

static inline long rlimit_to_nice(long prio)

{

	return (MAX_NICE - prio + 1);

}



#ifdef CONFIG_NUMA_BALANCING

extern void task_numa_fault(int node, int pages, bool migrated);

extern void set_numabalancing_state(bool enabled);

include/linux/sched/rt.h

+0 −53
Original line number Diff line number Diff line
@@ -5,59 +5,6 @@ 
#define MIN_NICE	-20

#define NICE_WIDTH	(MAX_NICE - MIN_NICE + 1)



/*

 * Priority of a process goes from 0..MAX_PRIO-1, valid RT

 * priority is 0..MAX_RT_PRIO-1, and SCHED_NORMAL/SCHED_BATCH

 * tasks are in the range MAX_RT_PRIO..MAX_PRIO-1. Priority

 * values are inverted: lower p->prio value means higher priority.

 *

 * The MAX_USER_RT_PRIO value allows the actual maximum

 * RT priority to be separate from the value exported to

 * user-space.  This allows kernel threads to set their

 * priority to a value higher than any user task. Note:

 * MAX_RT_PRIO must not be smaller than MAX_USER_RT_PRIO.

 */



#define MAX_USER_RT_PRIO	100

#define MAX_RT_PRIO		MAX_USER_RT_PRIO



#define MAX_PRIO		(MAX_RT_PRIO + NICE_WIDTH)

#define DEFAULT_PRIO		(MAX_RT_PRIO + NICE_WIDTH / 2)



/*

 * Convert user-nice values [ -20 ... 0 ... 19 ]

 * to static priority [ MAX_RT_PRIO..MAX_PRIO-1 ],

 * and back.

 */

#define NICE_TO_PRIO(nice)	((nice) + DEFAULT_PRIO)

#define PRIO_TO_NICE(prio)	((prio) - DEFAULT_PRIO)

#define TASK_NICE(p)		PRIO_TO_NICE((p)->static_prio)



/*

 * 'User priority' is the nice value converted to something we

 * can work with better when scaling various scheduler parameters,

 * it's a [ 0 ... 39 ] range.

 */

#define USER_PRIO(p)		((p)-MAX_RT_PRIO)

#define TASK_USER_PRIO(p)	USER_PRIO((p)->static_prio)

#define MAX_USER_PRIO		(USER_PRIO(MAX_PRIO))



/*

 * Convert nice value [19,-20] to rlimit style value [1,40].

 */

static inline long nice_to_rlimit(long nice)

{

	return (MAX_NICE - nice + 1);

}



/*

 * Convert rlimit style value [1,40] to nice value [-20, 19].

 */

static inline long rlimit_to_nice(long prio)

{

	return (MAX_NICE - prio + 1);

}



static inline int rt_prio(int prio)

{

	if (unlikely(prio < MAX_RT_PRIO))