projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'akpm' (patches from Andrew)
[linux-2.6-microblaze.git]
/
arch
/
s390
/
mm
/
init.c
diff --git
a/arch/s390/mm/init.c
b/arch/s390/mm/init.c
index
f3db3ca
..
a04faf4
100644
(file)
--- a/
arch/s390/mm/init.c
+++ b/
arch/s390/mm/init.c
@@
-187,9
+187,9
@@
static void pv_init(void)
return;
/* make sure bounce buffers are shared */
return;
/* make sure bounce buffers are shared */
+ swiotlb_force = SWIOTLB_FORCE;
swiotlb_init(1);
swiotlb_update_mem_attributes();
swiotlb_init(1);
swiotlb_update_mem_attributes();
- swiotlb_force = SWIOTLB_FORCE;
}
void __init mem_init(void)
}
void __init mem_init(void)
@@
-307,8
+307,7
@@
int arch_add_memory(int nid, u64 start, u64 size,
return rc;
}
return rc;
}
-void arch_remove_memory(int nid, u64 start, u64 size,
- struct vmem_altmap *altmap)
+void arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap)
{
unsigned long start_pfn = start >> PAGE_SHIFT;
unsigned long nr_pages = size >> PAGE_SHIFT;
{
unsigned long start_pfn = start >> PAGE_SHIFT;
unsigned long nr_pages = size >> PAGE_SHIFT;