|
@@ -434,8 +434,8 @@ void mark_rodata_ro(void)
|
|
#define SET_MAP_OFFSET(x) ((void *)(((unsigned long)(x) + VM_MAP_OFFSET) \
|
|
#define SET_MAP_OFFSET(x) ((void *)(((unsigned long)(x) + VM_MAP_OFFSET) \
|
|
& ~(VM_MAP_OFFSET-1)))
|
|
& ~(VM_MAP_OFFSET-1)))
|
|
|
|
|
|
-void *vmalloc_start __read_mostly;
|
|
|
|
-EXPORT_SYMBOL(vmalloc_start);
|
|
|
|
|
|
+void *parisc_vmalloc_start __read_mostly;
|
|
|
|
+EXPORT_SYMBOL(parisc_vmalloc_start);
|
|
|
|
|
|
#ifdef CONFIG_PA11
|
|
#ifdef CONFIG_PA11
|
|
unsigned long pcxl_dma_start __read_mostly;
|
|
unsigned long pcxl_dma_start __read_mostly;
|
|
@@ -496,13 +496,14 @@ void __init mem_init(void)
|
|
#ifdef CONFIG_PA11
|
|
#ifdef CONFIG_PA11
|
|
if (hppa_dma_ops == &pcxl_dma_ops) {
|
|
if (hppa_dma_ops == &pcxl_dma_ops) {
|
|
pcxl_dma_start = (unsigned long)SET_MAP_OFFSET(MAP_START);
|
|
pcxl_dma_start = (unsigned long)SET_MAP_OFFSET(MAP_START);
|
|
- vmalloc_start = SET_MAP_OFFSET(pcxl_dma_start + PCXL_DMA_MAP_SIZE);
|
|
|
|
|
|
+ parisc_vmalloc_start = SET_MAP_OFFSET(pcxl_dma_start
|
|
|
|
+ + PCXL_DMA_MAP_SIZE);
|
|
} else {
|
|
} else {
|
|
pcxl_dma_start = 0;
|
|
pcxl_dma_start = 0;
|
|
- vmalloc_start = SET_MAP_OFFSET(MAP_START);
|
|
|
|
|
|
+ parisc_vmalloc_start = SET_MAP_OFFSET(MAP_START);
|
|
}
|
|
}
|
|
#else
|
|
#else
|
|
- vmalloc_start = SET_MAP_OFFSET(MAP_START);
|
|
|
|
|
|
+ parisc_vmalloc_start = SET_MAP_OFFSET(MAP_START);
|
|
#endif
|
|
#endif
|
|
|
|
|
|
printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, %dk init)\n",
|
|
printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, %dk init)\n",
|