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

Commit fa10ba64 authored by Andi Kleen's avatar Andi Kleen Committed by H. Peter Anvin
Browse files

x86, gcc-4.6: Fix set but not read variables 



Just some dead code, no real bugs.

Found by gcc 4.6 -Wall

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
LKML-Reference: <201007202219.o6KMJnQ0021072@imap1.linux-foundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 5f755293

arch/x86/kernel/aperture_64.c

+2 −2
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ void __init early_gart_iommu_check(void) 
	 * or BIOS forget to put that in reserved.

	 * try to update e820 to make that region as reserved.

	 */

	u32 agp_aper_base = 0, agp_aper_order = 0;

	u32 agp_aper_order = 0;

	int i, fix, slot, valid_agp = 0;

	u32 ctl;

	u32 aper_size = 0, aper_order = 0, last_aper_order = 0;
@@ -291,7 +291,7 @@ void __init early_gart_iommu_check(void) 
		return;



	/* This is mostly duplicate of iommu_hole_init */

	agp_aper_base = search_agp_bridge(&agp_aper_order, &valid_agp);

	search_agp_bridge(&agp_aper_order, &valid_agp);



	fix = 0;

	for (i = 0; i < ARRAY_SIZE(bus_dev_ranges); i++) {

arch/x86/kernel/cpu/mtrr/generic.c

+1 −2
Original line number Diff line number Diff line
@@ -433,13 +433,12 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base, 
{

	unsigned int mask_lo, mask_hi, base_lo, base_hi;

	unsigned int tmp, hi;

	int cpu;



	/*

	 * get_mtrr doesn't need to update mtrr_state, also it could be called

	 * from any cpu, so try to print it out directly.

	 */

	cpu = get_cpu();

	get_cpu();



	rdmsr(MTRRphysMask_MSR(reg), mask_lo, mask_hi);