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

Commit 01e5d3b4 authored by Chris Wilson's avatar Chris Wilson Committed by Joonas Lahtinen
Browse files

x86: Silence 32bit compiler warning in intel_graphics_stolen() 



arch/x86/kernel/early-quirks.c: In function ‘intel_graphics_stolen’:
arch/x86/kernel/early-quirks.c:539:9: warning: format ‘%llx’ expects
argument of type ‘long long unsigned int’, but argument 2 has type ‘phys_addr_t’ [-Wformat=]
         "0x%llx-0x%llx\n", base, base + size - 1);
         ^
arch/x86/kernel/early-quirks.c:539:9: warning: format ‘%llx’ expects
argument of type ‘long long unsigned int’, but argument 3 has type ‘phys_addr_t’ [-Wformat=]

v2: Use %pa for addresses

Fixes: ee0629cf (drm/i915: Function per early graphics quirk)
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> #v1
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1462811982-1567-1-git-send-email-chris@chris-wilson.co.uk
parent f818ffea

arch/x86/kernel/early-quirks.c

+4 −3
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ static void __init 
intel_graphics_stolen(int num, int slot, int func,

		      const struct intel_early_ops *early_ops)

{

	phys_addr_t base;

	phys_addr_t base, end;

	size_t size;



	size = early_ops->stolen_size(num, slot, func);
@@ -535,8 +535,9 @@ intel_graphics_stolen(int num, int slot, int func, 
	if (!size || !base)

		return;



	printk(KERN_INFO "Reserving Intel graphics stolen memory at "

	       "0x%llx-0x%llx\n", base, base + size - 1);

	end = base + size - 1;

	printk(KERN_INFO "Reserving Intel graphics memory at %pa-%pa\n",

	       &base, &end);



	/* Mark this space as reserved */

	e820_add_region(base, size, E820_RESERVED);