x86/cleanups for v3.1

GIT PULL Ingo Molnar 1 participant 1 message Jul 22, 2011

Subsystems (2)

x86 x86 MM

lore

Share & tools

lore

Ingo Molnar

author

2011-07-22 14:35 UTC #0 lore raw

Linus,

Please pull the latest x86-cleanups-for-linus git tree from:

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

Thanks,

Ingo

------------------>
Greg Dietsche (1):

      x86, smpboot: Mark the names[] array in __inquire_remote_apic() as const

Joe Perches (1):
x86: Convert vmalloc()+memset() to vzalloc()

 arch/x86/kernel/smpboot.c   |    2 +-
 arch/x86/mm/pageattr-test.c |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

arch/x86/kernel/smpboot.c +1 -1

index a3c430b..e02653a 100644
@@ -425,7 +425,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

index e1d1069..b008656 100644
@@ -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);