Merge tag 'openrisc-for-linus-v4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 17ce1b201d - Gogs: Go Git Service GfA electronic

Merge tag 'openrisc-for-linus-v4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull openrisc fix from Guenter Roeck:
 "Fix openrisc crash caused by ro_init changes"

* tag 'openrisc-for-linus-v4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  openrisc: Define __ro_after_init to avoid crash

Linus Torvalds 8 years ago

parent

8cebec469b 2c7a5c5c48

commit

17ce1b201d

1 changed files with 2 additions and 0 deletions

Split View Show Diff Stats

						
							+ 2
							
							- 0
						
arch/openrisc/include/asm/cache.h
							 
								View File
							
				@@ -23,6 +23,8 @@
			
				  * they shouldn't be hard-coded!
			
				  */
			
				+#define __ro_after_init __read_mostly
			
				+
			
				 #define L1_CACHE_BYTES 16
			
				 #define L1_CACHE_SHIFT 4