Commit b611de70 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://linux-input.bkbits.net/linux-input

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
parents bf445ed0 11f7f7de
...@@ -201,9 +201,9 @@ static inline struct page * vmalloc_to_page(void * vmalloc_addr) ...@@ -201,9 +201,9 @@ static inline struct page * vmalloc_to_page(void * vmalloc_addr)
/* Macros to make printk easier */ /* Macros to make printk easier */
#define DRM_ERROR(fmt, arg...) \ #define DRM_ERROR(fmt, arg...) \
printk(KERN_ERR "[" DRM_NAME ":" __FUNCTION__ "] *ERROR* " fmt , ##arg) printk(KERN_ERR "[" DRM_NAME ":%s] *ERROR* " fmt , __FUNCTION__ , ##arg)
#define DRM_MEM_ERROR(area, fmt, arg...) \ #define DRM_MEM_ERROR(area, fmt, arg...) \
printk(KERN_ERR "[" DRM_NAME ":" __FUNCTION__ ":%s] *ERROR* " fmt , \ printk(KERN_ERR "[" DRM_NAME ":%s:%s] *ERROR* " fmt , __FUNCTION__, \
DRM(mem_stats)[area].name , ##arg) DRM(mem_stats)[area].name , ##arg)
#define DRM_INFO(fmt, arg...) printk(KERN_INFO "[" DRM_NAME "] " fmt , ##arg) #define DRM_INFO(fmt, arg...) printk(KERN_INFO "[" DRM_NAME "] " fmt , ##arg)
...@@ -212,8 +212,8 @@ static inline struct page * vmalloc_to_page(void * vmalloc_addr) ...@@ -212,8 +212,8 @@ static inline struct page * vmalloc_to_page(void * vmalloc_addr)
do { \ do { \
if ( DRM(flags) & DRM_FLAG_DEBUG ) \ if ( DRM(flags) & DRM_FLAG_DEBUG ) \
printk(KERN_DEBUG \ printk(KERN_DEBUG \
"[" DRM_NAME ":" __FUNCTION__ "] " fmt , \ "[" DRM_NAME ":%s] " fmt , \
##arg); \ __FUNCTION__ , ##arg); \
} while (0) } while (0)
#else #else
#define DRM_DEBUG(fmt, arg...) do { } while (0) #define DRM_DEBUG(fmt, arg...) do { } while (0)
......
...@@ -52,7 +52,7 @@ static int inline verify (struct security_operations *ops) ...@@ -52,7 +52,7 @@ static int inline verify (struct security_operations *ops)
/* verify the security_operations structure exists */ /* verify the security_operations structure exists */
if (!ops) { if (!ops) {
printk (KERN_INFO "Passed a NULL security_operations " printk (KERN_INFO "Passed a NULL security_operations "
"pointer, " __FUNCTION__ " failed.\n"); "pointer, %s failed.\n", __FUNCTION__);
return -EINVAL; return -EINVAL;
} }
...@@ -69,8 +69,8 @@ static int inline verify (struct security_operations *ops) ...@@ -69,8 +69,8 @@ static int inline verify (struct security_operations *ops)
if (err) { if (err) {
printk (KERN_INFO "Not enough functions specified in the " printk (KERN_INFO "Not enough functions specified in the "
"security_operation structure, " __FUNCTION__ "security_operation structure, %s failed.\n",
" failed.\n"); __FUNCTION__);
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
...@@ -108,13 +108,13 @@ int register_security (struct security_operations *ops) ...@@ -108,13 +108,13 @@ int register_security (struct security_operations *ops)
{ {
if (verify (ops)) { if (verify (ops)) {
printk (KERN_INFO __FUNCTION__ " could not verify " printk (KERN_INFO "%s could not verify "
"security_operations structure.\n"); "security_operations structure.\n", __FUNCTION__);
return -EINVAL; return -EINVAL;
} }
if (security_ops != &dummy_security_ops) { if (security_ops != &dummy_security_ops) {
printk (KERN_INFO "There is already a security " printk (KERN_INFO "There is already a security "
"framework initialized, " __FUNCTION__ " failed.\n"); "framework initialized, %s failed.\n", __FUNCTION__);
return -EINVAL; return -EINVAL;
} }
...@@ -137,9 +137,9 @@ int register_security (struct security_operations *ops) ...@@ -137,9 +137,9 @@ int register_security (struct security_operations *ops)
int unregister_security (struct security_operations *ops) int unregister_security (struct security_operations *ops)
{ {
if (ops != security_ops) { if (ops != security_ops) {
printk (KERN_INFO __FUNCTION__ ": trying to unregister " printk (KERN_INFO "%s: trying to unregister "
"a security_opts structure that is not " "a security_opts structure that is not "
"registered, failing.\n"); "registered, failing.\n", __FUNCTION__);
return -EINVAL; return -EINVAL;
} }
...@@ -163,14 +163,14 @@ int unregister_security (struct security_operations *ops) ...@@ -163,14 +163,14 @@ int unregister_security (struct security_operations *ops)
int mod_reg_security (const char *name, struct security_operations *ops) int mod_reg_security (const char *name, struct security_operations *ops)
{ {
if (verify (ops)) { if (verify (ops)) {
printk (KERN_INFO __FUNCTION__ " could not verify " printk (KERN_INFO "%s could not verify "
"security operations.\n"); "security operations.\n", __FUNCTION__);
return -EINVAL; return -EINVAL;
} }
if (ops == security_ops) { if (ops == security_ops) {
printk (KERN_INFO __FUNCTION__ " security operations " printk (KERN_INFO "%s security operations "
"already registered.\n"); "already registered.\n", __FUNCTION__);
return -EINVAL; return -EINVAL;
} }
...@@ -193,8 +193,8 @@ int mod_reg_security (const char *name, struct security_operations *ops) ...@@ -193,8 +193,8 @@ int mod_reg_security (const char *name, struct security_operations *ops)
int mod_unreg_security (const char *name, struct security_operations *ops) int mod_unreg_security (const char *name, struct security_operations *ops)
{ {
if (ops == security_ops) { if (ops == security_ops) {
printk (KERN_INFO __FUNCTION__ " invalid attempt to unregister " printk (KERN_INFO "%s invalid attempt to unregister "
" primary security ops.\n"); " primary security ops.\n", __FUNCTION__);
return -EINVAL; return -EINVAL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment