Re: [PATCH 5/4] [-mm patch] Rename macros returning the size.
Hi Satyam,
Satyam Sharma wrote:
> > On Thu, 20 Sep 2007, Ken'ichi Ohmichi wrote:
>> >> [PATCH 5/4] [-mm patch] Rename macros returning the size.
>> >> The #define SIZE() should be renamed STRUCT_SIZE() since it's always
>> >> returning the size of the struct with a given name. This would allow
>> >> TYPEDEF_SIZE() to simply become SIZE() since it need not be used
>> >> exclusively for typedefs. This idea is David Rientjes's.
>> >> http://www.ussg.iu.edu/hypermail/linux/kernel/0709.1/1964.html
>> >>
>> >> Thanks
>> >> Ken'ichi Ohmichi
>> >>
>> >> ---
>> >> Signed-off-by: David Rientjes <[EMAIL PROTECTED]>
> >
> > Hmm, I think adding a s-o-b line for David here isn't quite correct.
> > When someone reviews a patch and gives a suggestion, you only need to
> > copy him on the next iteration (and he may ack it or whatever, if he
> > wants) -- but adding a s-o-b line like that ends up (incorrectly)
> > denoting that he came between the author-to-git-commit chain ...
Thank you for kind explanation.
I can understand s-o-b clearly.
>> >> Signed-off-by: Ken'ichi Ohmichi <[EMAIL PROTECTED]>
> >
>> >> --- a/include/linux/kexec.h 2007-09-18 15:22:19.0 +0900
>> >> +++ b/include/linux/kexec.h 2007-09-18 15:23:22.0 +0900
>> >> @@ -131,10 +131,10 @@ unsigned long paddr_vmcoreinfo_note(void
>> >> vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long))
>> >> #define VMCOREINFO_SIZE(name) \
>> >> vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \
>> >> - (unsigned long)sizeof(struct name))
>> >> -#define VMCOREINFO_TYPEDEF_SIZE(name) \
>> >> - vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \
>> >> (unsigned long)sizeof(name))
>> >> +#define VMCOREINFO_STRUCT_SIZE(name) \
>> >> + vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \
>> >> + (unsigned long)sizeof(struct name))
>> >> #define VMCOREINFO_OFFSET(name, field) \
>> >> vmcoreinfo_append_str("OFFSET(%s.%s)=%lu\n", #name, #field, \
>> >> (unsigned long)&(((struct name *)0)->field))
> >
> > Please use %zu and lose all the ugly (unsigned long) casts here.
That sounds good.
I updated the patch according to your comment.
Thanks
Ken'ichi Ohmichi
---
Signed-off-by: Ken'ichi Ohmichi <[EMAIL PROTECTED]>
Acked-by: David Rientjes <[EMAIL PROTECTED]>
---
diff -rpuN a/arch/ia64/kernel/machine_kexec.c b/arch/ia64/kernel/machine_kexec.c
--- a/arch/ia64/kernel/machine_kexec.c 2007-09-21 09:25:35.0 +0900
+++ b/arch/ia64/kernel/machine_kexec.c 2007-09-21 09:26:13.0 +0900
@@ -137,7 +137,7 @@ void arch_crash_save_vmcoreinfo(void)
VMCOREINFO_SYMBOL(node_memblk);
VMCOREINFO_LENGTH(node_memblk, NR_NODE_MEMBLKS);
- VMCOREINFO_SIZE(node_memblk_s);
+ VMCOREINFO_STRUCT_SIZE(node_memblk_s);
VMCOREINFO_OFFSET(node_memblk_s, start_paddr);
VMCOREINFO_OFFSET(node_memblk_s, size);
#endif
diff -rpuN a/include/linux/kexec.h b/include/linux/kexec.h
--- a/include/linux/kexec.h 2007-09-21 09:25:32.0 +0900
+++ b/include/linux/kexec.h 2007-09-21 09:27:23.0 +0900
@@ -130,11 +130,9 @@ unsigned long paddr_vmcoreinfo_note(void
#define VMCOREINFO_SYMBOL(name) \
vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long))
#define VMCOREINFO_SIZE(name) \
- vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \
- (unsigned long)sizeof(struct name))
-#define VMCOREINFO_TYPEDEF_SIZE(name) \
- vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \
- (unsigned long)sizeof(name))
+ vmcoreinfo_append_str("SIZE(%s)=%zu\n", #name, sizeof(name))
+#define VMCOREINFO_STRUCT_SIZE(name) \
+ vmcoreinfo_append_str("SIZE(%s)=%zu\n", #name, sizeof(struct name))
#define VMCOREINFO_OFFSET(name, field) \
vmcoreinfo_append_str("OFFSET(%s.%s)=%lu\n", #name, #field, \
(unsigned long)&(((struct name *)0)->field))
diff -rpuN a/kernel/kexec.c b/kernel/kexec.c
--- a/kernel/kexec.c2007-09-21 09:25:27.0 +0900
+++ b/kernel/kexec.c2007-09-21 09:26:13.0 +0900
@@ -1210,15 +1210,15 @@ static int __init crash_save_vmcoreinfo_
#ifdef CONFIG_SPARSEMEM
VMCOREINFO_SYMBOL(mem_section);
VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
- VMCOREINFO_SIZE(mem_section);
+ VMCO
Re: [PATCH 5/4] [-mm patch] Rename macros returning the size.
Hi Satyam, Satyam Sharma wrote: On Thu, 20 Sep 2007, Ken'ichi Ohmichi wrote: [PATCH 5/4] [-mm patch] Rename macros returning the size. The #define SIZE() should be renamed STRUCT_SIZE() since it's always returning the size of the struct with a given name. This would allow TYPEDEF_SIZE() to simply become SIZE() since it need not be used exclusively for typedefs. This idea is David Rientjes's. http://www.ussg.iu.edu/hypermail/linux/kernel/0709.1/1964.html Thanks Ken'ichi Ohmichi --- Signed-off-by: David Rientjes [EMAIL PROTECTED] Hmm, I think adding a s-o-b line for David here isn't quite correct. When someone reviews a patch and gives a suggestion, you only need to copy him on the next iteration (and he may ack it or whatever, if he wants) -- but adding a s-o-b line like that ends up (incorrectly) denoting that he came between the author-to-git-commit chain ... Thank you for kind explanation. I can understand s-o-b clearly. Signed-off-by: Ken'ichi Ohmichi [EMAIL PROTECTED] --- a/include/linux/kexec.h 2007-09-18 15:22:19.0 +0900 +++ b/include/linux/kexec.h 2007-09-18 15:23:22.0 +0900 @@ -131,10 +131,10 @@ unsigned long paddr_vmcoreinfo_note(void vmcoreinfo_append_str(SYMBOL(%s)=%lx\n, #name, (unsigned long)name) #define VMCOREINFO_SIZE(name) \ vmcoreinfo_append_str(SIZE(%s)=%lu\n, #name, \ - (unsigned long)sizeof(struct name)) -#define VMCOREINFO_TYPEDEF_SIZE(name) \ - vmcoreinfo_append_str(SIZE(%s)=%lu\n, #name, \ (unsigned long)sizeof(name)) +#define VMCOREINFO_STRUCT_SIZE(name) \ + vmcoreinfo_append_str(SIZE(%s)=%lu\n, #name, \ + (unsigned long)sizeof(struct name)) #define VMCOREINFO_OFFSET(name, field) \ vmcoreinfo_append_str(OFFSET(%s.%s)=%lu\n, #name, #field, \ (unsigned long)(((struct name *)0)-field)) Please use %zu and lose all the ugly (unsigned long) casts here. That sounds good. I updated the patch according to your comment. Thanks Ken'ichi Ohmichi --- Signed-off-by: Ken'ichi Ohmichi [EMAIL PROTECTED] Acked-by: David Rientjes [EMAIL PROTECTED] --- diff -rpuN a/arch/ia64/kernel/machine_kexec.c b/arch/ia64/kernel/machine_kexec.c --- a/arch/ia64/kernel/machine_kexec.c 2007-09-21 09:25:35.0 +0900 +++ b/arch/ia64/kernel/machine_kexec.c 2007-09-21 09:26:13.0 +0900 @@ -137,7 +137,7 @@ void arch_crash_save_vmcoreinfo(void) VMCOREINFO_SYMBOL(node_memblk); VMCOREINFO_LENGTH(node_memblk, NR_NODE_MEMBLKS); - VMCOREINFO_SIZE(node_memblk_s); + VMCOREINFO_STRUCT_SIZE(node_memblk_s); VMCOREINFO_OFFSET(node_memblk_s, start_paddr); VMCOREINFO_OFFSET(node_memblk_s, size); #endif diff -rpuN a/include/linux/kexec.h b/include/linux/kexec.h --- a/include/linux/kexec.h 2007-09-21 09:25:32.0 +0900 +++ b/include/linux/kexec.h 2007-09-21 09:27:23.0 +0900 @@ -130,11 +130,9 @@ unsigned long paddr_vmcoreinfo_note(void #define VMCOREINFO_SYMBOL(name) \ vmcoreinfo_append_str(SYMBOL(%s)=%lx\n, #name, (unsigned long)name) #define VMCOREINFO_SIZE(name) \ - vmcoreinfo_append_str(SIZE(%s)=%lu\n, #name, \ - (unsigned long)sizeof(struct name)) -#define VMCOREINFO_TYPEDEF_SIZE(name) \ - vmcoreinfo_append_str(SIZE(%s)=%lu\n, #name, \ - (unsigned long)sizeof(name)) + vmcoreinfo_append_str(SIZE(%s)=%zu\n, #name, sizeof(name)) +#define VMCOREINFO_STRUCT_SIZE(name) \ + vmcoreinfo_append_str(SIZE(%s)=%zu\n, #name, sizeof(struct name)) #define VMCOREINFO_OFFSET(name, field) \ vmcoreinfo_append_str(OFFSET(%s.%s)=%lu\n, #name, #field, \ (unsigned long)(((struct name *)0)-field)) diff -rpuN a/kernel/kexec.c b/kernel/kexec.c --- a/kernel/kexec.c2007-09-21 09:25:27.0 +0900 +++ b/kernel/kexec.c2007-09-21 09:26:13.0 +0900 @@ -1210,15 +1210,15 @@ static int __init crash_save_vmcoreinfo_ #ifdef CONFIG_SPARSEMEM VMCOREINFO_SYMBOL(mem_section); VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS); - VMCOREINFO_SIZE(mem_section); + VMCOREINFO_STRUCT_SIZE(mem_section); VMCOREINFO_OFFSET(mem_section, section_mem_map); #endif - VMCOREINFO_SIZE(page); - VMCOREINFO_SIZE(pglist_data); - VMCOREINFO_SIZE(zone); - VMCOREINFO_SIZE(free_area); - VMCOREINFO_SIZE(list_head); - VMCOREINFO_TYPEDEF_SIZE(nodemask_t); + VMCOREINFO_STRUCT_SIZE(page); + VMCOREINFO_STRUCT_SIZE(pglist_data); + VMCOREINFO_STRUCT_SIZE(zone); + VMCOREINFO_STRUCT_SIZE(free_area); + VMCOREINFO_STRUCT_SIZE(list_head); + VMCOREINFO_SIZE(nodemask_t); VMCOREINFO_OFFSET(page, flags); VMCOREINFO_OFFSET(page, _count); VMCOREINFO_OFFSET(page, mapping); _ - To unsubscribe from this list: send the line unsubscribe
Re: [PATCH 5/4] [-mm patch] Rename macros returning the size.
On Thu, 20 Sep 2007, Satyam Sharma wrote: > > [PATCH 5/4] [-mm patch] Rename macros returning the size. > > The #define SIZE() should be renamed STRUCT_SIZE() since it's always > > returning the size of the struct with a given name. This would allow > > TYPEDEF_SIZE() to simply become SIZE() since it need not be used > > exclusively for typedefs. This idea is David Rientjes's. > > http://www.ussg.iu.edu/hypermail/linux/kernel/0709.1/1964.html > > > > Thanks > > Ken'ichi Ohmichi > > > > --- > > Signed-off-by: David Rientjes <[EMAIL PROTECTED]> > > Hmm, I think adding a s-o-b line for David here isn't quite correct. > When someone reviews a patch and gives a suggestion, you only need to > copy him on the next iteration (and he may ack it or whatever, if he > wants) -- but adding a s-o-b line like that ends up (incorrectly) > denoting that he came between the author-to-git-commit chain ... > Feel free to add Acked-by: David Rientjes <[EMAIL PROTECTED]> since I've reviewed the patch and agree with it. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 5/4] [-mm patch] Rename macros returning the size.
Hi,
On Thu, 20 Sep 2007, Ken'ichi Ohmichi wrote:
>
> [PATCH 5/4] [-mm patch] Rename macros returning the size.
> The #define SIZE() should be renamed STRUCT_SIZE() since it's always
> returning the size of the struct with a given name. This would allow
> TYPEDEF_SIZE() to simply become SIZE() since it need not be used
> exclusively for typedefs. This idea is David Rientjes's.
> http://www.ussg.iu.edu/hypermail/linux/kernel/0709.1/1964.html
>
> Thanks
> Ken'ichi Ohmichi
>
> ---
> Signed-off-by: David Rientjes <[EMAIL PROTECTED]>
Hmm, I think adding a s-o-b line for David here isn't quite correct.
When someone reviews a patch and gives a suggestion, you only need to
copy him on the next iteration (and he may ack it or whatever, if he
wants) -- but adding a s-o-b line like that ends up (incorrectly)
denoting that he came between the author-to-git-commit chain ...
> Signed-off-by: Ken'ichi Ohmichi <[EMAIL PROTECTED]>
> --- a/include/linux/kexec.h 2007-09-18 15:22:19.0 +0900
> +++ b/include/linux/kexec.h 2007-09-18 15:23:22.0 +0900
> @@ -131,10 +131,10 @@ unsigned long paddr_vmcoreinfo_note(void
> vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long))
> #define VMCOREINFO_SIZE(name) \
> vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \
> - (unsigned long)sizeof(struct name))
> -#define VMCOREINFO_TYPEDEF_SIZE(name) \
> - vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \
> (unsigned long)sizeof(name))
> +#define VMCOREINFO_STRUCT_SIZE(name) \
> + vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \
> + (unsigned long)sizeof(struct name))
> #define VMCOREINFO_OFFSET(name, field) \
> vmcoreinfo_append_str("OFFSET(%s.%s)=%lu\n", #name, #field, \
> (unsigned long)&(((struct name *)0)->field))
Please use %zu and lose all the ugly (unsigned long) casts here.
Otherwise it looks good,
Satyam
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 5/4] [-mm patch] Rename macros returning the size.
Hi, On Thu, 20 Sep 2007, Ken'ichi Ohmichi wrote: [PATCH 5/4] [-mm patch] Rename macros returning the size. The #define SIZE() should be renamed STRUCT_SIZE() since it's always returning the size of the struct with a given name. This would allow TYPEDEF_SIZE() to simply become SIZE() since it need not be used exclusively for typedefs. This idea is David Rientjes's. http://www.ussg.iu.edu/hypermail/linux/kernel/0709.1/1964.html Thanks Ken'ichi Ohmichi --- Signed-off-by: David Rientjes [EMAIL PROTECTED] Hmm, I think adding a s-o-b line for David here isn't quite correct. When someone reviews a patch and gives a suggestion, you only need to copy him on the next iteration (and he may ack it or whatever, if he wants) -- but adding a s-o-b line like that ends up (incorrectly) denoting that he came between the author-to-git-commit chain ... Signed-off-by: Ken'ichi Ohmichi [EMAIL PROTECTED] --- a/include/linux/kexec.h 2007-09-18 15:22:19.0 +0900 +++ b/include/linux/kexec.h 2007-09-18 15:23:22.0 +0900 @@ -131,10 +131,10 @@ unsigned long paddr_vmcoreinfo_note(void vmcoreinfo_append_str(SYMBOL(%s)=%lx\n, #name, (unsigned long)name) #define VMCOREINFO_SIZE(name) \ vmcoreinfo_append_str(SIZE(%s)=%lu\n, #name, \ - (unsigned long)sizeof(struct name)) -#define VMCOREINFO_TYPEDEF_SIZE(name) \ - vmcoreinfo_append_str(SIZE(%s)=%lu\n, #name, \ (unsigned long)sizeof(name)) +#define VMCOREINFO_STRUCT_SIZE(name) \ + vmcoreinfo_append_str(SIZE(%s)=%lu\n, #name, \ + (unsigned long)sizeof(struct name)) #define VMCOREINFO_OFFSET(name, field) \ vmcoreinfo_append_str(OFFSET(%s.%s)=%lu\n, #name, #field, \ (unsigned long)(((struct name *)0)-field)) Please use %zu and lose all the ugly (unsigned long) casts here. Otherwise it looks good, Satyam - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 5/4] [-mm patch] Rename macros returning the size.
On Thu, 20 Sep 2007, Satyam Sharma wrote: [PATCH 5/4] [-mm patch] Rename macros returning the size. The #define SIZE() should be renamed STRUCT_SIZE() since it's always returning the size of the struct with a given name. This would allow TYPEDEF_SIZE() to simply become SIZE() since it need not be used exclusively for typedefs. This idea is David Rientjes's. http://www.ussg.iu.edu/hypermail/linux/kernel/0709.1/1964.html Thanks Ken'ichi Ohmichi --- Signed-off-by: David Rientjes [EMAIL PROTECTED] Hmm, I think adding a s-o-b line for David here isn't quite correct. When someone reviews a patch and gives a suggestion, you only need to copy him on the next iteration (and he may ack it or whatever, if he wants) -- but adding a s-o-b line like that ends up (incorrectly) denoting that he came between the author-to-git-commit chain ... Feel free to add Acked-by: David Rientjes [EMAIL PROTECTED] since I've reviewed the patch and agree with it. - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 5/4] [-mm patch] Rename macros returning the size.
[PATCH 5/4] [-mm patch] Rename macros returning the size.
The #define SIZE() should be renamed STRUCT_SIZE() since it's always
returning the size of the struct with a given name. This would allow
TYPEDEF_SIZE() to simply become SIZE() since it need not be used
exclusively for typedefs. This idea is David Rientjes's.
http://www.ussg.iu.edu/hypermail/linux/kernel/0709.1/1964.html
Thanks
Ken'ichi Ohmichi
---
Signed-off-by: David Rientjes <[EMAIL PROTECTED]>
Signed-off-by: Ken'ichi Ohmichi <[EMAIL PROTECTED]>
---
diff -rpuN a/arch/ia64/kernel/machine_kexec.c b/arch/ia64/kernel/machine_kexec.c
--- a/arch/ia64/kernel/machine_kexec.c 2007-09-18 15:22:19.0 +0900
+++ b/arch/ia64/kernel/machine_kexec.c 2007-09-18 15:22:41.0 +0900
@@ -137,7 +137,7 @@ void arch_crash_save_vmcoreinfo(void)
VMCOREINFO_SYMBOL(node_memblk);
VMCOREINFO_LENGTH(node_memblk, NR_NODE_MEMBLKS);
- VMCOREINFO_SIZE(node_memblk_s);
+ VMCOREINFO_STRUCT_SIZE(node_memblk_s);
VMCOREINFO_OFFSET(node_memblk_s, start_paddr);
VMCOREINFO_OFFSET(node_memblk_s, size);
#endif
diff -rpuN a/include/linux/kexec.h b/include/linux/kexec.h
--- a/include/linux/kexec.h 2007-09-18 15:22:19.0 +0900
+++ b/include/linux/kexec.h 2007-09-18 15:23:22.0 +0900
@@ -131,10 +131,10 @@ unsigned long paddr_vmcoreinfo_note(void
vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long))
#define VMCOREINFO_SIZE(name) \
vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \
- (unsigned long)sizeof(struct name))
-#define VMCOREINFO_TYPEDEF_SIZE(name) \
- vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \
(unsigned long)sizeof(name))
+#define VMCOREINFO_STRUCT_SIZE(name) \
+ vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \
+ (unsigned long)sizeof(struct name))
#define VMCOREINFO_OFFSET(name, field) \
vmcoreinfo_append_str("OFFSET(%s.%s)=%lu\n", #name, #field, \
(unsigned long)&(((struct name *)0)->field))
diff -rpuN a/kernel/kexec.c b/kernel/kexec.c
--- a/kernel/kexec.c2007-09-18 15:22:19.0 +0900
+++ b/kernel/kexec.c2007-09-18 15:22:41.0 +0900
@@ -1210,15 +1210,15 @@ static int __init crash_save_vmcoreinfo_
#ifdef CONFIG_SPARSEMEM
VMCOREINFO_SYMBOL(mem_section);
VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
- VMCOREINFO_SIZE(mem_section);
+ VMCOREINFO_STRUCT_SIZE(mem_section);
VMCOREINFO_OFFSET(mem_section, section_mem_map);
#endif
- VMCOREINFO_SIZE(page);
- VMCOREINFO_SIZE(pglist_data);
- VMCOREINFO_SIZE(zone);
- VMCOREINFO_SIZE(free_area);
- VMCOREINFO_SIZE(list_head);
- VMCOREINFO_TYPEDEF_SIZE(nodemask_t);
+ VMCOREINFO_STRUCT_SIZE(page);
+ VMCOREINFO_STRUCT_SIZE(pglist_data);
+ VMCOREINFO_STRUCT_SIZE(zone);
+ VMCOREINFO_STRUCT_SIZE(free_area);
+ VMCOREINFO_STRUCT_SIZE(list_head);
+ VMCOREINFO_SIZE(nodemask_t);
VMCOREINFO_OFFSET(page, flags);
VMCOREINFO_OFFSET(page, _count);
VMCOREINFO_OFFSET(page, mapping);
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 5/4] [-mm patch] Rename macros returning the size.
[PATCH 5/4] [-mm patch] Rename macros returning the size. The #define SIZE() should be renamed STRUCT_SIZE() since it's always returning the size of the struct with a given name. This would allow TYPEDEF_SIZE() to simply become SIZE() since it need not be used exclusively for typedefs. This idea is David Rientjes's. http://www.ussg.iu.edu/hypermail/linux/kernel/0709.1/1964.html Thanks Ken'ichi Ohmichi --- Signed-off-by: David Rientjes [EMAIL PROTECTED] Signed-off-by: Ken'ichi Ohmichi [EMAIL PROTECTED] --- diff -rpuN a/arch/ia64/kernel/machine_kexec.c b/arch/ia64/kernel/machine_kexec.c --- a/arch/ia64/kernel/machine_kexec.c 2007-09-18 15:22:19.0 +0900 +++ b/arch/ia64/kernel/machine_kexec.c 2007-09-18 15:22:41.0 +0900 @@ -137,7 +137,7 @@ void arch_crash_save_vmcoreinfo(void) VMCOREINFO_SYMBOL(node_memblk); VMCOREINFO_LENGTH(node_memblk, NR_NODE_MEMBLKS); - VMCOREINFO_SIZE(node_memblk_s); + VMCOREINFO_STRUCT_SIZE(node_memblk_s); VMCOREINFO_OFFSET(node_memblk_s, start_paddr); VMCOREINFO_OFFSET(node_memblk_s, size); #endif diff -rpuN a/include/linux/kexec.h b/include/linux/kexec.h --- a/include/linux/kexec.h 2007-09-18 15:22:19.0 +0900 +++ b/include/linux/kexec.h 2007-09-18 15:23:22.0 +0900 @@ -131,10 +131,10 @@ unsigned long paddr_vmcoreinfo_note(void vmcoreinfo_append_str(SYMBOL(%s)=%lx\n, #name, (unsigned long)name) #define VMCOREINFO_SIZE(name) \ vmcoreinfo_append_str(SIZE(%s)=%lu\n, #name, \ - (unsigned long)sizeof(struct name)) -#define VMCOREINFO_TYPEDEF_SIZE(name) \ - vmcoreinfo_append_str(SIZE(%s)=%lu\n, #name, \ (unsigned long)sizeof(name)) +#define VMCOREINFO_STRUCT_SIZE(name) \ + vmcoreinfo_append_str(SIZE(%s)=%lu\n, #name, \ + (unsigned long)sizeof(struct name)) #define VMCOREINFO_OFFSET(name, field) \ vmcoreinfo_append_str(OFFSET(%s.%s)=%lu\n, #name, #field, \ (unsigned long)(((struct name *)0)-field)) diff -rpuN a/kernel/kexec.c b/kernel/kexec.c --- a/kernel/kexec.c2007-09-18 15:22:19.0 +0900 +++ b/kernel/kexec.c2007-09-18 15:22:41.0 +0900 @@ -1210,15 +1210,15 @@ static int __init crash_save_vmcoreinfo_ #ifdef CONFIG_SPARSEMEM VMCOREINFO_SYMBOL(mem_section); VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS); - VMCOREINFO_SIZE(mem_section); + VMCOREINFO_STRUCT_SIZE(mem_section); VMCOREINFO_OFFSET(mem_section, section_mem_map); #endif - VMCOREINFO_SIZE(page); - VMCOREINFO_SIZE(pglist_data); - VMCOREINFO_SIZE(zone); - VMCOREINFO_SIZE(free_area); - VMCOREINFO_SIZE(list_head); - VMCOREINFO_TYPEDEF_SIZE(nodemask_t); + VMCOREINFO_STRUCT_SIZE(page); + VMCOREINFO_STRUCT_SIZE(pglist_data); + VMCOREINFO_STRUCT_SIZE(zone); + VMCOREINFO_STRUCT_SIZE(free_area); + VMCOREINFO_STRUCT_SIZE(list_head); + VMCOREINFO_SIZE(nodemask_t); VMCOREINFO_OFFSET(page, flags); VMCOREINFO_OFFSET(page, _count); VMCOREINFO_OFFSET(page, mapping); _ - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
