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

Commit e16885c5 authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[PATCH] uninline capable() 



Uninline capable().  Saves 2K of kernel text on a generic .config, and 1K on a
tiny config.  In addition it makes the use of capable more consistent between
CONFIG_SECURITY and !CONFIG_SECURITY

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a9fad4cc

include/linux/sched.h

+1 −12
Original line number Original line Diff line number Diff line
@@ -1113,19 +1113,8 @@ static inline int sas_ss_flags(unsigned long sp) 
}

}









#ifdef CONFIG_SECURITY

/* code is in security.c or kernel/sys.c if !SECURITY */

/* code is in security.c */

extern int capable(int cap);

extern int capable(int cap);

#else

static inline int capable(int cap)

{

	if (cap_raised(current->cap_effective, cap)) {

		current->flags |= PF_SUPERPRIV;

		return 1;

	}

	return 0;

}

#endif





/*

/*

 * Routines for handling mm_structs

 * Routines for handling mm_structs

kernel/sys.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -223,6 +223,18 @@ int unregister_reboot_notifier(struct notifier_block * nb) 




EXPORT_SYMBOL(unregister_reboot_notifier);

EXPORT_SYMBOL(unregister_reboot_notifier);





#ifndef CONFIG_SECURITY

int capable(int cap)

{

        if (cap_raised(current->cap_effective, cap)) {

	       current->flags |= PF_SUPERPRIV;

	       return 1;

        }

        return 0;

}

EXPORT_SYMBOL(capable);

#endif



static int set_one_prio(struct task_struct *p, int niceval, int error)

static int set_one_prio(struct task_struct *p, int niceval, int error)

{

{

	int no_nice;

	int no_nice;