diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-18 18:33:38 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-28 01:15:51 -0500 |
commit | 802bdea875ed8c682bb30f71d762ce727ab8bb87 (patch) | |
tree | 029254a331653eeb5f75788621df927487d0dba4 /arch/powerpc/platforms | |
parent | 6469c92e0a4879e57bccbbacb2b724672a4fa8fb (diff) |
powerpc: Printing fix for l64 to ll64 conversion: phyp_dump.c
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r-- | arch/powerpc/platforms/pseries/phyp_dump.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/arch/powerpc/platforms/pseries/phyp_dump.c b/arch/powerpc/platforms/pseries/phyp_dump.c index 6cf35cd8d0b5..15eb6107bcd2 100644 --- a/arch/powerpc/platforms/pseries/phyp_dump.c +++ b/arch/powerpc/platforms/pseries/phyp_dump.c | |||
@@ -144,8 +144,8 @@ static void print_dump_header(const struct phyp_dump_header *ph) | |||
144 | ph->first_offset_section); | 144 | ph->first_offset_section); |
145 | printk(KERN_INFO "dump disk sections should be zero\n"); | 145 | printk(KERN_INFO "dump disk sections should be zero\n"); |
146 | printk(KERN_INFO "dump disk section = %d\n", ph->dump_disk_section); | 146 | printk(KERN_INFO "dump disk section = %d\n", ph->dump_disk_section); |
147 | printk(KERN_INFO "block num = %ld\n", ph->block_num_dd); | 147 | printk(KERN_INFO "block num = %lld\n", ph->block_num_dd); |
148 | printk(KERN_INFO "number of blocks = %ld\n", ph->num_of_blocks_dd); | 148 | printk(KERN_INFO "number of blocks = %lld\n", ph->num_of_blocks_dd); |
149 | printk(KERN_INFO "dump disk offset = %d\n", ph->offset_dd); | 149 | printk(KERN_INFO "dump disk offset = %d\n", ph->offset_dd); |
150 | printk(KERN_INFO "Max auto time= %d\n", ph->maxtime_to_auto); | 150 | printk(KERN_INFO "Max auto time= %d\n", ph->maxtime_to_auto); |
151 | 151 | ||
@@ -154,33 +154,33 @@ static void print_dump_header(const struct phyp_dump_header *ph) | |||
154 | printk(KERN_INFO "cpu dump_flags =%d\n", ph->cpu_data.dump_flags); | 154 | printk(KERN_INFO "cpu dump_flags =%d\n", ph->cpu_data.dump_flags); |
155 | printk(KERN_INFO "cpu source_type =%d\n", ph->cpu_data.source_type); | 155 | printk(KERN_INFO "cpu source_type =%d\n", ph->cpu_data.source_type); |
156 | printk(KERN_INFO "cpu error_flags =%d\n", ph->cpu_data.error_flags); | 156 | printk(KERN_INFO "cpu error_flags =%d\n", ph->cpu_data.error_flags); |
157 | printk(KERN_INFO "cpu source_address =%lx\n", | 157 | printk(KERN_INFO "cpu source_address =%llx\n", |
158 | ph->cpu_data.source_address); | 158 | ph->cpu_data.source_address); |
159 | printk(KERN_INFO "cpu source_length =%lx\n", | 159 | printk(KERN_INFO "cpu source_length =%llx\n", |
160 | ph->cpu_data.source_length); | 160 | ph->cpu_data.source_length); |
161 | printk(KERN_INFO "cpu length_copied =%lx\n", | 161 | printk(KERN_INFO "cpu length_copied =%llx\n", |
162 | ph->cpu_data.length_copied); | 162 | ph->cpu_data.length_copied); |
163 | 163 | ||
164 | printk(KERN_INFO " HPTE AREA \n"); | 164 | printk(KERN_INFO " HPTE AREA \n"); |
165 | printk(KERN_INFO "HPTE dump_flags =%d\n", ph->hpte_data.dump_flags); | 165 | printk(KERN_INFO "HPTE dump_flags =%d\n", ph->hpte_data.dump_flags); |
166 | printk(KERN_INFO "HPTE source_type =%d\n", ph->hpte_data.source_type); | 166 | printk(KERN_INFO "HPTE source_type =%d\n", ph->hpte_data.source_type); |
167 | printk(KERN_INFO "HPTE error_flags =%d\n", ph->hpte_data.error_flags); | 167 | printk(KERN_INFO "HPTE error_flags =%d\n", ph->hpte_data.error_flags); |
168 | printk(KERN_INFO "HPTE source_address =%lx\n", | 168 | printk(KERN_INFO "HPTE source_address =%llx\n", |
169 | ph->hpte_data.source_address); | 169 | ph->hpte_data.source_address); |
170 | printk(KERN_INFO "HPTE source_length =%lx\n", | 170 | printk(KERN_INFO "HPTE source_length =%llx\n", |
171 | ph->hpte_data.source_length); | 171 | ph->hpte_data.source_length); |
172 | printk(KERN_INFO "HPTE length_copied =%lx\n", | 172 | printk(KERN_INFO "HPTE length_copied =%llx\n", |
173 | ph->hpte_data.length_copied); | 173 | ph->hpte_data.length_copied); |
174 | 174 | ||
175 | printk(KERN_INFO " SRSD AREA \n"); | 175 | printk(KERN_INFO " SRSD AREA \n"); |
176 | printk(KERN_INFO "SRSD dump_flags =%d\n", ph->kernel_data.dump_flags); | 176 | printk(KERN_INFO "SRSD dump_flags =%d\n", ph->kernel_data.dump_flags); |
177 | printk(KERN_INFO "SRSD source_type =%d\n", ph->kernel_data.source_type); | 177 | printk(KERN_INFO "SRSD source_type =%d\n", ph->kernel_data.source_type); |
178 | printk(KERN_INFO "SRSD error_flags =%d\n", ph->kernel_data.error_flags); | 178 | printk(KERN_INFO "SRSD error_flags =%d\n", ph->kernel_data.error_flags); |
179 | printk(KERN_INFO "SRSD source_address =%lx\n", | 179 | printk(KERN_INFO "SRSD source_address =%llx\n", |
180 | ph->kernel_data.source_address); | 180 | ph->kernel_data.source_address); |
181 | printk(KERN_INFO "SRSD source_length =%lx\n", | 181 | printk(KERN_INFO "SRSD source_length =%llx\n", |
182 | ph->kernel_data.source_length); | 182 | ph->kernel_data.source_length); |
183 | printk(KERN_INFO "SRSD length_copied =%lx\n", | 183 | printk(KERN_INFO "SRSD length_copied =%llx\n", |
184 | ph->kernel_data.length_copied); | 184 | ph->kernel_data.length_copied); |
185 | #endif | 185 | #endif |
186 | } | 186 | } |
@@ -367,8 +367,8 @@ static ssize_t show_release_region(struct kobject *kobj, | |||
367 | /* total reserved size - start of scratch area */ | 367 | /* total reserved size - start of scratch area */ |
368 | second_addr_range = phyp_dump_info->init_reserve_size - | 368 | second_addr_range = phyp_dump_info->init_reserve_size - |
369 | phyp_dump_info->reserved_scratch_size; | 369 | phyp_dump_info->reserved_scratch_size; |
370 | return sprintf(buf, "CPU:0x%lx-0x%lx: HPTE:0x%lx-0x%lx:" | 370 | return sprintf(buf, "CPU:0x%llx-0x%llx: HPTE:0x%llx-0x%llx:" |
371 | " DUMP:0x%lx-0x%lx, 0x%lx-0x%lx:\n", | 371 | " DUMP:0x%llx-0x%llx, 0x%lx-0x%llx:\n", |
372 | phdr.cpu_data.destination_address, | 372 | phdr.cpu_data.destination_address, |
373 | phdr.cpu_data.length_copied, | 373 | phdr.cpu_data.length_copied, |
374 | phdr.hpte_data.destination_address, | 374 | phdr.hpte_data.destination_address, |