diff options
Diffstat (limited to 'include/asm-mips/sn/kldir.h')
-rw-r--r-- | include/asm-mips/sn/kldir.h | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/include/asm-mips/sn/kldir.h b/include/asm-mips/sn/kldir.h index f0efab1672ec..fa40e6794f82 100644 --- a/include/asm-mips/sn/kldir.h +++ b/include/asm-mips/sn/kldir.h | |||
@@ -13,10 +13,6 @@ | |||
13 | 13 | ||
14 | #include <linux/config.h> | 14 | #include <linux/config.h> |
15 | 15 | ||
16 | #if defined(CONFIG_SGI_IO) | ||
17 | #include <asm/hack.h> | ||
18 | #endif | ||
19 | |||
20 | /* | 16 | /* |
21 | * The kldir memory area resides at a fixed place in each node's memory and | 17 | * The kldir memory area resides at a fixed place in each node's memory and |
22 | * provides pointers to most other IP27 memory areas. This allows us to | 18 | * provides pointers to most other IP27 memory areas. This allows us to |
@@ -136,8 +132,6 @@ | |||
136 | #define KLDIR_OFF_STRIDE 0x28 | 132 | #define KLDIR_OFF_STRIDE 0x28 |
137 | #endif /* __ASSEMBLY__ */ | 133 | #endif /* __ASSEMBLY__ */ |
138 | 134 | ||
139 | #if !defined(CONFIG_SGI_IO) | ||
140 | |||
141 | /* | 135 | /* |
142 | * This is defined here because IP27_SYMMON_STK_SIZE must be at least what | 136 | * This is defined here because IP27_SYMMON_STK_SIZE must be at least what |
143 | * we define here. Since it's set up in the prom. We can't redefine it later | 137 | * we define here. Since it's set up in the prom. We can't redefine it later |
@@ -207,17 +201,11 @@ | |||
207 | #define KLDIR_ENT_SIZE 0x40 | 201 | #define KLDIR_ENT_SIZE 0x40 |
208 | #define KLDIR_MAX_ENTRIES (0x400 / 0x40) | 202 | #define KLDIR_MAX_ENTRIES (0x400 / 0x40) |
209 | 203 | ||
210 | #endif /* !CONFIG_SGI_IO */ | ||
211 | |||
212 | #ifndef __ASSEMBLY__ | 204 | #ifndef __ASSEMBLY__ |
213 | typedef struct kldir_ent_s { | 205 | typedef struct kldir_ent_s { |
214 | u64 magic; /* Indicates validity of entry */ | 206 | u64 magic; /* Indicates validity of entry */ |
215 | off_t offset; /* Offset from start of node space */ | 207 | off_t offset; /* Offset from start of node space */ |
216 | #if defined(CONFIG_SGI_IO) /* FIXME */ | ||
217 | __psunsigned_t pointer; /* Pointer to area in some cases */ | ||
218 | #else | ||
219 | unsigned long pointer; /* Pointer to area in some cases */ | 208 | unsigned long pointer; /* Pointer to area in some cases */ |
220 | #endif | ||
221 | size_t size; /* Size in bytes */ | 209 | size_t size; /* Size in bytes */ |
222 | u64 count; /* Repeat count if array, 1 if not */ | 210 | u64 count; /* Repeat count if array, 1 if not */ |
223 | size_t stride; /* Stride if array, 0 if not */ | 211 | size_t stride; /* Stride if array, 0 if not */ |
@@ -227,22 +215,4 @@ typedef struct kldir_ent_s { | |||
227 | } kldir_ent_t; | 215 | } kldir_ent_t; |
228 | #endif /* !__ASSEMBLY__ */ | 216 | #endif /* !__ASSEMBLY__ */ |
229 | 217 | ||
230 | #if defined(CONFIG_SGI_IO) | ||
231 | |||
232 | #define KLDIR_ENT_SIZE 0x40 | ||
233 | #define KLDIR_MAX_ENTRIES (0x400 / 0x40) | ||
234 | |||
235 | /* | ||
236 | * The actual offsets of each memory area are machine-dependent | ||
237 | */ | ||
238 | #ifdef CONFIG_SGI_IP27 | ||
239 | // Not yet #include <asm/sn/sn0/kldir.h> | ||
240 | #elif defined(CONFIG_SGI_IP35) | ||
241 | #include <asm/sn/sn1/kldir.h> | ||
242 | #else | ||
243 | #error "kldir.h is currently defined for IP27 and IP35 platforms only" | ||
244 | #endif | ||
245 | |||
246 | #endif /* CONFIG_SGI_IO */ | ||
247 | |||
248 | #endif /* _ASM_SN_KLDIR_H */ | 218 | #endif /* _ASM_SN_KLDIR_H */ |