kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/arch/m68k/include/asm/atarihw.h
..
..
@@ -32,6 +32,12 @@
32
32
 
33
33
 extern int atari_SCC_reset_done;
34
34
 
35
+extern ssize_t atari_nvram_read(char *, size_t, loff_t *);
36
+extern ssize_t atari_nvram_write(char *, size_t, loff_t *);
37
+extern ssize_t atari_nvram_get_size(void);
38
+extern long atari_nvram_set_checksum(void);
39
+extern long atari_nvram_initialize(void);
40
+
35
41
 /* convenience macros for testing machine type */
36
42
 #define MACH_IS_ST	((atari_mch_cookie >> 16) == ATARI_MCH_ST)
37
43
 #define MACH_IS_STE	((atari_mch_cookie >> 16) == ATARI_MCH_STE && \
..
..
@@ -155,7 +161,7 @@
155
161
 #define TT_HIGH 6
156
162
 
157
163
 #define SHF_BAS (0xffff8200)
158
-struct SHIFTER
164
+struct SHIFTER_ST
159
165
  {
160
166
 	u_char pad1;
161
167
 	u_char bas_hi;
..
..
@@ -172,7 +178,7 @@
172
178
 	u_char pad7;
173
179
 	u_char bas_lo;
174
180
  };
175
-# define shifter ((*(volatile struct SHIFTER *)SHF_BAS))
181
+# define shifter_st ((*(volatile struct SHIFTER_ST *)SHF_BAS))
176
182
 
177
183
 #define SHF_FBAS (0xffff820e)
178
184
 struct SHIFTER_F030