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

Commit b92cc559 authored by Muli Ben-Yehuda's avatar Muli Ben-Yehuda Committed by Andi Kleen
Browse files

[PATCH] x86-64: tighten up printks 



Signed-off-by: default avatarMuli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
parent ed5316d4

arch/x86_64/kernel/pci-calgary.c

+8 −3
Original line number Diff line number Diff line
@@ -1068,6 +1068,8 @@ void __init detect_calgary(void) 
	if (!early_pci_allowed())

		return;



	printk(KERN_DEBUG "Calgary: detecting Calgary via BIOS EBDA area\n");



	ptr = (unsigned long)phys_to_virt(get_bios_ebda());



	rio_table_hdr = NULL;
@@ -1088,14 +1090,14 @@ void __init detect_calgary(void) 
		offset = *((unsigned short *)(ptr + offset));

	}

	if (!rio_table_hdr) {

		printk(KERN_ERR "Calgary: Unable to locate "

				"Rio Grande Table in EBDA - bailing!\n");

		printk(KERN_DEBUG "Calgary: Unable to locate Rio Grande table "

		       "in EBDA - bailing!\n");

		return;

	}



	ret = build_detail_arrays();

	if (ret) {

		printk(KERN_ERR "Calgary: build_detail_arrays ret %d\n", ret);

		printk(KERN_DEBUG "Calgary: build_detail_arrays ret %d\n", ret);

		return;

	}
@@ -1128,6 +1130,9 @@ void __init detect_calgary(void) 
		}

	}



	printk(KERN_DEBUG "Calgary: finished detection, Calgary %s\n",

	       calgary_found ? "found" : "not found");



	if (calgary_found) {

		iommu_detected = 1;

		calgary_detected = 1;