Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761939AbXINCyS (ORCPT ); Thu, 13 Sep 2007 22:54:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752003AbXINCyH (ORCPT ); Thu, 13 Sep 2007 22:54:07 -0400 Received: from TYO202.gate.nec.co.jp ([202.32.8.206]:52540 "EHLO tyo202.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752156AbXINCyG (ORCPT ); Thu, 13 Sep 2007 22:54:06 -0400 Message-Id: <46E9F7C1.3050004@mxs.nes.nec.co.jp> Date: Fri, 14 Sep 2007 11:53:53 +0900 From: "Ken'ichi Ohmichi" User-Agent: Thunderbird 2.0.0.6 (Windows/20070728) MIME-Version: 1.0 To: Andrew Morton CC: Adrian Bunk , kexec-ml , lkml Subject: [PATCH 1/4] [-mm patch] Cleanup the coding style according to Andrew's comments References: <46E9F6A9.8060500@mxs.nes.nec.co.jp> In-Reply-To: <46E9F6A9.8060500@mxs.nes.nec.co.jp> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4146 Lines: 111 [1/4] Cleanup the coding style according to Andrew's comments: http://lists.infradead.org/pipermail/kexec/2007-August/000522.html - vmcoreinfo_append_str() should have suitable __attribute__s so that the compiler can check its use. - vmcoreinfo_max_size should have size_t. - Use get_seconds() instead of xtime.tv_sec. - Use init_uts_ns.name.release instead of UTS_RELEASE. Thanks Ken'ichi Ohmichi --- Signed-off-by: Ken'ichi Ohmichi Signed-off-by: Andrew Morton --- diff -rpuN a/include/linux/kexec.h b/include/linux/kexec.h --- a/include/linux/kexec.h 2007-09-10 19:37:59.000000000 +0900 +++ b/include/linux/kexec.h 2007-09-10 23:09:37.000000000 +0900 @@ -123,18 +123,20 @@ int kexec_should_crash(struct task_struc void crash_save_cpu(struct pt_regs *regs, int cpu); void crash_save_vmcoreinfo(void); void arch_crash_save_vmcoreinfo(void); -void vmcoreinfo_append_str(const char *fmt, ...); +void vmcoreinfo_append_str(const char *fmt, ...) + __attribute__ ((format (printf, 1, 2))); unsigned long paddr_vmcoreinfo_note(void); #define SYMBOL(name) \ vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)&name) #define SIZE(name) \ - vmcoreinfo_append_str("SIZE(%s)=%d\n", #name, sizeof(struct name)) + vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \ + (unsigned long)sizeof(struct name)) #define OFFSET(name, field) \ - vmcoreinfo_append_str("OFFSET(%s.%s)=%d\n", #name, #field, \ - &(((struct name *)0)->field)) + vmcoreinfo_append_str("OFFSET(%s.%s)=%lu\n", #name, #field, \ + (unsigned long)&(((struct name *)0)->field)) #define LENGTH(name, value) \ - vmcoreinfo_append_str("LENGTH(%s)=%d\n", #name, value) + vmcoreinfo_append_str("LENGTH(%s)=%lu\n", #name, (unsigned long)value) #define CONFIG(name) \ vmcoreinfo_append_str("CONFIG_%s=y\n", #name) @@ -177,8 +179,8 @@ extern struct resource crashk_res; typedef u32 note_buf_t[KEXEC_NOTE_BYTES/4]; extern note_buf_t *crash_notes; extern u32 vmcoreinfo_note[VMCOREINFO_NOTE_SIZE/4]; -extern unsigned int vmcoreinfo_size; -extern unsigned int vmcoreinfo_max_size; +extern size_t vmcoreinfo_size; +extern size_t vmcoreinfo_max_size; #else /* !CONFIG_KEXEC */ diff -rpuN a/kernel/kexec.c b/kernel/kexec.c --- a/kernel/kexec.c 2007-09-10 19:38:00.000000000 +0900 +++ b/kernel/kexec.c 2007-09-10 23:09:58.000000000 +0900 @@ -38,8 +38,8 @@ note_buf_t* crash_notes; /* vmcoreinfo stuff */ unsigned char vmcoreinfo_data[VMCOREINFO_BYTES]; u32 vmcoreinfo_note[VMCOREINFO_NOTE_SIZE/4]; -unsigned int vmcoreinfo_size = 0; -unsigned int vmcoreinfo_max_size = sizeof(vmcoreinfo_data); +size_t vmcoreinfo_size; +size_t vmcoreinfo_max_size = sizeof(vmcoreinfo_data); /* Location of the reserved area for the crash kernel */ struct resource crashk_res = { @@ -1153,7 +1153,7 @@ void crash_save_vmcoreinfo(void) if (!vmcoreinfo_size) return; - vmcoreinfo_append_str("CRASHTIME=%d", xtime.tv_sec); + vmcoreinfo_append_str("CRASHTIME=%ld", get_seconds()); buf = (u32 *)vmcoreinfo_note; @@ -1195,8 +1195,8 @@ unsigned long __attribute__ ((weak)) pad static int __init crash_save_vmcoreinfo_init(void) { - vmcoreinfo_append_str("OSRELEASE=%s\n", UTS_RELEASE); - vmcoreinfo_append_str("PAGESIZE=%d\n", PAGE_SIZE); + vmcoreinfo_append_str("OSRELEASE=%s\n", init_uts_ns.name.release); + vmcoreinfo_append_str("PAGESIZE=%ld\n", PAGE_SIZE); SYMBOL(init_uts_ns); SYMBOL(node_online_map); diff -rpuN a/kernel/ksysfs.c b/kernel/ksysfs.c --- a/kernel/ksysfs.c 2007-09-10 19:38:00.000000000 +0900 +++ b/kernel/ksysfs.c 2007-09-10 23:09:07.000000000 +0900 @@ -65,7 +65,7 @@ static ssize_t vmcoreinfo_show(struct ks { return sprintf(page, "%lx %x\n", paddr_vmcoreinfo_note(), - vmcoreinfo_max_size); + (unsigned int)vmcoreinfo_max_size); } KERNEL_ATTR_RO(vmcoreinfo); _ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/