Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (21511abd) · Commits · 戴 / test

Documentation/ia64/aliasing-test.c

+9 −6

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		#include <fcntl.h>
		#include <fnmatch.h>
		#include <string.h>
		#include <sys/ioctl.h>
		#include <sys/mman.h>
		#include <sys/stat.h>
		#include <unistd.h>
		@@ -65,7 +66,7 @@ int scan_tree(char path, char file, off_t offset, size_t length, int touch)
		{
		struct dirent **namelist;
		char name, path2;
		int i, n, r, rc, result = 0;
		int i, n, r, rc = 0, result = 0;
		struct stat buf;

		n = scandir(path, &namelist, 0, alphasort);
		@@ -113,7 +114,7 @@ skip:
		free(namelist[i]);
		}
		free(namelist);
		return rc;
		return result;
		}

		char buf[1024];
		@@ -149,7 +150,7 @@ int scan_rom(char path, char file)
		{
		struct dirent **namelist;
		char name, path2;
		int i, n, r, rc, result = 0;
		int i, n, r, rc = 0, result = 0;
		struct stat buf;

		n = scandir(path, &namelist, 0, alphasort);
		@@ -180,7 +181,7 @@ int scan_rom(char path, char file)
		* important thing is that no MCA happened.
		*/
		if (rc > 0)
		fprintf(stderr, "PASS: %s read %ld bytes\n", path2, rc);
		fprintf(stderr, "PASS: %s read %d bytes\n", path2, rc);
		else {
		fprintf(stderr, "PASS: %s not readable\n", path2);
		return rc;
		@@ -201,10 +202,10 @@ skip:
		free(namelist[i]);
		}
		free(namelist);
		return rc;
		return result;
		}

		int main()
		int main(void)
		{
		int rc;

		@@ -256,4 +257,6 @@ int main()
		scan_tree("/proc/bus/pci", "??.?", 0xA0000, 0x20000, 0);
		scan_tree("/proc/bus/pci", "??.?", 0xC0000, 0x40000, 1);
		scan_tree("/proc/bus/pci", "??.?", 0, 1024*1024, 0);

		return rc;
		}

MAINTAINERS

+9 −0

Original line number	Diff line number	Diff line
		@@ -2249,6 +2249,15 @@ L: kvm-devel@lists.sourceforge.net
		W: kvm.sourceforge.net
		S: Supported

		KERNEL VIRTUAL MACHINE For Itanium(KVM/IA64)
		P: Anthony Xu
		M: anthony.xu@intel.com
		P: Xiantao Zhang
		M: xiantao.zhang@intel.com
		L: kvm-ia64-devel@lists.sourceforge.net
		W: kvm.sourceforge.net
		S: Supported

		KEXEC
		P: Eric Biederman
		M: ebiederm@xmission.com

