iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* '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()
This commit is contained in:
Linus Torvalds 2011-07-22 17:02:38 -07:00
commit 0a613b647b
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/smpboot.c
View File

@ -438,7 +438,7 @@ static void impress_friends(void)
void __inquire_remote_apic(int apicid) void __inquire_remote_apic(int apicid)
{ {
unsigned i, regs[] = { APIC_ID >> 4, APIC_LVR >> 4, APIC_SPIV >> 4 }; 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; int timeout;
u32 status; u32 status;

3
arch/x86/mm/pageattr-test.c
View File

@ -123,12 +123,11 @@ static int pageattr_test(void)
if (print) if (print)
printk(KERN_INFO "CPA self-test:\n"); printk(KERN_INFO "CPA self-test:\n");
bm = vmalloc((max_pfn_mapped + 7) / 8); bm = vzalloc((max_pfn_mapped + 7) / 8);
if (!bm) { if (!bm) {
printk(KERN_ERR "CPA Cannot vmalloc bitmap\n"); printk(KERN_ERR "CPA Cannot vmalloc bitmap\n");
return -ENOMEM; return -ENOMEM;
} }
memset(bm, 0, (max_pfn_mapped + 7) / 8);
failed += print_split(&sa); failed += print_split(&sa);
srandom32(100); srandom32(100);