Merge branch 'linus' into x86/urgent

Merge in Linus's tree to avoid a conflict.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 14 insertions, 15 deletions

diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index 07b0c0db466c..d65464e43503 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -201,6 +201,8 @@
  *    http://www.microsoft.com/whdc/archive/amp_12.mspx]
  */
 
+#define pr_fmt(fmt) "apm: " fmt
+
 #include <linux/module.h>
 
 #include <linux/poll.h>
@@ -485,11 +487,11 @@ static void apm_error(char *str, int err)
                 if (error_table[i].key == err)
                         break;
         if (i < ERROR_COUNT)
-                printk(KERN_NOTICE "apm: %s: %s\n", str, error_table[i].msg);
+                pr_notice("%s: %s\n", str, error_table[i].msg);
         else if (err < 0)
-                printk(KERN_NOTICE "apm: %s: linux error code %i\n", str, err);
+                pr_notice("%s: linux error code %i\n", str, err);
         else
-                printk(KERN_NOTICE "apm: %s: unknown error code %#2.2x\n",
+                pr_notice("%s: unknown error code %#2.2x\n",
                        str, err);
 }
 
@@ -1184,7 +1186,7 @@ static void queue_event(apm_event_t event, struct apm_user *sender)
                         static int notified;
 
                         if (notified++ == 0)
-                            printk(KERN_ERR "apm: an event queue overflowed\n");
+                                pr_err("an event queue overflowed\n");
                         if (++as->event_tail >= APM_MAX_EVENTS)
                                 as->event_tail = 0;
                 }
@@ -1447,7 +1449,7 @@ static void apm_mainloop(void)
 static int check_apm_user(struct apm_user *as, const char *func)
 {
         if (as == NULL || as->magic != APM_BIOS_MAGIC) {
-                printk(KERN_ERR "apm: %s passed bad filp\n", func);
+                pr_err("%s passed bad filp\n", func);
                 return 1;
         }
         return 0;
@@ -1586,7 +1588,7 @@ static int do_release(struct inode *inode, struct file *filp)
                      as1 = as1->next)
                         ;
                 if (as1 == NULL)
-                        printk(KERN_ERR "apm: filp not in user list\n");
+                        pr_err("filp not in user list\n");
                 else
                         as1->next = as->next;
         }
@@ -1600,11 +1602,9 @@ static int do_open(struct inode *inode, struct file *filp)
         struct apm_user *as;
 
         as = kmalloc(sizeof(*as), GFP_KERNEL);
-        if (as == NULL) {
-                printk(KERN_ERR "apm: cannot allocate struct of size %d bytes\n",
-                       sizeof(*as));
+        if (as == NULL)
                 return -ENOMEM;
-        }
+
         as->magic = APM_BIOS_MAGIC;
         as->event_tail = as->event_head = 0;
         as->suspends_pending = as->standbys_pending = 0;
@@ -2313,16 +2313,16 @@ static int __init apm_init(void)
         }
 
         if (apm_info.disabled) {
-                printk(KERN_NOTICE "apm: disabled on user request.\n");
+                pr_notice("disabled on user request.\n");
                 return -ENODEV;
         }
         if ((num_online_cpus() > 1) && !power_off && !smp) {
-                printk(KERN_NOTICE "apm: disabled - APM is not SMP safe.\n");
+                pr_notice("disabled - APM is not SMP safe.\n");
                 apm_info.disabled = 1;
                 return -ENODEV;
         }
         if (!acpi_disabled) {
-                printk(KERN_NOTICE "apm: overridden by ACPI.\n");
+                pr_notice("overridden by ACPI.\n");
                 apm_info.disabled = 1;
                 return -ENODEV;
         }
@@ -2356,8 +2356,7 @@ static int __init apm_init(void)
 
         kapmd_task = kthread_create(apm, NULL, "kapmd");
         if (IS_ERR(kapmd_task)) {
-                printk(KERN_ERR "apm: disabled - Unable to start kernel "
-                                "thread.\n");
+                pr_err("disabled - Unable to start kernel thread\n");
                 err = PTR_ERR(kapmd_task);
                 kapmd_task = NULL;
                 remove_proc_entry("apm", NULL);