Skip to content

Commit 95d44a4

Browse files
Sergei Trofimovichtorvalds
authored andcommitted
ia64: fix format strings for err_inject
Fix warning with %lx / u64 mismatch: arch/ia64/kernel/err_inject.c: In function 'show_resources': arch/ia64/kernel/err_inject.c:62:22: warning: format '%lx' expects argument of type 'long unsigned int', but argument 3 has type 'u64' {aka 'long long unsigned int'} 62 | return sprintf(buf, "%lx", name[cpu]); \ | ^~~~~~~ Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Sergei Trofimovich <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent f2a419c commit 95d44a4

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

arch/ia64/kernel/err_inject.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ show_##name(struct device *dev, struct device_attribute *attr, \
5959
char *buf) \
6060
{ \
6161
u32 cpu=dev->id; \
62-
return sprintf(buf, "%lx\n", name[cpu]); \
62+
return sprintf(buf, "%llx\n", name[cpu]); \
6363
}
6464

6565
#define store(name) \
@@ -86,9 +86,9 @@ store_call_start(struct device *dev, struct device_attribute *attr,
8686

8787
#ifdef ERR_INJ_DEBUG
8888
printk(KERN_DEBUG "pal_mc_err_inject for cpu%d:\n", cpu);
89-
printk(KERN_DEBUG "err_type_info=%lx,\n", err_type_info[cpu]);
90-
printk(KERN_DEBUG "err_struct_info=%lx,\n", err_struct_info[cpu]);
91-
printk(KERN_DEBUG "err_data_buffer=%lx, %lx, %lx.\n",
89+
printk(KERN_DEBUG "err_type_info=%llx,\n", err_type_info[cpu]);
90+
printk(KERN_DEBUG "err_struct_info=%llx,\n", err_struct_info[cpu]);
91+
printk(KERN_DEBUG "err_data_buffer=%llx, %llx, %llx.\n",
9292
err_data_buffer[cpu].data1,
9393
err_data_buffer[cpu].data2,
9494
err_data_buffer[cpu].data3);
@@ -117,8 +117,8 @@ store_call_start(struct device *dev, struct device_attribute *attr,
117117

118118
#ifdef ERR_INJ_DEBUG
119119
printk(KERN_DEBUG "Returns: status=%d,\n", (int)status[cpu]);
120-
printk(KERN_DEBUG "capabilities=%lx,\n", capabilities[cpu]);
121-
printk(KERN_DEBUG "resources=%lx\n", resources[cpu]);
120+
printk(KERN_DEBUG "capabilities=%llx,\n", capabilities[cpu]);
121+
printk(KERN_DEBUG "resources=%llx\n", resources[cpu]);
122122
#endif
123123
return size;
124124
}
@@ -131,7 +131,7 @@ show_virtual_to_phys(struct device *dev, struct device_attribute *attr,
131131
char *buf)
132132
{
133133
unsigned int cpu=dev->id;
134-
return sprintf(buf, "%lx\n", phys_addr[cpu]);
134+
return sprintf(buf, "%llx\n", phys_addr[cpu]);
135135
}
136136

137137
static ssize_t
@@ -145,7 +145,7 @@ store_virtual_to_phys(struct device *dev, struct device_attribute *attr,
145145
ret = get_user_pages_fast(virt_addr, 1, FOLL_WRITE, NULL);
146146
if (ret<=0) {
147147
#ifdef ERR_INJ_DEBUG
148-
printk("Virtual address %lx is not existing.\n",virt_addr);
148+
printk("Virtual address %llx is not existing.\n", virt_addr);
149149
#endif
150150
return -EINVAL;
151151
}
@@ -163,7 +163,7 @@ show_err_data_buffer(struct device *dev,
163163
{
164164
unsigned int cpu=dev->id;
165165

166-
return sprintf(buf, "%lx, %lx, %lx\n",
166+
return sprintf(buf, "%llx, %llx, %llx\n",
167167
err_data_buffer[cpu].data1,
168168
err_data_buffer[cpu].data2,
169169
err_data_buffer[cpu].data3);
@@ -178,13 +178,13 @@ store_err_data_buffer(struct device *dev,
178178
int ret;
179179

180180
#ifdef ERR_INJ_DEBUG
181-
printk("write err_data_buffer=[%lx,%lx,%lx] on cpu%d\n",
181+
printk("write err_data_buffer=[%llx,%llx,%llx] on cpu%d\n",
182182
err_data_buffer[cpu].data1,
183183
err_data_buffer[cpu].data2,
184184
err_data_buffer[cpu].data3,
185185
cpu);
186186
#endif
187-
ret=sscanf(buf, "%lx, %lx, %lx",
187+
ret = sscanf(buf, "%llx, %llx, %llx",
188188
&err_data_buffer[cpu].data1,
189189
&err_data_buffer[cpu].data2,
190190
&err_data_buffer[cpu].data3);

0 commit comments

Comments
 (0)