Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f81895a authored by Sergei Trofimovich's avatar Sergei Trofimovich Committed by Greg Kroah-Hartman
Browse files

ia64: fix format strings for err_inject 

[ Upstream commit 95d44a470a6814207d52dd6312203b0f4ef12710 ]

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/20210313104312.1548232-1-slyfox@gentoo.org


Signed-off-by: default avatarSergei Trofimovich <slyfox@gentoo.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent bdd0b85e

arch/ia64/kernel/err_inject.c

+11 −11
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ show_##name(struct device *dev, struct device_attribute *attr, \ 
		char *buf)						\

{									\

	u32 cpu=dev->id;						\

	return sprintf(buf, "%lx\n", name[cpu]);			\

	return sprintf(buf, "%llx\n", name[cpu]);			\

}



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


#ifdef ERR_INJ_DEBUG

	printk(KERN_DEBUG "pal_mc_err_inject for cpu%d:\n", cpu);

	printk(KERN_DEBUG "err_type_info=%lx,\n", err_type_info[cpu]);

	printk(KERN_DEBUG "err_struct_info=%lx,\n", err_struct_info[cpu]);

	printk(KERN_DEBUG "err_data_buffer=%lx, %lx, %lx.\n",

	printk(KERN_DEBUG "err_type_info=%llx,\n", err_type_info[cpu]);

	printk(KERN_DEBUG "err_struct_info=%llx,\n", err_struct_info[cpu]);

	printk(KERN_DEBUG "err_data_buffer=%llx, %llx, %llx.\n",

			  err_data_buffer[cpu].data1,

			  err_data_buffer[cpu].data2,

			  err_data_buffer[cpu].data3);
@@ -117,8 +117,8 @@ store_call_start(struct device *dev, struct device_attribute *attr, 


#ifdef ERR_INJ_DEBUG

	printk(KERN_DEBUG "Returns: status=%d,\n", (int)status[cpu]);

	printk(KERN_DEBUG "capabilities=%lx,\n", capabilities[cpu]);

	printk(KERN_DEBUG "resources=%lx\n", resources[cpu]);

	printk(KERN_DEBUG "capabilities=%llx,\n", capabilities[cpu]);

	printk(KERN_DEBUG "resources=%llx\n", resources[cpu]);

#endif

	return size;

}
@@ -131,7 +131,7 @@ show_virtual_to_phys(struct device *dev, struct device_attribute *attr, 
			char *buf)

{

	unsigned int cpu=dev->id;

	return sprintf(buf, "%lx\n", phys_addr[cpu]);

	return sprintf(buf, "%llx\n", phys_addr[cpu]);

}



static ssize_t
@@ -145,7 +145,7 @@ store_virtual_to_phys(struct device *dev, struct device_attribute *attr, 
	ret = get_user_pages_fast(virt_addr, 1, FOLL_WRITE, NULL);

	if (ret<=0) {

#ifdef ERR_INJ_DEBUG

		printk("Virtual address %lx is not existing.\n",virt_addr);

		printk("Virtual address %llx is not existing.\n", virt_addr);

#endif

		return -EINVAL;

	}
@@ -163,7 +163,7 @@ show_err_data_buffer(struct device *dev, 
{

	unsigned int cpu=dev->id;



	return sprintf(buf, "%lx, %lx, %lx\n",

	return sprintf(buf, "%llx, %llx, %llx\n",

			err_data_buffer[cpu].data1,

			err_data_buffer[cpu].data2,

			err_data_buffer[cpu].data3);
@@ -178,13 +178,13 @@ store_err_data_buffer(struct device *dev, 
	int ret;



#ifdef ERR_INJ_DEBUG

	printk("write err_data_buffer=[%lx,%lx,%lx] on cpu%d\n",

	printk("write err_data_buffer=[%llx,%llx,%llx] on cpu%d\n",

		 err_data_buffer[cpu].data1,

		 err_data_buffer[cpu].data2,

		 err_data_buffer[cpu].data3,

		 cpu);

#endif

	ret=sscanf(buf, "%lx, %lx, %lx",

	ret = sscanf(buf, "%llx, %llx, %llx",

			&err_data_buffer[cpu].data1,

			&err_data_buffer[cpu].data2,

			&err_data_buffer[cpu].data3);