From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Sergei Trofimovich <slyfox@gentoo.org>,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH 5.11 32/45] ia64: fix format strings for err_inject
Date: Fri, 9 Apr 2021 11:53:58 +0200 [thread overview]
Message-ID: <20210409095306.450179408@linuxfoundation.org> (raw)
In-Reply-To: <20210409095305.397149021@linuxfoundation.org>
From: Sergei Trofimovich <slyfox@gentoo.org>
[ 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: Sergei Trofimovich <slyfox@gentoo.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/ia64/kernel/err_inject.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/arch/ia64/kernel/err_inject.c b/arch/ia64/kernel/err_inject.c
index 8b5b8e6bc9d9..dd5bfed52031 100644
--- a/arch/ia64/kernel/err_inject.c
+++ b/arch/ia64/kernel/err_inject.c
@@ -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);
--
2.30.2
next prev parent reply other threads:[~2021-04-09 10:13 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-09 9:53 [PATCH 5.11 00/45] 5.11.13-rc1 review Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 01/45] ARM: dts: am33xx: add aliases for mmc interfaces Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 02/45] bus: ti-sysc: Fix warning on unbind if reset is not deasserted Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 03/45] drm/msm: a6xx: Make sure the SQE microcode is safe Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 04/45] platform/x86: intel-hid: Support Lenovo ThinkPad X1 Tablet Gen 2 Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 05/45] bpf, x86: Use kvmalloc_array instead kmalloc_array in bpf_jit_comp Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 06/45] net/mlx5e: Enforce minimum value check for ICOSQ size Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 07/45] net: pxa168_eth: Fix a potential data race in pxa168_eth_remove Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 08/45] kunit: tool: Fix a python tuple typing error Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 09/45] mISDN: fix crash in fritzpci Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 10/45] net: arcnet: com20020 fix error handling Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 11/45] can: kvaser_usb: Add support for USBcan Pro 4xHS Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 12/45] mac80211: Check crypto_aead_encrypt for errors Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 13/45] mac80211: choose first enabled channel for monitor Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 14/45] drm/msm/dsi_pll_7nm: Fix variable usage for pll_lockdet_rate Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 15/45] drm/msm/adreno: a5xx_power: Dont apply A540 lm_setup to other GPUs Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 16/45] drm/msm: Ratelimit invalid-fence message Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 17/45] netfilter: conntrack: Fix gre tunneling over ipv6 Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 18/45] netfilter: nftables: skip hook overlap logic if flowtable is stale Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 19/45] net: ipa: fix init header command validation Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 20/45] platform/x86: thinkpad_acpi: Allow the FnLock LED to change state Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 21/45] kselftest/arm64: sve: Do not use non-canonical FFR register value Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 22/45] drm/msm/disp/dpu1: icc path needs to be set before dpu runtime resume Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 23/45] x86/build: Turn off -fcf-protection for realmode targets Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 24/45] block: clear GD_NEED_PART_SCAN later in bdev_disk_changed Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 25/45] platform/x86: intel_pmt_class: Initial resource to 0 Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 26/45] platform/x86: intel_pmc_core: Ignore GBE LTR on Tiger Lake platforms Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 27/45] ptp_qoriq: fix overflow in ptp_qoriq_adjfine() u64 calcalation Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 28/45] scsi: target: pscsi: Clean up after failure in pscsi_map_sg() Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 29/45] arm64: kernel: disable CNP on Carmel Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 30/45] selftests/vm: fix out-of-tree build Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.11 31/45] ia64: mca: allocate early mca with GFP_ATOMIC Greg Kroah-Hartman
2021-04-09 9:53 ` Greg Kroah-Hartman [this message]
2021-04-09 9:53 ` [PATCH 5.11 33/45] cifs: revalidate mapping when we open files for SMB1 POSIX Greg Kroah-Hartman
2021-04-09 9:54 ` [PATCH 5.11 34/45] cifs: Silently ignore unknown oplock break handle Greg Kroah-Hartman
2021-04-09 9:54 ` [PATCH 5.11 35/45] io_uring: fix timeout cancel return code Greg Kroah-Hartman
2021-04-09 9:54 ` [PATCH 5.11 36/45] math: Export mul_u64_u64_div_u64 Greg Kroah-Hartman
2021-04-09 9:54 ` [PATCH 5.11 37/45] tools/resolve_btfids: Build libbpf and libsubcmd in separate directories Greg Kroah-Hartman
2021-04-09 9:54 ` [PATCH 5.11 38/45] tools/resolve_btfids: Check objects before removing Greg Kroah-Hartman
2021-04-09 9:54 ` [PATCH 5.11 39/45] tools/resolve_btfids: Set srctree variable unconditionally Greg Kroah-Hartman
2021-04-09 9:54 ` [PATCH 5.11 40/45] kbuild: Add resolve_btfids clean to root clean target Greg Kroah-Hartman
2021-04-09 9:54 ` [PATCH 5.11 41/45] kbuild: Do not clean resolve_btfids if the output does not exist Greg Kroah-Hartman
2021-04-09 9:54 ` [PATCH 5.11 42/45] tools/resolve_btfids: Add /libbpf to .gitignore Greg Kroah-Hartman
2021-04-09 9:54 ` [PATCH 5.11 43/45] bpf, x86: Validate computation of branch displacements for x86-64 Greg Kroah-Hartman
2021-04-09 9:54 ` [PATCH 5.11 44/45] bpf, x86: Validate computation of branch displacements for x86-32 Greg Kroah-Hartman
2021-04-09 9:54 ` [PATCH 5.11 45/45] init/Kconfig: make COMPILE_TEST depend on HAS_IOMEM Greg Kroah-Hartman
2021-04-09 20:14 ` [PATCH 5.11 00/45] 5.11.13-rc1 review Guenter Roeck
2021-04-09 20:38 ` Shuah Khan
2021-04-10 6:26 ` Naresh Kamboju
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210409095306.450179408@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sashal@kernel.org \
--cc=slyfox@gentoo.org \
--cc=stable@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).