mirror of
				git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
				synced 2025-11-01 09:13:37 +00:00 
			
		
		
		
	arch/tile: tolerate disabling CONFIG_BLK_DEV_INITRD
The code accidentally was relying on this configuration option being selected. Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
This commit is contained in:
		
							parent
							
								
									229f4df1fb
								
							
						
					
					
						commit
						43d9ebba93
					
				
					 1 changed files with 6 additions and 0 deletions
				
			
		| 
						 | 
				
			
			@ -912,6 +912,8 @@ void __cpuinit setup_cpu(int boot)
 | 
			
		|||
#endif
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#ifdef CONFIG_BLK_DEV_INITRD
 | 
			
		||||
 | 
			
		||||
static int __initdata set_initramfs_file;
 | 
			
		||||
static char __initdata initramfs_file[128] = "initramfs.cpio.gz";
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -969,6 +971,10 @@ void __init free_initrd_mem(unsigned long begin, unsigned long end)
 | 
			
		|||
	free_bootmem(__pa(begin), end - begin);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#else
 | 
			
		||||
static inline void load_hv_initrd(void) {}
 | 
			
		||||
#endif /* CONFIG_BLK_DEV_INITRD */
 | 
			
		||||
 | 
			
		||||
static void __init validate_hv(void)
 | 
			
		||||
{
 | 
			
		||||
	/*
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue