aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firmware
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/firmware')
-rw-r--r--drivers/firmware/memmap.c8
-rw-r--r--drivers/firmware/pcdp.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c
index adc07102a20d..c1cdc9236666 100644
--- a/drivers/firmware/memmap.c
+++ b/drivers/firmware/memmap.c
@@ -98,7 +98,7 @@ static LIST_HEAD(map_entries);
98/** 98/**
99 * firmware_map_add_entry() - Does the real work to add a firmware memmap entry. 99 * firmware_map_add_entry() - Does the real work to add a firmware memmap entry.
100 * @start: Start of the memory range. 100 * @start: Start of the memory range.
101 * @end: End of the memory range (inclusive). 101 * @end: End of the memory range (exclusive).
102 * @type: Type of the memory range. 102 * @type: Type of the memory range.
103 * @entry: Pre-allocated (either kmalloc() or bootmem allocator), uninitialised 103 * @entry: Pre-allocated (either kmalloc() or bootmem allocator), uninitialised
104 * entry. 104 * entry.
@@ -113,7 +113,7 @@ static int firmware_map_add_entry(u64 start, u64 end,
113 BUG_ON(start > end); 113 BUG_ON(start > end);
114 114
115 entry->start = start; 115 entry->start = start;
116 entry->end = end; 116 entry->end = end - 1;
117 entry->type = type; 117 entry->type = type;
118 INIT_LIST_HEAD(&entry->list); 118 INIT_LIST_HEAD(&entry->list);
119 kobject_init(&entry->kobj, &memmap_ktype); 119 kobject_init(&entry->kobj, &memmap_ktype);
@@ -148,7 +148,7 @@ static int add_sysfs_fw_map_entry(struct firmware_map_entry *entry)
148 * firmware_map_add_hotplug() - Adds a firmware mapping entry when we do 148 * firmware_map_add_hotplug() - Adds a firmware mapping entry when we do
149 * memory hotplug. 149 * memory hotplug.
150 * @start: Start of the memory range. 150 * @start: Start of the memory range.
151 * @end: End of the memory range (inclusive). 151 * @end: End of the memory range (exclusive)
152 * @type: Type of the memory range. 152 * @type: Type of the memory range.
153 * 153 *
154 * Adds a firmware mapping entry. This function is for memory hotplug, it is 154 * Adds a firmware mapping entry. This function is for memory hotplug, it is
@@ -175,7 +175,7 @@ int __meminit firmware_map_add_hotplug(u64 start, u64 end, const char *type)
175/** 175/**
176 * firmware_map_add_early() - Adds a firmware mapping entry. 176 * firmware_map_add_early() - Adds a firmware mapping entry.
177 * @start: Start of the memory range. 177 * @start: Start of the memory range.
178 * @end: End of the memory range (inclusive). 178 * @end: End of the memory range.
179 * @type: Type of the memory range. 179 * @type: Type of the memory range.
180 * 180 *
181 * Adds a firmware mapping entry. This function uses the bootmem allocator 181 * Adds a firmware mapping entry. This function uses the bootmem allocator
diff --git a/drivers/firmware/pcdp.c b/drivers/firmware/pcdp.c
index 51e0e2d8fac6..a330492e06f9 100644
--- a/drivers/firmware/pcdp.c
+++ b/drivers/firmware/pcdp.c
@@ -95,7 +95,7 @@ efi_setup_pcdp_console(char *cmdline)
95 if (efi.hcdp == EFI_INVALID_TABLE_ADDR) 95 if (efi.hcdp == EFI_INVALID_TABLE_ADDR)
96 return -ENODEV; 96 return -ENODEV;
97 97
98 pcdp = ioremap(efi.hcdp, 4096); 98 pcdp = early_ioremap(efi.hcdp, 4096);
99 printk(KERN_INFO "PCDP: v%d at 0x%lx\n", pcdp->rev, efi.hcdp); 99 printk(KERN_INFO "PCDP: v%d at 0x%lx\n", pcdp->rev, efi.hcdp);
100 100
101 if (strstr(cmdline, "console=hcdp")) { 101 if (strstr(cmdline, "console=hcdp")) {
@@ -131,6 +131,6 @@ efi_setup_pcdp_console(char *cmdline)
131 } 131 }
132 132
133out: 133out:
134 iounmap(pcdp); 134 early_iounmap(pcdp, 4096);
135 return rc; 135 return rc;
136} 136}