mirror of https://github.com/OpenIPC/firmware.git
				
				
				
			Fix building issues on newer toolchains for GM8136
							parent
							
								
									8910775b92
								
							
						
					
					
						commit
						1ddc13a492
					
				|  | @ -912,7 +912,7 @@ CONFIG_SERIO_SERPORT=y | |||
| # | ||||
| # CONFIG_VT is not set | ||||
| CONFIG_UNIX98_PTYS=y | ||||
| # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||||
| CONFIG_DEVPTS_MULTIPLE_INSTANCES=y | ||||
| # CONFIG_LEGACY_PTYS is not set | ||||
| # CONFIG_SERIAL_NONSTANDARD is not set | ||||
| # CONFIG_N_GSM is not set | ||||
|  | @ -1600,7 +1600,7 @@ CONFIG_HAVE_ARCH_KGDB=y | |||
| # CONFIG_KGDB is not set | ||||
| # CONFIG_TEST_KSTRTOX is not set | ||||
| # CONFIG_STRICT_DEVMEM is not set | ||||
| # CONFIG_ARM_UNWIND is not set | ||||
| CONFIG_ARM_UNWIND=y | ||||
| CONFIG_DEBUG_USER=y | ||||
| # CONFIG_DEBUG_LL is not set | ||||
| 
 | ||||
|  |  | |||
|  | @ -0,0 +1,29 @@ | |||
| diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
 | ||||
| index f89515adac6..2bb8cac28b9 100644
 | ||||
| --- a/arch/arm/include/asm/ftrace.h
 | ||||
| +++ b/arch/arm/include/asm/ftrace.h
 | ||||
| @@ -45,7 +45,7 @@ void *return_address(unsigned int);
 | ||||
|   | ||||
|  #else | ||||
|   | ||||
| -extern inline void *return_address(unsigned int level)
 | ||||
| +static inline void *return_address(unsigned int level)
 | ||||
|  { | ||||
|  	return NULL; | ||||
|  } | ||||
| diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
 | ||||
| index 2f8f523cece..a3b587ffc14 100755
 | ||||
| --- a/arch/arm/kernel/return_address.c
 | ||||
| +++ b/arch/arm/kernel/return_address.c
 | ||||
| @@ -63,11 +63,6 @@ void *return_address(unsigned int level)
 | ||||
|  //#warning "TODO: return_address should use unwind tables" | ||||
|  //#endif | ||||
|   | ||||
| -void *return_address(unsigned int level)
 | ||||
| -{
 | ||||
| -	return NULL;
 | ||||
| -}
 | ||||
| -
 | ||||
|  #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */ | ||||
|   | ||||
|  EXPORT_SYMBOL_GPL(return_address); | ||||
		Loading…
	
		Reference in New Issue