arch/ia64/hp/common/sba_iommu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1875,7 +1875,7 @@ ioc_show(struct seq_file s, void v)
		return 0;
		}

		static struct seq_operations ioc_seq_ops = {
		static const struct seq_operations ioc_seq_ops = {
		.start = ioc_start,
		.next = ioc_next,
		.stop = ioc_stop,

arch/ia64/ia32/ia32_support.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@

		#include "ia32priv.h"

		extern void die_if_kernel (char str, struct pt_regs regs, long err);
		extern int die_if_kernel (char str, struct pt_regs regs, long err);

		struct exec_domain ia32_exec_domain;
		struct page *ia32_shared_page[NR_CPUS];
		@@ -217,7 +217,8 @@ ia32_bad_interrupt (unsigned long int_num, struct pt_regs *regs)
		{
		siginfo_t siginfo;

		die_if_kernel("Bad IA-32 interrupt", regs, int_num);
		if (die_if_kernel("Bad IA-32 interrupt", regs, int_num))
		return;

		siginfo.si_signo = SIGTRAP;
		siginfo.si_errno = int_num; /* XXX is it OK to abuse si_errno like this? */

arch/ia64/kernel/efi.c

+272 −230

Original line number	Diff line number	Diff line
		/*
		* Extensible Firmware Interface
		*
		* Based on Extensible Firmware Interface Specification version 0.9 April 30, 1999
		* Based on Extensible Firmware Interface Specification version 0.9
		* April 30, 1999
		*
		* Copyright (C) 1999 VA Linux Systems
		* Copyright (C) 1999 Walt Drummond <drummond@valinux.com>
		@@ -59,7 +60,8 @@ prefix##_get_time (efi_time_t tm, efi_time_cap_t tc) \
		if (tc) \
		atc = adjust_arg(tc); \
		ia64_save_scratch_fpregs(fr); \
		ret = efi_call_##prefix((efi_get_time_t *) __va(runtime->get_time), adjust_arg(tm), atc); \
		ret = efi_call_##prefix((efi_get_time_t *) __va(runtime->get_time), \
		adjust_arg(tm), atc); \
		ia64_load_scratch_fpregs(fr); \
		return ret; \
		}
		@@ -72,20 +74,23 @@ prefix##_set_time (efi_time_t *tm) \
		efi_status_t ret; \
		\
		ia64_save_scratch_fpregs(fr); \
		ret = efi_call_##prefix((efi_set_time_t *) __va(runtime->set_time), adjust_arg(tm)); \
		ret = efi_call_##prefix((efi_set_time_t *) __va(runtime->set_time), \
		adjust_arg(tm)); \
		ia64_load_scratch_fpregs(fr); \
		return ret; \
		}

		#define STUB_GET_WAKEUP_TIME(prefix, adjust_arg) \
		static efi_status_t \
		prefix##_get_wakeup_time (efi_bool_t enabled, efi_bool_t pending, efi_time_t *tm) \
		prefix##_get_wakeup_time (efi_bool_t enabled, efi_bool_t pending, \
		efi_time_t *tm) \
		{ \
		struct ia64_fpreg fr[6]; \
		efi_status_t ret; \
		\
		ia64_save_scratch_fpregs(fr); \
		ret = efi_call_##prefix((efi_get_wakeup_time_t *) __va(runtime->get_wakeup_time), \
		ret = efi_call_##prefix( \
		(efi_get_wakeup_time_t *) __va(runtime->get_wakeup_time), \
		adjust_arg(enabled), adjust_arg(pending), adjust_arg(tm)); \
		ia64_load_scratch_fpregs(fr); \
		return ret; \
		@@ -102,7 +107,8 @@ prefix##_set_wakeup_time (efi_bool_t enabled, efi_time_t *tm) \
		if (tm) \
		atm = adjust_arg(tm); \
		ia64_save_scratch_fpregs(fr); \
		ret = efi_call_##prefix((efi_set_wakeup_time_t *) __va(runtime->set_wakeup_time), \
		ret = efi_call_##prefix( \
		(efi_set_wakeup_time_t *) __va(runtime->set_wakeup_time), \
		enabled, atm); \
		ia64_load_scratch_fpregs(fr); \
		return ret; \
		@@ -120,7 +126,8 @@ prefix##_get_variable (efi_char16_t name, efi_guid_t vendor, u32 *attr, \
		if (attr) \
		aattr = adjust_arg(attr); \
		ia64_save_scratch_fpregs(fr); \
		ret = efi_call_##prefix((efi_get_variable_t *) __va(runtime->get_variable), \
		ret = efi_call_##prefix( \
		(efi_get_variable_t *) __va(runtime->get_variable), \
		adjust_arg(name), adjust_arg(vendor), aattr, \
		adjust_arg(data_size), adjust_arg(data)); \
		ia64_load_scratch_fpregs(fr); \
		@@ -129,13 +136,15 @@ prefix##_get_variable (efi_char16_t name, efi_guid_t vendor, u32 *attr, \

		#define STUB_GET_NEXT_VARIABLE(prefix, adjust_arg) \
		static efi_status_t \
		prefix##_get_next_variable (unsigned long name_size, efi_char16_t name, efi_guid_t *vendor) \
		prefix##_get_next_variable (unsigned long name_size, efi_char16_t name, \
		efi_guid_t *vendor) \
		{ \
		struct ia64_fpreg fr[6]; \
		efi_status_t ret; \
		\
		ia64_save_scratch_fpregs(fr); \
		ret = efi_call_##prefix((efi_get_next_variable_t *) __va(runtime->get_next_variable), \
		ret = efi_call_##prefix( \
		(efi_get_next_variable_t *) __va(runtime->get_next_variable), \
		adjust_arg(name_size), adjust_arg(name), adjust_arg(vendor)); \
		ia64_load_scratch_fpregs(fr); \
		return ret; \
		@@ -143,14 +152,16 @@ prefix##_get_next_variable (unsigned long name_size, efi_char16_t name, efi_gu

		#define STUB_SET_VARIABLE(prefix, adjust_arg) \
		static efi_status_t \
		prefix##_set_variable (efi_char16_t name, efi_guid_t vendor, unsigned long attr, \
		unsigned long data_size, void *data) \
		prefix##_set_variable (efi_char16_t name, efi_guid_t vendor, \
		unsigned long attr, unsigned long data_size, \
		void *data) \
		{ \
		struct ia64_fpreg fr[6]; \
		efi_status_t ret; \
		\
		ia64_save_scratch_fpregs(fr); \
		ret = efi_call_##prefix((efi_set_variable_t *) __va(runtime->set_variable), \
		ret = efi_call_##prefix( \
		(efi_set_variable_t *) __va(runtime->set_variable), \
		adjust_arg(name), adjust_arg(vendor), attr, data_size, \
		adjust_arg(data)); \
		ia64_load_scratch_fpregs(fr); \
		@@ -166,7 +177,8 @@ prefix##_get_next_high_mono_count (u32 *count) \
		\
		ia64_save_scratch_fpregs(fr); \
		ret = efi_call_##prefix((efi_get_next_high_mono_count_t *) \
		__va(runtime->get_next_high_mono_count), adjust_arg(count)); \
		__va(runtime->get_next_high_mono_count), \
		adjust_arg(count)); \
		ia64_load_scratch_fpregs(fr); \
		return ret; \
		}
		@@ -183,7 +195,8 @@ prefix##_reset_system (int reset_type, efi_status_t status, \
		adata = adjust_arg(data); \
		\
		ia64_save_scratch_fpregs(fr); \
		efi_call_##prefix((efi_reset_system_t *) __va(runtime->reset_system), \
		efi_call_##prefix( \
		(efi_reset_system_t *) __va(runtime->reset_system), \
		reset_type, status, data_size, adata); \
		/* should not return, but just in case... */ \
		ia64_load_scratch_fpregs(fr); \
		@@ -223,7 +236,8 @@ efi_gettimeofday (struct timespec *ts)
		return;
		}

		ts->tv_sec = mktime(tm.year, tm.month, tm.day, tm.hour, tm.minute, tm.second);
		ts->tv_sec = mktime(tm.year, tm.month, tm.day,
		tm.hour, tm.minute, tm.second);
		ts->tv_nsec = tm.nanosecond;
		}

		@@ -297,8 +311,8 @@ walk (efi_freemem_callback_t callback, void *arg, u64 attr)
		}

		/*
		* Walks the EFI memory map and calls CALLBACK once for each EFI memory descriptor that
		* has memory that is available for OS use.
		* Walk the EFI memory map and call CALLBACK once for each EFI memory
		* descriptor that has memory that is available for OS use.
		*/
		void
		efi_memmap_walk (efi_freemem_callback_t callback, void *arg)
		@@ -307,8 +321,8 @@ efi_memmap_walk (efi_freemem_callback_t callback, void *arg)
		}

		/*
		* Walks the EFI memory map and calls CALLBACK once for each EFI memory descriptor that
		* has memory that is available for uncached allocator.
		* Walk the EFI memory map and call CALLBACK once for each EFI memory
		* descriptor that has memory that is available for uncached allocator.
		*/
		void
		efi_memmap_walk_uc (efi_freemem_callback_t callback, void *arg)
		@@ -317,11 +331,10 @@ efi_memmap_walk_uc (efi_freemem_callback_t callback, void *arg)
		}

		/*
		* Look for the PAL_CODE region reported by EFI and maps it using an
		* Look for the PAL_CODE region reported by EFI and map it using an
		* ITR to enable safe PAL calls in virtual mode. See IA-64 Processor
		* Abstraction Layer chapter 11 in ADAG
		*/

		void *
		efi_get_pal_addr (void)
		{
		@@ -341,42 +354,44 @@ efi_get_pal_addr (void)
		continue;

		if (++pal_code_count > 1) {
		printk(KERN_ERR "Too many EFI Pal Code memory ranges, dropped @ %lx\n",
		md->phys_addr);
		printk(KERN_ERR "Too many EFI Pal Code memory ranges, "
		"dropped @ %lx\n", md->phys_addr);
		continue;
		}
		/*
		* The only ITLB entry in region 7 that is used is the one installed by
		* __start(). That entry covers a 64MB range.
		* The only ITLB entry in region 7 that is used is the one
		* installed by __start(). That entry covers a 64MB range.
		*/
		mask = ~((1 << KERNEL_TR_PAGE_SHIFT) - 1);
		vaddr = PAGE_OFFSET + md->phys_addr;

		/*
		* We must check that the PAL mapping won't overlap with the kernel
		* mapping.
		* We must check that the PAL mapping won't overlap with the
		* kernel mapping.
		*
		* PAL code is guaranteed to be aligned on a power of 2 between 4k and
		* 256KB and that only one ITR is needed to map it. This implies that the
		* PAL code is always aligned on its size, i.e., the closest matching page
		* size supported by the TLB. Therefore PAL code is guaranteed never to
		* cross a 64MB unless it is bigger than 64MB (very unlikely!). So for
		* now the following test is enough to determine whether or not we need a
		* dedicated ITR for the PAL code.
		* PAL code is guaranteed to be aligned on a power of 2 between
		* 4k and 256KB and that only one ITR is needed to map it. This
		* implies that the PAL code is always aligned on its size,
		* i.e., the closest matching page size supported by the TLB.
		* Therefore PAL code is guaranteed never to cross a 64MB unless
		* it is bigger than 64MB (very unlikely!). So for now the
		* following test is enough to determine whether or not we need
		* a dedicated ITR for the PAL code.
		*/
		if ((vaddr & mask) == (KERNEL_START & mask)) {
		printk(KERN_INFO "%s: no need to install ITR for PAL code\n",
		__FUNCTION__);
		printk(KERN_INFO "%s: no need to install ITR for "
		"PAL code\n", __FUNCTION__);
		continue;
		}

		if (efi_md_size(md) > IA64_GRANULE_SIZE)
		panic("Woah! PAL code size bigger than a granule!");
		panic("Whoa! PAL code size bigger than a granule!");

		#if EFI_DEBUG
		mask = ~((1 << IA64_GRANULE_SHIFT) - 1);

		printk(KERN_INFO "CPU %d: mapping PAL code [0x%lx-0x%lx) into [0x%lx-0x%lx)\n",
		printk(KERN_INFO "CPU %d: mapping PAL code "
		"[0x%lx-0x%lx) into [0x%lx-0x%lx)\n",
		smp_processor_id(), md->phys_addr,
		md->phys_addr + efi_md_size(md),
		vaddr & mask, (vaddr & mask) + IA64_GRANULE_SIZE);
		@@ -401,11 +416,11 @@ efi_map_pal_code (void)
		* Cannot write to CRx with PSR.ic=1
		*/
		psr = ia64_clear_ic();
		ia64_itr(0x1, IA64_TR_PALCODE, GRANULEROUNDDOWN((unsigned long) pal_vaddr),
		ia64_itr(0x1, IA64_TR_PALCODE,
		GRANULEROUNDDOWN((unsigned long) pal_vaddr),
		pte_val(pfn_pte(__pa(pal_vaddr) >> PAGE_SHIFT, PAGE_KERNEL)),
		IA64_GRANULE_SHIFT);
		ia64_set_psr(psr); /* restore psr */
		ia64_srlz_i();
		}

		void __init
		@@ -418,7 +433,10 @@ efi_init (void)
		char *cp, vendor[100] = "unknown";
		int i;

		/* it's too early to be able to use the standard kernel command line support... */
		/*
		* It's too early to be able to use the standard kernel command line
		* support...
		*/
		for (cp = boot_command_line; *cp; ) {
		if (memcmp(cp, "mem=", 4) == 0) {
		mem_limit = memparse(cp + 4, &cp);
		@@ -434,9 +452,11 @@ efi_init (void)
		}
		}
		if (min_addr != 0UL)
		printk(KERN_INFO "Ignoring memory below %luMB\n", min_addr >> 20);
		printk(KERN_INFO "Ignoring memory below %luMB\n",
		min_addr >> 20);
		if (max_addr != ~0UL)
		printk(KERN_INFO "Ignoring memory above %luMB\n", max_addr >> 20);
		printk(KERN_INFO "Ignoring memory above %luMB\n",
		max_addr >> 20);

		efi.systab = __va(ia64_boot_param->efi_systab);

		@@ -444,9 +464,9 @@ efi_init (void)
		* Verify the EFI Table
		*/
		if (efi.systab == NULL)
		panic("Woah! Can't find EFI system table.\n");
		panic("Whoa! Can't find EFI system table.\n");
		if (efi.systab->hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE)
		panic("Woah! EFI system table signature incorrect\n");
		panic("Whoa! EFI system table signature incorrect\n");
		if ((efi.systab->hdr.revision >> 16) == 0)
		printk(KERN_WARNING "Warning: EFI system table version "
		"%d.%02d, expected 1.00 or greater\n",
		@@ -464,7 +484,8 @@ efi_init (void)
		}

		printk(KERN_INFO "EFI v%u.%.02u by %s:",
		efi.systab->hdr.revision >> 16, efi.systab->hdr.revision & 0xffff, vendor);
		efi.systab->hdr.revision >> 16,
		efi.systab->hdr.revision & 0xffff, vendor);

		efi.mps = EFI_INVALID_TABLE_ADDR;
		efi.acpi = EFI_INVALID_TABLE_ADDR;
		@@ -519,9 +540,12 @@ efi_init (void)
		efi_memory_desc_t *md;
		void *p;

		for (i = 0, p = efi_map_start; p < efi_map_end; ++i, p += efi_desc_size) {
		for (i = 0, p = efi_map_start; p < efi_map_end;
		++i, p += efi_desc_size)
		{
		md = p;
		printk("mem%02u: type=%u, attr=0x%lx, range=[0x%016lx-0x%016lx) (%luMB)\n",
		printk("mem%02u: type=%u, attr=0x%lx, "
		"range=[0x%016lx-0x%016lx) (%luMB)\n",
		i, md->type, md->attribute, md->phys_addr,
		md->phys_addr + efi_md_size(md),
		md->num_pages >> (20 - EFI_PAGE_SHIFT));
		@@ -549,8 +573,8 @@ efi_enter_virtual_mode (void)
		md = p;
		if (md->attribute & EFI_MEMORY_RUNTIME) {
		/*
		* Some descriptors have multiple bits set, so the order of
		* the tests is relevant.
		* Some descriptors have multiple bits set, so the
		* order of the tests is relevant.
		*/
		if (md->attribute & EFI_MEMORY_WB) {
		md->virt_addr = (u64) __va(md->phys_addr);
		@@ -558,21 +582,26 @@ efi_enter_virtual_mode (void)
		md->virt_addr = (u64) ioremap(md->phys_addr, 0);
		} else if (md->attribute & EFI_MEMORY_WC) {
		#if 0
		md->virt_addr = ia64_remap(md->phys_addr, (_PAGE_A \| _PAGE_P
		\| _PAGE_D
		\| _PAGE_MA_WC
		\| _PAGE_PL_0
		\| _PAGE_AR_RW));
		md->virt_addr = ia64_remap(md->phys_addr,
		(_PAGE_A \|
		_PAGE_P \|
		_PAGE_D \|
		_PAGE_MA_WC \|
		_PAGE_PL_0 \|
		_PAGE_AR_RW));
		#else
		printk(KERN_INFO "EFI_MEMORY_WC mapping\n");
		md->virt_addr = (u64) ioremap(md->phys_addr, 0);
		#endif
		} else if (md->attribute & EFI_MEMORY_WT) {
		#if 0
		md->virt_addr = ia64_remap(md->phys_addr, (_PAGE_A \| _PAGE_P
		\| _PAGE_D \| _PAGE_MA_WT
		\| _PAGE_PL_0
		\| _PAGE_AR_RW));
		md->virt_addr = ia64_remap(md->phys_addr,
		(_PAGE_A \|
		_PAGE_P \|
		_PAGE_D \|
		_PAGE_MA_WT \|
		_PAGE_PL_0 \|
		_PAGE_AR_RW));
		#else
		printk(KERN_INFO "EFI_MEMORY_WT mapping\n");
		md->virt_addr = (u64) ioremap(md->phys_addr, 0);
		@@ -583,16 +612,18 @@ efi_enter_virtual_mode (void)

		status = efi_call_phys(__va(runtime->set_virtual_address_map),
		ia64_boot_param->efi_memmap_size,
		efi_desc_size, ia64_boot_param->efi_memdesc_version,
		efi_desc_size,
		ia64_boot_param->efi_memdesc_version,
		ia64_boot_param->efi_memmap);
		if (status != EFI_SUCCESS) {
		printk(KERN_WARNING "warning: unable to switch EFI into virtual mode "
		"(status=%lu)\n", status);
		printk(KERN_WARNING "warning: unable to switch EFI into "
		"virtual mode (status=%lu)\n", status);
		return;
		}

		/*
		* Now that EFI is in virtual mode, we call the EFI functions more efficiently:
		* Now that EFI is in virtual mode, we call the EFI functions more
		* efficiently:
		*/
		efi.get_time = virt_get_time;
		efi.set_time = virt_set_time;
		@@ -606,8 +637,8 @@ efi_enter_virtual_mode (void)
		}

		/*
		* Walk the EFI memory map looking for the I/O port range. There can only be one entry of
		* this type, other I/O port ranges should be described via ACPI.
		* Walk the EFI memory map looking for the I/O port range. There can only be
		* one entry of this type, other I/O port ranges should be described via ACPI.
		*/
		u64
		efi_get_iobase (void)
		@@ -678,7 +709,6 @@ efi_memmap_intersects (unsigned long phys_addr, unsigned long size)

		for (p = efi_map_start; p < efi_map_end; p += efi_desc_size) {
		md = p;

		if (md->phys_addr < end && efi_md_end(md) > phys_addr)
		return 1;
		}
		@@ -731,7 +761,7 @@ efi_mem_attribute (unsigned long phys_addr, unsigned long size)
		if (!md \|\| (md->attribute & ~EFI_MEMORY_RUNTIME) != attr)
		return 0;
		} while (md);
		return 0;
		return 0; /* never reached */
		}

		u64
		@@ -767,7 +797,7 @@ kern_mem_attribute (unsigned long phys_addr, unsigned long size)
		if (!md \|\| md->attribute != attr)
		return 0;
		} while (md);
		return 0;
		return 0; /* never reached */
		}
		EXPORT_SYMBOL(kern_mem_attribute);

		@@ -921,10 +951,12 @@ find_memmap_space (void)
		if (!efi_wb(md)) {
		continue;
		}
		if (pmd == NULL \|\| !efi_wb(pmd) \|\| efi_md_end(pmd) != md->phys_addr) {
		if (pmd == NULL \|\| !efi_wb(pmd) \|\|
		efi_md_end(pmd) != md->phys_addr) {
		contig_low = GRANULEROUNDUP(md->phys_addr);
		contig_high = efi_md_end(md);
		for (q = p + efi_desc_size; q < efi_map_end; q += efi_desc_size) {
		for (q = p + efi_desc_size; q < efi_map_end;
		q += efi_desc_size) {
		check_md = q;
		if (!efi_wb(check_md))
		break;
		@@ -988,7 +1020,8 @@ efi_memmap_init(unsigned long s, unsigned long e)
		for (p = efi_map_start; p < efi_map_end; pmd = md, p += efi_desc_size) {
		md = p;
		if (!efi_wb(md)) {
		if (efi_uc(md) && (md->type == EFI_CONVENTIONAL_MEMORY \|\|
		if (efi_uc(md) &&
		(md->type == EFI_CONVENTIONAL_MEMORY \|\|
		md->type == EFI_BOOT_SERVICES_DATA)) {
		k->attribute = EFI_MEMORY_UC;
		k->start = md->phys_addr;
		@@ -997,10 +1030,12 @@ efi_memmap_init(unsigned long s, unsigned long e)
		}
		continue;
		}
		if (pmd == NULL \|\| !efi_wb(pmd) \|\| efi_md_end(pmd) != md->phys_addr) {
		if (pmd == NULL \|\| !efi_wb(pmd) \|\|
		efi_md_end(pmd) != md->phys_addr) {
		contig_low = GRANULEROUNDUP(md->phys_addr);
		contig_high = efi_md_end(md);
		for (q = p + efi_desc_size; q < efi_map_end; q += efi_desc_size) {
		for (q = p + efi_desc_size; q < efi_map_end;
		q += efi_desc_size) {
		check_md = q;
		if (!efi_wb(check_md))
		break;
		@@ -1025,13 +1060,17 @@ efi_memmap_init(unsigned long s, unsigned long e)
		if (md->phys_addr < contig_low) {
		lim = min(efi_md_end(md), contig_low);
		if (efi_uc(md)) {
		if (k > kern_memmap && (k-1)->attribute == EFI_MEMORY_UC &&
		if (k > kern_memmap &&
		(k-1)->attribute == EFI_MEMORY_UC &&
		kmd_end(k-1) == md->phys_addr) {
		(k-1)->num_pages += (lim - md->phys_addr) >> EFI_PAGE_SHIFT;
		(k-1)->num_pages +=
		(lim - md->phys_addr)
		>> EFI_PAGE_SHIFT;
		} else {
		k->attribute = EFI_MEMORY_UC;
		k->start = md->phys_addr;
		k->num_pages = (lim - md->phys_addr) >> EFI_PAGE_SHIFT;
		k->num_pages = (lim - md->phys_addr)
		>> EFI_PAGE_SHIFT;
		k++;
		}
		}
		@@ -1049,7 +1088,8 @@ efi_memmap_init(unsigned long s, unsigned long e)
		} else {
		k->attribute = EFI_MEMORY_UC;
		k->start = lim;
		k->num_pages = (efi_md_end(md) - lim) >> EFI_PAGE_SHIFT;
		k->num_pages = (efi_md_end(md) - lim)
		>> EFI_PAGE_SHIFT;
		k++;
		}
		}
		@@ -1151,8 +1191,10 @@ efi_initialize_iomem_resources(struct resource *code_resource,
		break;
		}

		if ((res = kzalloc(sizeof(struct resource), GFP_KERNEL)) == NULL) {
		printk(KERN_ERR "failed to alocate resource for iomem\n");
		if ((res = kzalloc(sizeof(struct resource),
		GFP_KERNEL)) == NULL) {
		printk(KERN_ERR
		"failed to allocate resource for iomem\n");
		return;
		}

		@@ -1187,8 +1229,7 @@ efi_initialize_iomem_resources(struct resource *code_resource,
		rsvd_regions are sorted
		*/
		unsigned long __init
		kdump_find_rsvd_region (unsigned long size,
		struct rsvd_region *r, int n)
		kdump_find_rsvd_region (unsigned long size, struct rsvd_region *r, int n)
		{
		int i;
		u64 start, end;
		@@ -1212,7 +1253,8 @@ kdump_find_rsvd_region (unsigned long size,
		if (__pa(r[i].start) > start + size)
		return start;
		start = ALIGN(__pa(r[i].end), alignment);
		if (i < n-1 && __pa(r[i+1].start) < start + size)
		if (i < n-1 &&
		__pa(r[i+1].start) < start + size)
		continue;
		else
		break;
		@@ -1222,8 +1264,8 @@ kdump_find_rsvd_region (unsigned long size,
		return start;
		}

		printk(KERN_WARNING "Cannot reserve 0x%lx byte of memory for crashdump\n",
		size);
		printk(KERN_WARNING
		"Cannot reserve 0x%lx byte of memory for crashdump\n", size);
		return ~0UL;
		}
		#endif

Admin message