Commit 3cde5c8c authored by Andi Kleen's avatar Andi Kleen Committed by H. Peter Anvin

x86, mce: initial steps to make 64bit mce code 32bit clean

Replace unsigned long with u64s if they need to contain 64bit values.
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 01c6680a
...@@ -156,15 +156,15 @@ static void print_mce(struct mce *m) ...@@ -156,15 +156,15 @@ static void print_mce(struct mce *m)
"and contact your hardware vendor\n"); "and contact your hardware vendor\n");
} }
static void mce_panic(char *msg, struct mce *backup, unsigned long start) static void mce_panic(char *msg, struct mce *backup, u64 start)
{ {
int i; int i;
oops_begin(); oops_begin();
for (i = 0; i < MCE_LOG_LEN; i++) { for (i = 0; i < MCE_LOG_LEN; i++) {
unsigned long tsc = mcelog.entry[i].tsc; u64 tsc = mcelog.entry[i].tsc;
if (time_before(tsc, start)) if ((s64)(tsc - start) < 0)
continue; continue;
print_mce(&mcelog.entry[i]); print_mce(&mcelog.entry[i]);
if (backup && mcelog.entry[i].tsc == backup->tsc) if (backup && mcelog.entry[i].tsc == backup->tsc)
...@@ -970,13 +970,13 @@ void (*threshold_cpu_callback)(unsigned long action, unsigned int cpu); ...@@ -970,13 +970,13 @@ void (*threshold_cpu_callback)(unsigned long action, unsigned int cpu);
static ssize_t show_ ## name(struct sys_device *s, \ static ssize_t show_ ## name(struct sys_device *s, \
struct sysdev_attribute *attr, \ struct sysdev_attribute *attr, \
char *buf) { \ char *buf) { \
return sprintf(buf, "%lx\n", (unsigned long)var); \ return sprintf(buf, "%Lx\n", (u64)var); \
} \ } \
static ssize_t set_ ## name(struct sys_device *s, \ static ssize_t set_ ## name(struct sys_device *s, \
struct sysdev_attribute *attr, \ struct sysdev_attribute *attr, \
const char *buf, size_t siz) { \ const char *buf, size_t siz) { \
char *end; \ char *end; \
unsigned long new = simple_strtoul(buf, &end, 0); \ u64 new = simple_strtoull(buf, &end, 0); \
\ \
if (end == buf) \ if (end == buf) \
return -EINVAL; \ return -EINVAL; \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment