x86: Remove trailing spaces in messages

Signed-off-by: Frans Pop <elendil@planet.nl>
Cc: Avi Kivity <avi@redhat.com>
Cc: x86@kernel.org
LKML-Reference: <1265478443-31072-10-git-send-email-elendil@planet.nl>
[ Left out the KVM bits. ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/boot/mkcpustr.c b/arch/x86/boot/mkcpustr.c
index 8ef60f20b371017efc47f60fc371d090d0e76014..919257f526f233ee1dee836bdd26c25c77076c3f 100644 (file)
--- a/arch/x86/boot/mkcpustr.c
+++ b/arch/x86/boot/mkcpustr.c
@@ -22,7 +22,7 @@ int main(void)
        int i, j;
        const char *str;
 
-       printf("static const char x86_cap_strs[] = \n");
+       printf("static const char x86_cap_strs[] =\n");
 
        for (i = 0; i < NCAPINTS; i++) {
                for (j = 0; j < 32; j++) {

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index e80f291472a4158535e44ed9afac24f8400453b8..71c4443bb91f4cc6a679efb32a1757e196442be7 100644 (file)
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -587,7 +587,7 @@ calibrate_by_pmtimer(long deltapm, long *delta, long *deltatsc)
                res = (((u64)(*deltatsc)) * pm_100ms);
                do_div(res, deltapm);
                apic_printk(APIC_VERBOSE, "TSC delta adjusted to "
-                                         "PM-Timer: %lu (%ld) \n",
+                                         "PM-Timer: %lu (%ld)\n",
                                        (unsigned long)res, *deltatsc);
                *deltatsc = (long)res;
        }

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 53243ca7816d131ee2821733b722ec0e4d8bd0b3..6bdd2c7ead755827ab67f62e0af854c95b27f485 100644 (file)
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -1647,7 +1647,7 @@ __apicdebuginit(void) print_IO_APIC(void)
        printk(KERN_DEBUG ".... IRQ redirection table:\n");
 
        printk(KERN_DEBUG " NR Dst Mask Trig IRR Pol"
-                         " Stat Dmod Deli Vect:   \n");
+                         " Stat Dmod Deli Vect:\n");
 
        for (i = 0; i <= reg_01.bits.entries; i++) {
                struct IO_APIC_route_entry entry;

diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
index 98c4665f251c8927638e5fa43407a3a45e4bc76d..47dd856708e5c160789253d30dd3f105061bc4b5 100644 (file)
--- a/arch/x86/kernel/apic/numaq_32.c
+++ b/arch/x86/kernel/apic/numaq_32.c
@@ -225,7 +225,7 @@ static void __init smp_read_mpc_oem(struct mpc_table *mpc)
 
        mpc_record = 0;
        printk(KERN_INFO
-               "Found an OEM MPC table at %8p - parsing it ... \n", oemtable);
+               "Found an OEM MPC table at %8p - parsing it...\n", oemtable);
 
        if (memcmp(oemtable->signature, MPC_OEM_SIGNATURE, 4)) {
                printk(KERN_WARNING

diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index b5b6b23bce537f2b71324013b33f63bde2cf8056..031aa887b0ebae42d98ecfeacb66eeede0a8910a 100644 (file)
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -1992,8 +1992,8 @@ static int __init apm_is_horked_d850md(const struct dmi_system_id *d)
                apm_info.disabled = 1;
                printk(KERN_INFO "%s machine detected. "
                       "Disabling APM.\n", d->ident);
-               printk(KERN_INFO "This bug is fixed in bios P15 which is available for \n");
-               printk(KERN_INFO "download from support.intel.com \n");
+               printk(KERN_INFO "This bug is fixed in bios P15 which is available for\n");
+               printk(KERN_INFO "download from support.intel.com\n");
        }
        return 0;
 }

diff --git a/arch/x86/kernel/efi.c b/arch/x86/kernel/efi.c
index cdcfb122f25650ca407b9bdf9b138d46b883284b..c2fa9b8b497e082cd703f2e2e0f9b03319bdd2e6 100644 (file)
--- a/arch/x86/kernel/efi.c
+++ b/arch/x86/kernel/efi.c
@@ -362,7 +362,7 @@ void __init efi_init(void)
                printk(KERN_ERR PFX "Could not map the firmware vendor!\n");
        early_iounmap(tmp, 2);
 
-       printk(KERN_INFO "EFI v%u.%.02u by %s \n",
+       printk(KERN_INFO "EFI v%u.%.02u by %s\n",
               efi.systab->hdr.revision >> 16,
               efi.systab->hdr.revision & 0xffff, vendor);
 

diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c
index ebd193e476ca8812fa81a06e0def726d486d6239..85a343e28937770e383aec0d1320140bc7e0baf8 100644 (file)
--- a/arch/x86/kernel/microcode_intel.c
+++ b/arch/x86/kernel/microcode_intel.c
@@ -328,7 +328,7 @@ static int apply_microcode(int cpu)
                       cpu_num, mc_intel->hdr.rev);
                return -1;
        }
