From 686c5fba5a4e2e27bf569c980289e15e9a1a59ed Mon Sep 17 00:00:00 2001 From: Shuah Khan Date: Sun, 20 May 2012 17:24:28 -0600 Subject: [PATCH] --- yaml --- r: 305412 b: refs/heads/master c: 74bc491795420254f8b9c782ec654c9ba005d3ac h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/pci-calgary_64.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8edc5e6a2f04..12cb52734fc0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab7b64e9ee1e930ffe9d7f5b5eebe618a3b3a03b +refs/heads/master: 74bc491795420254f8b9c782ec654c9ba005d3ac diff --git a/trunk/arch/x86/kernel/pci-calgary_64.c b/trunk/arch/x86/kernel/pci-calgary_64.c index 6ac5782f4d6b..dbbfb261e62c 100644 --- a/trunk/arch/x86/kernel/pci-calgary_64.c +++ b/trunk/arch/x86/kernel/pci-calgary_64.c @@ -1479,8 +1479,9 @@ int __init detect_calgary(void) static int __init calgary_parse_options(char *p) { unsigned int bridge; + unsigned long val; size_t len; - char* endp; + ssize_t ret; while (*p) { if (!strncmp(p, "64k", 3)) @@ -1511,10 +1512,11 @@ static int __init calgary_parse_options(char *p) ++p; if (*p == '\0') break; - bridge = simple_strtoul(p, &endp, 0); - if (p == endp) + ret = kstrtoul(p, 0, &val); + if (ret) break; + bridge = val; if (bridge < MAX_PHB_BUS_NUM) { printk(KERN_INFO "Calgary: disabling " "translation for PHB %#x\n", bridge);