diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 08:19:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 08:19:40 -0700 |
| commit | 30bc94566e396b432b72e2f3518e19225dc2672d (patch) | |
| tree | 50eba6ade66fbed5106a40aa68ab36926b7beb6b /security/keys | |
| parent | 4cba84b5d61af81f1f329f4d05170427a9819c39 (diff) | |
| parent | 5f46ce14bd432cf52bf91079270af164ca48f821 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
security: enhance DEFAULT_MMAP_MIN_ADDR description
SELinux: add netport.[ch]
SELinux: Add network port SID cache
SELinux: turn mount options strings into defines
selinux/ss/services.c should #include <linux/selinux.h>
selinux: introduce permissive types
selinux: remove ptrace_sid
SELinux: requesting no permissions in avc_has_perm_noaudit is a BUG()
security: code cleanup
security: replace remaining __FUNCTION__ occurrences
SELinux: create new open permission
selinux: selinux/netlabel.c should #include "netlabel.h"
SELinux: unify printk messages
SELinux: remove unused backpointers from security objects
SELinux: Correct the NetLabel locking for the sk_security_struct
Diffstat (limited to 'security/keys')
| -rw-r--r-- | security/keys/internal.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/security/keys/internal.h b/security/keys/internal.h index d36d6939335..7d894ef7037 100644 --- a/security/keys/internal.h +++ b/security/keys/internal.h @@ -22,16 +22,16 @@ void no_printk(const char *fmt, ...) #ifdef __KDEBUG #define kenter(FMT, ...) \ - printk(KERN_DEBUG "==> %s("FMT")\n", __FUNCTION__, ##__VA_ARGS__) + printk(KERN_DEBUG "==> %s("FMT")\n", __func__, ##__VA_ARGS__) #define kleave(FMT, ...) \ - printk(KERN_DEBUG "<== %s()"FMT"\n", __FUNCTION__, ##__VA_ARGS__) + printk(KERN_DEBUG "<== %s()"FMT"\n", __func__, ##__VA_ARGS__) #define kdebug(FMT, ...) \ printk(KERN_DEBUG "xxx" FMT"yyy\n", ##__VA_ARGS__) #else #define kenter(FMT, ...) \ - no_printk(KERN_DEBUG "==> %s("FMT")\n", __FUNCTION__, ##__VA_ARGS__) + no_printk(KERN_DEBUG "==> %s("FMT")\n", __func__, ##__VA_ARGS__) #define kleave(FMT, ...) \ - no_printk(KERN_DEBUG "<== %s()"FMT"\n", __FUNCTION__, ##__VA_ARGS__) + no_printk(KERN_DEBUG "<== %s()"FMT"\n", __func__, ##__VA_ARGS__) #define kdebug(FMT, ...) \ no_printk(KERN_DEBUG FMT"\n", ##__VA_ARGS__) #endif |