Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, smpboot: Mark the names[] array in __inquire_remote_apic() as const
  x86: Convert vmalloc()+memset() to vzalloc()

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 9fd3137230d46af2053cdebb88c3a6ef4867984f..9f548cb4a958309fd04ffcc12535e5100b5787ee 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -438,7 +438,7 @@ static void impress_friends(void)
 void __inquire_remote_apic(int apicid)
 {
        unsigned i, regs[] = { APIC_ID >> 4, APIC_LVR >> 4, APIC_SPIV >> 4 };
-       char *names[] = { "ID", "VERSION", "SPIV" };
+       const char * const names[] = { "ID", "VERSION", "SPIV" };
        int timeout;
        u32 status;
 

diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
index e1d106909218681f35cd4e736987ce017a7de798..b0086567271c9956b2196e3ba302e4a77009e811 100644 (file)
--- a/arch/x86/mm/pageattr-test.c
+++ b/arch/x86/mm/pageattr-test.c
@@ -123,12 +123,11 @@ static int pageattr_test(void)
        if (print)
                printk(KERN_INFO "CPA self-test:\n");
 
-       bm = vmalloc((max_pfn_mapped + 7) / 8);
+       bm = vzalloc((max_pfn_mapped + 7) / 8);
        if (!bm) {
                printk(KERN_ERR "CPA Cannot vmalloc bitmap\n");
                return -ENOMEM;
        }
-       memset(bm, 0, (max_pfn_mapped + 7) / 8);
 
        failed += print_split(&sa);
        srandom32(100);