adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

parisc: rename parisc's vmalloc_start to parisc_vmalloc_start

Browse source 
building kernel 2.6.32(pre), gives this compiler warning:
/linus-linux-2.6/mm/vmalloc.c: In function 'pcpu_get_vm_areas':
/linus-linux-2.6/mm/vmalloc.c:2104: warning: 'vmalloc_start' is used
uninitialized in this function

The reason is, that the code in mm/vmalloc defines a local variable called
vmalloc_start, which is already defined as global variable in parisc's code.

To avoid this kind of problems in future, I suggest to rename the parisc
variable
to parisc_vmalloc_start.

Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
This commit is contained in:
Helge Deller 2009-09-27 23:26:01 -04:00 committed by Kyle McMartin
parent b882877082
commit 4255f0d2a1
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/parisc/include/asm/fixmap.h
View file

@ -21,9 +21,9 @@
#define KERNEL_MAP_END (TMPALIAS_MAP_START) #define KERNEL_MAP_END (TMPALIAS_MAP_START)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
extern void *vmalloc_start; extern void *parisc_vmalloc_start;
#define PCXL_DMA_MAP_SIZE (8*1024*1024) #define PCXL_DMA_MAP_SIZE (8*1024*1024)
#define VMALLOC_START ((unsigned long)vmalloc_start) #define VMALLOC_START ((unsigned long)parisc_vmalloc_start)
#define VMALLOC_END (KERNEL_MAP_END) #define VMALLOC_END (KERNEL_MAP_END)
#endif /*__ASSEMBLY__*/ #endif /*__ASSEMBLY__*/

11
arch/parisc/mm/init.c
View file

@ -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; void *parisc_vmalloc_start __read_mostly;
EXPORT_SYMBOL(vmalloc_start); 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",