git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
s390
/
mm
/
init.c
diff --git
a/arch/s390/mm/init.c
b/arch/s390/mm/init.c
index
177a3d2
..
57fa56a
100644
(file)
--- a/
arch/s390/mm/init.c
+++ b/
arch/s390/mm/init.c
@@
-44,12
+44,25
@@
void diag10(unsigned long addr)
{
if (addr >= 0x7ff00000)
return;
{
if (addr >= 0x7ff00000)
return;
-#ifdef __s390x__
- asm volatile ("sam31\n\t"
- "diag %0,%0,0x10\n\t"
- "sam64" : : "a" (addr) );
+#ifdef CONFIG_64BIT
+ asm volatile (
+ " sam31\n"
+ " diag %0,%0,0x10\n"
+ "0: sam64\n"
+ ".section __ex_table,\"a\"\n"
+ " .align 8\n"
+ " .quad 0b, 0b\n"
+ ".previous\n"
+ : : "a" (addr));
#else
#else
- asm volatile ("diag %0,%0,0x10" : : "a" (addr) );
+ asm volatile (
+ " diag %0,%0,0x10\n"
+ "0:\n"
+ ".section __ex_table,\"a\"\n"
+ " .align 4\n"
+ " .long 0b, 0b\n"
+ ".previous\n"
+ : : "a" (addr));
#endif
}
#endif
}
@@
-60,7
+73,7
@@
void show_mem(void)
printk("Mem-info:\n");
show_free_areas();
printk("Mem-info:\n");
show_free_areas();
- printk("Free swap: %6
dkB\n",
nr_swap_pages<<(PAGE_SHIFT-10));
+ printk("Free swap: %6
ldkB\n",
nr_swap_pages<<(PAGE_SHIFT-10));
i = max_mapnr;
while (i-- > 0) {
total++;
i = max_mapnr;
while (i-- > 0) {
total++;
@@
-88,11
+101,12
@@
extern unsigned long _end;
extern unsigned long __init_begin;
extern unsigned long __init_end;
extern unsigned long __init_begin;
extern unsigned long __init_end;
+extern unsigned long __initdata zholes_size[];
/*
* paging_init() sets up the page tables
*/
/*
* paging_init() sets up the page tables
*/
-#ifndef CONFIG_
ARCH_S390X
+#ifndef CONFIG_
64BIT
void __init paging_init(void)
{
pgd_t * pg_dir;
void __init paging_init(void)
{
pgd_t * pg_dir;
@@
-132,7
+146,7
@@
void __init paging_init(void)
for (tmp = 0 ; tmp < PTRS_PER_PTE ; tmp++,pg_table++) {
pte = pfn_pte(pfn, PAGE_KERNEL);
if (pfn >= max_low_pfn)
for (tmp = 0 ; tmp < PTRS_PER_PTE ; tmp++,pg_table++) {
pte = pfn_pte(pfn, PAGE_KERNEL);
if (pfn >= max_low_pfn)
- pte_clear(&pte);
+ pte_clear(&
init_mm, 0, &
pte);
set_pte(pg_table, pte);
pfn++;
}
set_pte(pg_table, pte);
pfn++;
}
@@
-150,15
+164,18
@@
void __init paging_init(void)
local_flush_tlb();
{
local_flush_tlb();
{
- unsigned long zones_size[MAX_NR_ZONES]
= { 0, 0, 0}
;
+ unsigned long zones_size[MAX_NR_ZONES];
+ memset(zones_size, 0, sizeof(zones_size));
zones_size[ZONE_DMA] = max_low_pfn;
zones_size[ZONE_DMA] = max_low_pfn;
- free_area_init(zones_size);
+ free_area_init_node(0, &contig_page_data, zones_size,
+ __pa(PAGE_OFFSET) >> PAGE_SHIFT,
+ zholes_size);
}
return;
}
}
return;
}
-#else /* CONFIG_
ARCH_S390X
*/
+#else /* CONFIG_
64BIT
*/
void __init paging_init(void)
{
pgd_t * pg_dir;
void __init paging_init(void)
{
pgd_t * pg_dir;
@@
-171,9
+188,10
@@
void __init paging_init(void)
_KERN_REGION_TABLE;
static const int ssm_mask = 0x04000000L;
_KERN_REGION_TABLE;
static const int ssm_mask = 0x04000000L;
- unsigned long zones_size[MAX_NR_ZONES]
= {0, 0, 0}
;
+ unsigned long zones_size[MAX_NR_ZONES];
unsigned long dma_pfn, high_pfn;
unsigned long dma_pfn, high_pfn;
+ memset(zones_size, 0, sizeof(zones_size));
dma_pfn = MAX_DMA_ADDRESS >> PAGE_SHIFT;
high_pfn = max_low_pfn;
dma_pfn = MAX_DMA_ADDRESS >> PAGE_SHIFT;
high_pfn = max_low_pfn;
@@
-185,8
+203,8
@@
void __init paging_init(void)
}
/* Initialize mem_map[]. */
}
/* Initialize mem_map[]. */
- free_area_init
(zones_size);
-
+ free_area_init
_node(0, &contig_page_data, zones_size,
+ __pa(PAGE_OFFSET) >> PAGE_SHIFT, zholes_size);
/*
* map whole physical memory to virtual memory (identity mapping)
/*
* map whole physical memory to virtual memory (identity mapping)
@@
-216,7
+234,7
@@
void __init paging_init(void)
for (k = 0 ; k < PTRS_PER_PTE ; k++,pt_dir++) {
pte = pfn_pte(pfn, PAGE_KERNEL);
if (pfn >= max_low_pfn) {
for (k = 0 ; k < PTRS_PER_PTE ; k++,pt_dir++) {
pte = pfn_pte(pfn, PAGE_KERNEL);
if (pfn >= max_low_pfn) {
- pte_clear(&pte);
+ pte_clear(&
init_mm, 0, &
pte);
continue;
}
set_pte(pt_dir, pte);
continue;
}
set_pte(pt_dir, pte);
@@
-238,7
+256,12
@@
void __init paging_init(void)
return;
}
return;
}
-#endif /* CONFIG_ARCH_S390X */
+#endif /* CONFIG_64BIT */
+
+int page_is_ram (unsigned long pagenr)
+{
+ return pagenr < max_mapnr;
+}
void __init mem_init(void)
{
void __init mem_init(void)
{
@@
-274,7
+297,7
@@
void free_initmem(void)
addr = (unsigned long)(&__init_begin);
for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
ClearPageReserved(virt_to_page(addr));
addr = (unsigned long)(&__init_begin);
for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
ClearPageReserved(virt_to_page(addr));
-
set_page_count(virt_to_page(addr), 1
);
+
init_page_count(virt_to_page(addr)
);
free_page(addr);
totalram_pages++;
}
free_page(addr);
totalram_pages++;
}
@@
-289,7
+312,7
@@
void free_initrd_mem(unsigned long start, unsigned long end)
printk ("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
for (; start < end; start += PAGE_SIZE) {
ClearPageReserved(virt_to_page(start));
printk ("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
for (; start < end; start += PAGE_SIZE) {
ClearPageReserved(virt_to_page(start));
-
set_page_count(virt_to_page(start), 1
);
+
init_page_count(virt_to_page(start)
);
free_page(start);
totalram_pages++;
}
free_page(start);
totalram_pages++;
}