diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2010-05-17 04:00:00 -0400 |
|---|---|---|
| committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2010-05-17 04:00:15 -0400 |
| commit | 94038a99119c171aea27608f81c7ba359de98c4e (patch) | |
| tree | f74a84b289eb256f2b0674efb49640733b003b29 /arch/s390/include/asm | |
| parent | e40152ee1e1c7a63f4777791863215e3faa37a86 (diff) | |
[S390] More cleanup for struct _lowcore
Remove cpu_id from lowcore and replace addr_t with __u64.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/include/asm')
| -rw-r--r-- | arch/s390/include/asm/lowcore.h | 48 |
1 files changed, 23 insertions, 25 deletions
diff --git a/arch/s390/include/asm/lowcore.h b/arch/s390/include/asm/lowcore.h index 05527c040b7a..f7e78c79b8b1 100644 --- a/arch/s390/include/asm/lowcore.h +++ b/arch/s390/include/asm/lowcore.h | |||
| @@ -126,16 +126,15 @@ struct _lowcore { | |||
| 126 | __u32 user_exec_asce; /* 0x02ac */ | 126 | __u32 user_exec_asce; /* 0x02ac */ |
| 127 | 127 | ||
| 128 | /* SMP info area */ | 128 | /* SMP info area */ |
| 129 | struct cpuid cpu_id; /* 0x02b0 */ | 129 | __u32 cpu_nr; /* 0x02b0 */ |
| 130 | __u32 cpu_nr; /* 0x02b8 */ | 130 | __u32 softirq_pending; /* 0x02b4 */ |
| 131 | __u32 softirq_pending; /* 0x02bc */ | 131 | __u32 percpu_offset; /* 0x02b8 */ |
| 132 | __u32 percpu_offset; /* 0x02c0 */ | 132 | __u32 ext_call_fast; /* 0x02bc */ |
| 133 | __u32 ext_call_fast; /* 0x02c4 */ | 133 | __u64 int_clock; /* 0x02c0 */ |
| 134 | __u64 int_clock; /* 0x02c8 */ | 134 | __u64 clock_comparator; /* 0x02c8 */ |
| 135 | __u64 clock_comparator; /* 0x02d0 */ | 135 | __u32 machine_flags; /* 0x02d0 */ |
| 136 | __u32 machine_flags; /* 0x02d8 */ | 136 | __u32 ftrace_func; /* 0x02d4 */ |
| 137 | __u32 ftrace_func; /* 0x02dc */ | 137 | __u8 pad_0x02d8[0x0300-0x02d8]; /* 0x02d8 */ |
| 138 | __u8 pad_0x02e0[0x0300-0x02e0]; /* 0x02e0 */ | ||
| 139 | 138 | ||
| 140 | /* Interrupt response block */ | 139 | /* Interrupt response block */ |
| 141 | __u8 irb[64]; /* 0x0300 */ | 140 | __u8 irb[64]; /* 0x0300 */ |
| @@ -189,14 +188,14 @@ struct _lowcore { | |||
| 189 | __u32 data_exc_code; /* 0x0090 */ | 188 | __u32 data_exc_code; /* 0x0090 */ |
| 190 | __u16 mon_class_num; /* 0x0094 */ | 189 | __u16 mon_class_num; /* 0x0094 */ |
| 191 | __u16 per_perc_atmid; /* 0x0096 */ | 190 | __u16 per_perc_atmid; /* 0x0096 */ |
| 192 | addr_t per_address; /* 0x0098 */ | 191 | __u64 per_address; /* 0x0098 */ |
| 193 | __u8 exc_access_id; /* 0x00a0 */ | 192 | __u8 exc_access_id; /* 0x00a0 */ |
| 194 | __u8 per_access_id; /* 0x00a1 */ | 193 | __u8 per_access_id; /* 0x00a1 */ |
| 195 | __u8 op_access_id; /* 0x00a2 */ | 194 | __u8 op_access_id; /* 0x00a2 */ |
| 196 | __u8 ar_access_id; /* 0x00a3 */ | 195 | __u8 ar_access_id; /* 0x00a3 */ |
| 197 | __u8 pad_0x00a4[0x00a8-0x00a4]; /* 0x00a4 */ | 196 | __u8 pad_0x00a4[0x00a8-0x00a4]; /* 0x00a4 */ |
| 198 | addr_t trans_exc_code; /* 0x00a8 */ | 197 | __u64 trans_exc_code; /* 0x00a8 */ |
| 199 | addr_t monitor_code; /* 0x00b0 */ | 198 | __u64 monitor_code; /* 0x00b0 */ |
| 200 | __u16 subchannel_id; /* 0x00b8 */ | 199 | __u16 subchannel_id; /* 0x00b8 */ |
| 201 | __u16 subchannel_nr; /* 0x00ba */ | 200 | __u16 subchannel_nr; /* 0x00ba */ |
| 202 | __u32 io_int_parm; /* 0x00bc */ | 201 | __u32 io_int_parm; /* 0x00bc */ |
| @@ -207,7 +206,7 @@ struct _lowcore { | |||
| 207 | __u32 mcck_interruption_code[2]; /* 0x00e8 */ | 206 | __u32 mcck_interruption_code[2]; /* 0x00e8 */ |
| 208 | __u8 pad_0x00f0[0x00f4-0x00f0]; /* 0x00f0 */ | 207 | __u8 pad_0x00f0[0x00f4-0x00f0]; /* 0x00f0 */ |
| 209 | __u32 external_damage_code; /* 0x00f4 */ | 208 | __u32 external_damage_code; /* 0x00f4 */ |
| 210 | addr_t failing_storage_address; /* 0x00f8 */ | 209 | __u64 failing_storage_address; /* 0x00f8 */ |
| 211 | __u8 pad_0x0100[0x0110-0x0100]; /* 0x0100 */ | 210 | __u8 pad_0x0100[0x0110-0x0100]; /* 0x0100 */ |
| 212 | __u64 breaking_event_addr; /* 0x0110 */ | 211 | __u64 breaking_event_addr; /* 0x0110 */ |
| 213 | __u8 pad_0x0118[0x0120-0x0118]; /* 0x0118 */ | 212 | __u8 pad_0x0118[0x0120-0x0118]; /* 0x0118 */ |
| @@ -255,17 +254,16 @@ struct _lowcore { | |||
| 255 | __u64 user_exec_asce; /* 0x0318 */ | 254 | __u64 user_exec_asce; /* 0x0318 */ |
| 256 | 255 | ||
| 257 | /* SMP info area */ | 256 | /* SMP info area */ |
| 258 | struct cpuid cpu_id; /* 0x0320 */ | 257 | __u32 cpu_nr; /* 0x0320 */ |
| 259 | __u32 cpu_nr; /* 0x0328 */ | 258 | __u32 softirq_pending; /* 0x0324 */ |
| 260 | __u32 softirq_pending; /* 0x032c */ | 259 | __u64 percpu_offset; /* 0x0328 */ |
| 261 | __u64 percpu_offset; /* 0x0330 */ | 260 | __u64 ext_call_fast; /* 0x0330 */ |
| 262 | __u64 ext_call_fast; /* 0x0338 */ | 261 | __u64 int_clock; /* 0x0338 */ |
| 263 | __u64 int_clock; /* 0x0340 */ | 262 | __u64 clock_comparator; /* 0x0340 */ |
| 264 | __u64 clock_comparator; /* 0x0348 */ | 263 | __u64 vdso_per_cpu_data; /* 0x0348 */ |
| 265 | __u64 vdso_per_cpu_data; /* 0x0350 */ | 264 | __u64 machine_flags; /* 0x0350 */ |
| 266 | __u64 machine_flags; /* 0x0358 */ | 265 | __u64 ftrace_func; /* 0x0358 */ |
| 267 | __u64 ftrace_func; /* 0x0360 */ | 266 | __u8 pad_0x0368[0x0380-0x0360]; /* 0x0360 */ |
| 268 | __u8 pad_0x0368[0x0380-0x0368]; /* 0x0368 */ | ||
| 269 | 267 | ||
| 270 | /* Interrupt response block. */ | 268 | /* Interrupt response block. */ |
| 271 | __u8 irb[64]; /* 0x0380 */ | 269 | __u8 irb[64]; /* 0x0380 */ |