-       pr_info("CPU%d updated to revision 0x%x, date = %04x-%02x-%02x \n",
+       pr_info("CPU%d updated to revision 0x%x, date = %04x-%02x-%02x\n",
                cpu_num, val[1],
                mc_intel->hdr.date & 0xffff,
                mc_intel->hdr.date >> 24,

diff --git a/arch/x86/kernel/uv_sysfs.c b/arch/x86/kernel/uv_sysfs.c
index 36afb98675a4b51fa53b76c72ef2d6cfc4963302..309c70fb77597b62d38a49778e6c63f4f4a0e2d6 100644 (file)
--- a/arch/x86/kernel/uv_sysfs.c
+++ b/arch/x86/kernel/uv_sysfs.c
@@ -54,19 +54,19 @@ static int __init sgi_uv_sysfs_init(void)
        if (!sgi_uv_kobj)
                sgi_uv_kobj = kobject_create_and_add("sgi_uv", firmware_kobj);
        if (!sgi_uv_kobj) {
-               printk(KERN_WARNING "kobject_create_and_add sgi_uv failed \n");
+               printk(KERN_WARNING "kobject_create_and_add sgi_uv failed\n");
                return -EINVAL;
        }
 
        ret = sysfs_create_file(sgi_uv_kobj, &partition_id_attr.attr);
        if (ret) {
-               printk(KERN_WARNING "sysfs_create_file partition_id failed \n");
+               printk(KERN_WARNING "sysfs_create_file partition_id failed\n");
                return ret;
        }
 
        ret = sysfs_create_file(sgi_uv_kobj, &coherence_id_attr.attr);
        if (ret) {
-               printk(KERN_WARNING "sysfs_create_file coherence_id failed \n");
+               printk(KERN_WARNING "sysfs_create_file coherence_id failed\n");
                return ret;
        }
 

diff --git a/arch/x86/tools/test_get_len.c b/arch/x86/tools/test_get_len.c
index bee8d6ac2691769b127439afdf60582b4260563c..13403fc95a962cd46a98674e14db1db194e8cfd7 100644 (file)
--- a/arch/x86/tools/test_get_len.c
+++ b/arch/x86/tools/test_get_len.c
@@ -43,7 +43,7 @@ static int x86_64;
 static void usage(void)
 {
        fprintf(stderr, "Usage: objdump -d a.out | awk -f distill.awk |"
-               " %s [-y|-n] [-v] \n", prog);
+               " %s [-y|-n] [-v]\n", prog);
        fprintf(stderr, "\t-y   64bit mode\n");
        fprintf(stderr, "\t-n   32bit mode\n");
        fprintf(stderr, "\t-v   verbose mode\n");
@@ -69,7 +69,7 @@ static void dump_field(FILE *fp, const char *name, const char *indent,
 
 static void dump_insn(FILE *fp, struct insn *insn)
 {
-       fprintf(fp, "Instruction = { \n");
+       fprintf(fp, "Instruction = {\n");
        dump_field(fp, "prefixes", "\t",        &insn->prefixes);
        dump_field(fp, "rex_prefix", "\t",      &insn->rex_prefix);
        dump_field(fp, "vex_prefix", "\t",      &insn->vex_prefix);