Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a613b64 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-cleanups-for-linus' of... 

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

* '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()
parents eb47418d a6c23905

arch/x86/kernel/smpboot.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/x86/mm/pageattr-test.c

+1 −2
Original line number Diff line number Diff line
@@ -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);